Skip to content

Commit 537ef2f

Browse files
syjersyjer
committed
#546 remove unused multi db code
1 parent 9a6b3cb commit 537ef2f

File tree

4 files changed

+7
-125
lines changed

4 files changed

+7
-125
lines changed

‎build.gradle

-7
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ ext {
7474
// default settings
7575
jettyPort = 8080
7676
jettyHost = '0.0.0.0'
77-
datasourceDialect = 'PGSQL'
78-
datasourceDriver = 'org.postgresql.Driver'
7977
datasourceUrl = 'jdbc:postgresql://localhost:5432/alfio'
8078
datasourceUsername = 'postgres'
8179
datasourcePassword = 'password'
@@ -89,8 +87,6 @@ ext {
8987

9088
switch (profile) {
9189
case 'docker-test':
92-
datasourceDialect = 'PGSQL'
93-
datasourceDriver = 'org.postgresql.Driver'
9490
datasourceUrl = 'jdbc:postgresql://0.0.0.0:5432/postgres'
9591
datasourceUsername = 'postgres'
9692
datasourcePassword = 'postgres'
@@ -267,12 +263,9 @@ bootRun {
267263
def opts = []
268264
opts += [
269265
"-Dspring.profiles.active=${project.springProfilesActive},jdbc-session",
270-
"-Ddatasource.dialect=${project.datasourceDialect}",
271-
"-Ddatasource.driver=${project.datasourceDriver}",
272266
"-Ddatasource.url=${project.datasourceUrl}",
273267
"-Ddatasource.username=${project.datasourceUsername}",
274268
"-Ddatasource.password=${project.datasourcePassword}",
275-
"-Ddatasource.validationQuery=${project.datasourceValidationQuery}",
276269
"-Dalfio.version=${project.version}",
277270
"-Dalfio.build-ts=${ZonedDateTime.now(ZoneId.of("UTC")).format(DateTimeFormatter.ISO_ZONED_DATE_TIME)}"
278271
]

‎src/main/java/alfio/config/DataSourceConfiguration.java

+2-28
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,6 @@ public PlatformProvider getCloudProvider(Environment environment) {
8282
.filter(p -> p.isHosting(environment))
8383
.findFirst()
8484
.orElse(PlatformProvider.DEFAULT);
85-
String dialect = current.getDialect(environment);
86-
log.info("Detected cloud provider: {}, database: {}", current, dialect);
87-
if(PlatformProvider.MYSQL.equals(dialect)) {
88-
log.warn("********************** WARNING! WARNING! WARNING!****************************");
89-
log.warn("** **");
90-
log.warn("** MYSQL SUPPORT WILL BE DROPPED IN ALF.IO V2 (exp. Q4 2018) **");
91-
log.warn("** Please consider switching to PostgreSql **");
92-
log.warn("** **");
93-
log.warn("*****************************************************************************");
94-
}
9585
return current;
9686
}
9787

@@ -261,24 +251,8 @@ public Trigger[] getTriggers() throws ParseException {
261251
@Bean
262252
@DependsOn("migrator")
263253
@Profile("!"+ Initializer.PROFILE_DISABLE_JOBS)
264-
public SchedulerFactoryBean schedulerFactory(Environment env, PlatformProvider platform, DataSource dataSource, PlatformTransactionManager platformTransactionManager, ApplicationContext applicationContext) throws ParseException {
265-
266-
String dialect = platform.getDialect(env);
267-
String quartzDriverDelegateClass;
268-
switch (dialect) {
269-
case "PGSQL":
270-
quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate";
271-
break;
272-
case "HSQLDB":
273-
quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.HSQLDBDelegate";
274-
break;
275-
case "MYSQL":
276-
quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.StdJDBCDelegate";
277-
break;
278-
default:
279-
throw new IllegalArgumentException("Unsupported dialect: " + dialect);
280-
}
281-
254+
public SchedulerFactoryBean schedulerFactory(DataSource dataSource, PlatformTransactionManager platformTransactionManager, ApplicationContext applicationContext) throws ParseException {
255+
String quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate";
282256
Properties properties = new Properties();
283257
properties.setProperty("org.quartz.jobStore.isClustered", "true");
284258
properties.setProperty("org.quartz.scheduler.instanceId", "AUTO");

‎src/main/java/alfio/config/support/PlatformProvider.java

+5-87
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
* Supported:
3131
* - Openshift : pgsql only
3232
* - ElephantDB: runs on Openshift and Cloud Foundry
33-
* - Cloud Foundry: postgres, mysql (injected)
33+
* - Cloud Foundry: postgres
3434
* - Heroku
35-
* - AWS: mysql and postgres
35+
* - AWS
3636
* - local use with system properties
3737
*/
3838
public enum PlatformProvider {
@@ -63,16 +63,6 @@ public String getPassword(Environment env) {
6363
return isCloudFoundry(env) ? "" : resolveURI(env, "ELEPHANTSQL_URI").getUserInfo().split(":")[1];
6464
}
6565

66-
@Override
67-
public String getDialect(Environment env) {
68-
return PGSQL;
69-
}
70-
71-
@Override
72-
public String getDriverClassName(Environment env) {
73-
return POSTGRESQL_DRIVER;
74-
}
75-
7666
@Override
7767
public boolean isHosting(Environment env) {
7868
return ofNullable(env.getProperty("ELEPHANTSQL_URI")).isPresent() || ofNullable(env.getProperty("VCAP_SERVICES")).filter(s -> s.contains("elephantsql")).isPresent();
@@ -109,16 +99,6 @@ public String getPassword(Environment env) {
10999
return Objects.requireNonNull(System.getenv("OPENSHIFT_POSTGRESQL_DB_PASSWORD"), "OPENSHIFT_POSTGRESQL_DB_PASSWORD env variable is missing");
110100
}
111101

112-
@Override
113-
public String getDialect(Environment env) {
114-
return PGSQL;
115-
}
116-
117-
@Override
118-
public String getDriverClassName(Environment env) {
119-
return POSTGRESQL_DRIVER;
120-
}
121-
122102
@Override
123103
public boolean isHosting(Environment env) {
124104
return ofNullable(env.getProperty("OPENSHIFT_APP_NAME")).isPresent();
@@ -146,16 +126,6 @@ public String getPassword(Environment env) {
146126
return "";
147127
}
148128

149-
@Override
150-
public String getDialect(Environment env) {
151-
return isMySql(env) ? MYSQL : PGSQL;
152-
}
153-
154-
@Override
155-
public String getDriverClassName(Environment env) {
156-
return isMySql(env) ? MYSQL_DRIVER : POSTGRESQL_DRIVER;
157-
}
158-
159129
@Override
160130
public boolean isHosting(Environment env) {
161131
//check if json object for services is returned
@@ -170,10 +140,6 @@ public boolean isHosting(Environment env) {
170140
// "name": "alfio-db",
171141
return env.getProperty("VCAP_SERVICES") != null;
172142
}
173-
174-
private boolean isMySql(Environment env) {
175-
return ofNullable(env.getProperty("VCAP_SERVICES")).map(props -> props.contains("mysql://")).orElse(false);
176-
}
177143
},
178144

179145
HEROKU {
@@ -195,16 +161,6 @@ public String getPassword(Environment env) {
195161
return resolveURI(env).getUserInfo().split(":")[1];
196162
}
197163

198-
@Override
199-
public String getDialect(Environment env) {
200-
return PGSQL;
201-
}
202-
203-
@Override
204-
public String getDriverClassName(Environment env) {
205-
return POSTGRESQL_DRIVER;
206-
}
207-
208164
@Override
209165
public boolean isHosting(Environment env) {
210166
return ofNullable(env.getProperty("DYNO")).isPresent();
@@ -237,17 +193,6 @@ public String getPassword(Environment env) {
237193
return Objects.requireNonNull(System.getenv("POSTGRES_ENV_POSTGRES_PASSWORD"), "POSTGRES_ENV_POSTGRES_PASSWORD env variable is missing");
238194
}
239195

240-
@Override
241-
public String getDialect(Environment env) {
242-
return PGSQL;
243-
}
244-
245-
246-
@Override
247-
public String getDriverClassName(Environment env) {
248-
return POSTGRESQL_DRIVER;
249-
}
250-
251196
@Override
252197
public boolean isHosting(Environment env) {
253198
return ofNullable(System.getenv("POSTGRES_ENV_POSTGRES_DB")).isPresent();
@@ -258,7 +203,7 @@ public boolean isHosting(Environment env) {
258203

259204
@Override
260205
public String getUrl(Environment env) {
261-
String dbType = isMySql(env) ? "mysql" : "postgresql";
206+
String dbType = "postgresql";
262207
String host = env.getRequiredProperty("RDS_HOSTNAME");
263208
String port = env.getRequiredProperty("RDS_PORT");
264209
String db = env.getRequiredProperty("RDS_DB_NAME");
@@ -275,25 +220,11 @@ public String getPassword(Environment env) {
275220
return env.getRequiredProperty("RDS_PASSWORD");
276221
}
277222

278-
@Override
279-
public String getDialect(Environment env) {
280-
return isMySql(env) ? MYSQL : PGSQL;
281-
}
282-
283223
@Override
284224
public boolean isHosting(Environment env) {
285225
return ofNullable(env.getProperty("RDS_HOSTNAME")).isPresent();
286226
}
287227

288-
private boolean isMySql(Environment env) {
289-
return ofNullable(env.getProperty("RDS_PORT")).filter("3306"::equals).isPresent();
290-
}
291-
292-
@Override
293-
public String getDriverClassName(Environment env) {
294-
return isMySql(env) ? MYSQL_DRIVER : POSTGRESQL_DRIVER;
295-
}
296-
297228
},
298229

299230
CLEVER_CLOUD {
@@ -313,16 +244,6 @@ public String getPassword(Environment env) {
313244
return env.getRequiredProperty("POSTGRESQL_ADDON_PASSWORD");
314245
}
315246

316-
@Override
317-
public String getDriverClassName(Environment env) {
318-
return POSTGRESQL_DRIVER;
319-
}
320-
321-
@Override
322-
public String getDialect(Environment env) {
323-
return PGSQL;
324-
}
325-
326247
@Override
327248
public int getMaxActive(Environment env) {
328249
//default limit to 5, to be on the safe side
@@ -338,9 +259,6 @@ public boolean isHosting(Environment env) {
338259
private static final String POSTGRESQL_DRIVER = "org.postgresql.Driver";
339260
public static final String PGSQL = "PGSQL";
340261

341-
private static final String MYSQL_DRIVER = "com.mysql.jdbc.Driver";
342-
public static final String MYSQL = "MYSQL";
343-
344262

345263
public String getUrl(Environment env) {
346264
return env.getRequiredProperty("datasource.url");
@@ -355,11 +273,11 @@ public String getPassword(Environment env) {
355273
}
356274

357275
public String getDriverClassName(Environment env) {
358-
return env.getRequiredProperty("datasource.driver");
276+
return POSTGRESQL_DRIVER;
359277
}
360278

361279
public String getDialect(Environment env) {
362-
return env.getRequiredProperty("datasource.dialect");
280+
return PGSQL;
363281
}
364282

365283
public int getMaxActive(Environment env) {

‎src/test/java/alfio/test/util/IntegrationTestUtil.java

-3
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,9 @@ public class IntegrationTestUtil {
5858

5959
public static Map<String, String> generateDBConfig(String url, String username, String password) {
6060
Map<String, String> c = new HashMap<>();
61-
c.put("datasource.dialect", "PGSQL");
62-
c.put("datasource.driver", "org.postgresql.Driver");
6361
c.put("datasource.url", url);
6462
c.put("datasource.username", username);
6563
c.put("datasource.password", password);
66-
c.put("datasource.validationQuery", "SELECT 1");
6764
return c;
6865
}
6966

0 commit comments

Comments
 (0)