summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2019-07-08 15:52:53 +0200
committersonartech <sonartech@sonarsource.com>2019-07-10 08:36:53 +0200
commit78580333f063132819d351a33ab07ff06f58c3e1 (patch)
treeb273cc59a27fb070914efb9f4cd2d8664bf40212
parent9fec86d923142f31c5a367bbeb5339d461c300cb (diff)
downloadsonarqube-78580333f063132819d351a33ab07ff06f58c3e1.tar.gz
sonarqube-78580333f063132819d351a33ab07ff06f58c3e1.zip
SONAR-12246 remove mysql specific error message
-rw-r--r--server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java14
-rw-r--r--server/sonar-db-core/src/test/java/org/sonar/db/DefaultDatabaseTest.java13
2 files changed, 0 insertions, 27 deletions
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java b/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java
index 3c1b88ef24f..27c4a622112 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/DefaultDatabase.java
@@ -33,7 +33,6 @@ import org.apache.commons.dbcp2.BasicDataSourceFactory;
import org.apache.commons.dbutils.DbUtils;
import org.apache.commons.lang.StringUtils;
import org.sonar.api.config.Settings;
-import org.sonar.api.utils.MessageException;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.db.dialect.Dialect;
@@ -97,23 +96,10 @@ public class DefaultDatabase implements Database {
doCompleteProperties(properties);
String jdbcUrl = properties.getProperty(JDBC_URL.getKey());
- failIfMySql(jdbcUrl);
dialect = DialectUtils.find(properties.getProperty(SONAR_JDBC_DIALECT), jdbcUrl);
properties.setProperty(SONAR_JDBC_DRIVER, dialect.getDefaultDriverClassName());
}
- private static void failIfMySql(String jdbcUrl) {
- if (StringUtils.startsWithIgnoreCase(jdbcUrl, "jdbc:mysql")) {
- throw MessageException.of("\n" +
- "#############################################################################################################\n" +
- "# End of Life of MySQL Support : SonarQube 7.9 and future versions do not support MySQL. #\n" +
- "# Please migrate to a supported database. Get more details at #\n" +
- "# https://community.sonarsource.com/t/end-of-life-of-mysql-support #\n" +
- "# and https://github.com/SonarSource/mysql-migrator #\n" +
- "#############################################################################################################\n");
- }
- }
-
private void initDataSource() throws Exception {
// but it's correctly caught by start()
LOG.info("Create JDBC data source for {}", properties.getProperty(JDBC_URL.getKey()), DEFAULT_URL);
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/DefaultDatabaseTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/DefaultDatabaseTest.java
index f282aabcdb0..45a55796ff5 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/DefaultDatabaseTest.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/DefaultDatabaseTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.sonar.api.config.internal.MapSettings;
-import org.sonar.api.utils.MessageException;
import org.sonar.db.dialect.PostgreSql;
import org.sonar.process.logging.LogbackHelper;
@@ -155,18 +154,6 @@ public class DefaultDatabaseTest {
assertThat(database.getProperties().getProperty("sonar.jdbc.driverClassName")).isEqualTo("org.postgresql.Driver");
}
- @Test
- public void fail_when_mysql_is_used() {
- MapSettings settings = new MapSettings();
- settings.setProperty("sonar.jdbc.url", "jdbc:mysql://localhost/sonar");
-
- DefaultDatabase database = new DefaultDatabase(logbackHelper, settings);
-
- expectedException.expect(MessageException.class);
- expectedException.expectMessage("End of Life of MySQL Support");
- database.start();
- }
-
@DataProvider
public static Object[][] sonarJdbcAndDbcpProperties() {
return new Object[][] {