set the driver classname explicitly

alfio-event · Nov 7, 2016 · 6307d17 · 6307d17
1 parent 4d5efa3
commit 6307d17
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/main/java/alfio/config/DataSourceConfiguration.java b/src/main/java/alfio/config/DataSourceConfiguration.java
@@ -98,6 +98,7 @@ public DataSource getDataSource(Environment env, PlatformProvider platform) thro
         dataSource.setJdbcUrl(platform.getUrl(env));
         dataSource.setUsername(platform.getUsername(env));
         dataSource.setPassword(platform.getPassword(env));
+        dataSource.setDriverClassName(platform.getDriveClassName(env));
         int maxActive = platform.getMaxActive(env);
 
         dataSource.setMaximumPoolSize(maxActive);

diff --git a/src/main/java/alfio/config/support/PlatformProvider.java b/src/main/java/alfio/config/support/PlatformProvider.java
@@ -68,6 +68,11 @@ public String getDialect(Environment env) {
             return PGSQL;
         }
 
+        @Override
+        public String getDriveClassName(Environment env) {
+            return POSTGRESQL_DRIVER;
+        }
+
         @Override
         public boolean isHosting(Environment env) {
             return ofNullable(env.getProperty("ELEPHANTSQL_URI")).isPresent() || ofNullable(env.getProperty("VCAP_SERVICES")).filter(s -> s.contains("elephantsql")).isPresent();
@@ -109,6 +114,11 @@ public String getDialect(Environment env) {
             return PGSQL;
         }
 
+        @Override
+        public String getDriveClassName(Environment env) {
+            return POSTGRESQL_DRIVER;
+        }
+
         @Override
         public boolean isHosting(Environment env) {
             return ofNullable(env.getProperty("OPENSHIFT_APP_NAME")).isPresent();
@@ -141,6 +151,11 @@ public String getDialect(Environment env) {
             return isMySql(env) ? MYSQL : PGSQL;
         }
 
+        @Override
+        public String getDriveClassName(Environment env) {
+            return isMySql(env) ? MYSQL_DRIVER : POSTGRESQL_DRIVER;
+        }
+
         @Override
         public boolean isHosting(Environment env) {
             //check if json object for services is returned
@@ -185,6 +200,11 @@ public String getDialect(Environment env) {
             return PGSQL;
         }
 
+        @Override
+        public String getDriveClassName(Environment env) {
+            return POSTGRESQL_DRIVER;
+        }
+
         @Override
         public boolean isHosting(Environment env) {
             return ofNullable(env.getProperty("DYNO")).isPresent();
@@ -222,6 +242,12 @@ public String getDialect(Environment env) {
             return PGSQL;
         }
 
+
+        @Override
+        public String getDriveClassName(Environment env) {
+            return POSTGRESQL_DRIVER;
+        }
+
         @Override
         public boolean isHosting(Environment env) {
             return ofNullable(env.getProperty("DB_ENV_POSTGRES_DB")).isPresent();
@@ -263,6 +289,11 @@ private boolean isMySql(Environment env) {
             return ofNullable(env.getProperty("RDS_PORT")).filter("3306"::equals).isPresent();
         }
 
+        @Override
+        public String getDriveClassName(Environment env) {
+            return isMySql(env) ? MYSQL_DRIVER : POSTGRESQL_DRIVER;
+        }
+
     };
 
     private static final String POSTGRESQL_DRIVER = "org.postgresql.Driver";
@@ -284,6 +315,9 @@ public String getPassword(Environment env) {
         return env.getRequiredProperty("datasource.password");
     }
 
+    public String getDriveClassName(Environment env) {
+        return env.getRequiredProperty("datasource.driver");
+    }
 
     public String getDialect(Environment env) {
         return env.getRequiredProperty("datasource.dialect");