SONAR-5518 Remove the property sonar.embeddedDatabase.dataDir

4 files changed, 8 insertions, 75 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java b/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java
index 389258369af..9e52ba4024b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java
@@ -26,7 +26,6 @@ import org.h2.tools.Server;
 import org.picocontainer.Startable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 import org.sonar.api.database.DatabaseProperties;
 import org.sonar.api.utils.SonarException;
@@ -35,7 +34,7 @@ import java.io.File;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-public class EmbeddedDatabase implements Startable  {
+public class EmbeddedDatabase implements Startable {
   private static final Logger LOG = LoggerFactory.getLogger(EmbeddedDatabase.class);
   private final Settings settings;
   private Server server;
@@ -84,27 +83,7 @@ public class EmbeddedDatabase implements Startable  {
 
   @VisibleForTesting
   File getDataDirectory(Settings settings) {
-    String dirName = settings.getString(DatabaseProperties.PROP_EMBEDDED_DATA_DIR);
-    if (!StringUtils.isBlank(dirName)) {
-      return getEmbeddedDataDirectory(dirName);
-    }
-    return getSonarHomeDataDirectory(settings);
-  }
-
-  private File getEmbeddedDataDirectory(String directoryName) {
-    File embeddedDataDirectory = new File(directoryName);
-    if(embeddedDataDirectory.exists() && !embeddedDataDirectory.isDirectory()) {
-      throw new SonarException("Database home " + embeddedDataDirectory.getAbsolutePath() + " is not a directory");
-    }
-    return embeddedDataDirectory;
-  }
-
-  private File getSonarHomeDataDirectory(Settings settings) {
-    File sonarHome = new File(settings.getString("sonar.path.home"));
-    if (!sonarHome.isDirectory()) {
-      throw new IllegalStateException("SonarQube home directory is not valid");
-    }
-    return new File(sonarHome, "data");
+    return new File(settings.getString("sonar.path.data"));
   }
 
   private String getSetting(String name, String defaultValue) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
index 8ad2fa58bd5..0d59a149ea8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
@@ -23,10 +23,8 @@ import org.h2.Driver;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 import org.sonar.api.database.DatabaseProperties;
-import org.sonar.api.utils.SonarException;
 
 import java.io.File;
 import java.io.IOException;
@@ -64,7 +62,7 @@ public class EmbeddedDatabaseTest {
     int port = freeServerPort();
 
     EmbeddedDatabase database = new EmbeddedDatabase(testSettings(port)
-        .setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:tcp://localhost:" + port + "/mem:sonarIT;USER=sonar;PASSWORD=sonar"));
+      .setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:tcp://localhost:" + port + "/mem:sonarIT;USER=sonar;PASSWORD=sonar"));
     database.start();
 
     try {
@@ -79,33 +77,6 @@ public class EmbeddedDatabaseTest {
   }
 
   @Test
-  public void should_return_sonar_home_directory() throws Exception {
-    Settings settings = testSettings(0);
-    settings.setProperty("sonar.path.home", ".");
-    settings.setProperty(DatabaseProperties.PROP_EMBEDDED_DATA_DIR, "");
-
-    EmbeddedDatabase database = new EmbeddedDatabase(settings);
-
-    File dataDirectory = database.getDataDirectory(settings);
-    assertThat(dataDirectory).isNotNull();
-    assertThat(dataDirectory.getPath()).endsWith("data");
-  }
-
-  @Test
-  public void should_fail_on_invalid_sonar_home_directory() throws Exception {
-    throwable.expect(IllegalStateException.class);
-
-    String testPath = getClass().getResource(".").getPath();
-
-    Settings settings = testSettings(0);
-    settings.setProperty("sonar.path.home", testPath + "/unmatched_directory");
-    settings.setProperty(DatabaseProperties.PROP_EMBEDDED_DATA_DIR, "");
-
-    EmbeddedDatabase database = new EmbeddedDatabase(settings);
-    database.getDataDirectory(settings);
-  }
-
-  @Test
   public void should_return_embedded_data_directory() throws Exception {
 
     Settings settings = testSettings(0);
@@ -116,25 +87,11 @@ public class EmbeddedDatabaseTest {
     assertThat(dataDirectory.getPath()).endsWith("testDB");
   }
 
-  @Test
-  public void should_fail_on_invalid_data_directory() throws Exception {
-    throwable.expect(SonarException.class);
-
-    String testPath = getClass().getResource(".").getPath();
-
-    Settings settings = testSettings(0);
-    settings.setProperty(DatabaseProperties.PROP_EMBEDDED_DATA_DIR, testPath + "/invalid_db_data_file");
-
-    EmbeddedDatabase database = new EmbeddedDatabase(settings);
-    database.start();
-  }
-
   static Settings testSettings(int port) {
     return new Settings()
-        .setProperty(DatabaseProperties.PROP_USER, "login")
-        .setProperty(DatabaseProperties.PROP_PASSWORD, "pwd")
-        .setProperty(DatabaseProperties.PROP_EMBEDDED_PORT, "" + port)
-        .setProperty(DatabaseProperties.PROP_EMBEDDED_DATA_DIR, "./target/testDB");
+      .setProperty(DatabaseProperties.PROP_USER, "login")
+      .setProperty(DatabaseProperties.PROP_PASSWORD, "pwd")
+      .setProperty(DatabaseProperties.PROP_EMBEDDED_PORT, "" + port);
   }
 
   static int freeServerPort() throws IOException {
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 67983cced2e..8cae11e3cca 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -18,13 +18,11 @@
 #sonar.jdbc.username=sonar
 #sonar.jdbc.password=sonar
 
-#----- Embedded database - default
+#----- Embedded Database (default)
 # It does not accept connections from remote hosts, so the
 # server and the analyzers must be executed on the same host.
-# sonar.jdbc.url=jdbc:h2:tcp://localhost:9092/sonar
+#sonar.jdbc.url=jdbc:h2:tcp://localhost:9092/sonar
 
-# directory containing H2 database files. By default it's the /data directory in the SonarQube installation.
-#sonar.embeddedDatabase.dataDir=
 # H2 embedded database server listening port, defaults to 9092
 #sonar.embeddedDatabase.port=9092
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java
index 6343bab812c..fe9d208b165 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java
@@ -31,7 +31,6 @@ public interface DatabaseProperties {
   String PROP_PASSWORD = "sonar.jdbc.password";
   String PROP_PASSWORD_DEFAULT_VALUE = "sonar";
   String PROP_DIALECT = "sonar.jdbc.dialect";
-  String PROP_EMBEDDED_DATA_DIR = "sonar.embeddedDatabase.dataDir";
 
   /**
    * @since 3.2