Minor Quality flaws

2 files changed, 9 insertions, 7 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java b/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java
index 25e15e503c1..5a5f4e45c15 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java
@@ -40,7 +40,7 @@ public class EmbeddedDatabaseFactory implements Startable {
     if (embeddedDatabase == null) {
       String jdbcUrl = settings.getString(DatabaseProperties.PROP_URL);
       if (startsWith(jdbcUrl, URL_PREFIX)) {
-        embeddedDatabase = getEmbeddedDatabase(settings);
+        embeddedDatabase = createEmbeddedDatabase();
         embeddedDatabase.start();
       }
     }
@@ -55,7 +55,7 @@ public class EmbeddedDatabaseFactory implements Startable {
   }
 
   @VisibleForTesting
-  EmbeddedDatabase getEmbeddedDatabase(Settings settings) {
+  EmbeddedDatabase createEmbeddedDatabase() {
     return new EmbeddedDatabase(settings);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java
index 8cbe8790346..2a780dc6812 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java
@@ -23,7 +23,9 @@ import org.junit.Test;
 import org.sonar.api.config.Settings;
 import org.sonar.api.database.DatabaseProperties;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 public class EmbeddedDatabaseFactoryTest {
 
@@ -33,11 +35,11 @@ public class EmbeddedDatabaseFactoryTest {
   public void should_start_and_stop_tcp_h2_database() {
     settings.setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:tcp:localhost");
 
-    final EmbeddedDatabase embeddedDatabase = mock(EmbeddedDatabase.class);
+    EmbeddedDatabase embeddedDatabase = mock(EmbeddedDatabase.class);
 
     EmbeddedDatabaseFactory databaseFactory = new EmbeddedDatabaseFactory(settings) {
       @Override
-      EmbeddedDatabase getEmbeddedDatabase(Settings settings) {
+      EmbeddedDatabase createEmbeddedDatabase() {
         return embeddedDatabase;
       }
     };
@@ -52,11 +54,11 @@ public class EmbeddedDatabaseFactoryTest {
   public void should_not_start_mem_h2_database() {
     settings.setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:mem");
 
-    final EmbeddedDatabase embeddedDatabase = mock(EmbeddedDatabase.class);
+    EmbeddedDatabase embeddedDatabase = mock(EmbeddedDatabase.class);
 
     EmbeddedDatabaseFactory databaseFactory = new EmbeddedDatabaseFactory(settings) {
       @Override
-      EmbeddedDatabase getEmbeddedDatabase(Settings settings) {
+      EmbeddedDatabase createEmbeddedDatabase() {
         return embeddedDatabase;
       }
     };