Fix some quality flaws

3 files changed, 5 insertions, 7 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java b/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java
index 063dd30917e..d8a0dadc24b 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java
@@ -94,9 +94,6 @@ public class DefaultDatabase implements Database {
     doCompleteProperties(properties);
 
     dialect = DialectUtils.find(properties.getProperty(SONAR_JDBC_DIALECT), properties.getProperty(SONAR_JDBC_URL));
-    if (dialect == null) {
-      throw new IllegalStateException(String.format("Can not guess the JDBC dialect. Please check the property %s.", SONAR_JDBC_URL));
-    }
     properties.setProperty(DatabaseProperties.PROP_DRIVER, dialect.getDefaultDriverClassName());
   }
 
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java
index 1ad06d54415..8beadff736e 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java
@@ -22,10 +22,11 @@ package org.sonar.core.persistence.dialect;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.api.utils.SonarException;
+import org.sonar.api.utils.MessageException;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+
 import java.util.NoSuchElementException;
 
 public final class DialectUtils {
@@ -39,7 +40,7 @@ public final class DialectUtils {
   public static Dialect find(final String dialectId, final String jdbcConnectionUrl) {
     Dialect match = StringUtils.isNotBlank(dialectId) ? findById(dialectId) : findByJdbcUrl(jdbcConnectionUrl);
     if (match == null) {
-      throw new SonarException("Unable to determine database dialect to use within sonar with dialect " + dialectId + " jdbc url " + jdbcConnectionUrl);
+      throw MessageException.of("Unable to determine database dialect to use within sonar with dialect " + dialectId + " jdbc url " + jdbcConnectionUrl);
     }
     return match;
   }
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/DialectUtilsTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/dialect/DialectUtilsTest.java
index 31d883450e8..d0c90b27650 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/DialectUtilsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/dialect/DialectUtilsTest.java
@@ -20,7 +20,7 @@
 package org.sonar.core.persistence.dialect;
 
 import org.junit.Test;
-import org.sonar.api.utils.SonarException;
+import org.sonar.api.utils.MessageException;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -38,7 +38,7 @@ public class DialectUtilsTest {
     assertThat(d).isInstanceOf(MySql.class);
   }
 
-  @Test(expected = SonarException.class)
+  @Test(expected = MessageException.class)
   public void testFindNoMatch() {
     DialectUtils.find("foo", "bar");
   }