#34 - Allow driver to be optional in configuration - skip check on driver when it isn't specified

Author: rbygrave

src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -262,16 +262,25 @@ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedE
     throw new SQLFeatureNotSupportedException("We do not support java.util.logging");
   }
 
+  /**
+   * Return true if driver has been explicitly configured.
+   */
+  private boolean hasDriver() {
+    return databaseDriver != null && !databaseDriver.isEmpty();
+  }
+
   private void checkDriver() {
-    try {
-      ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-      if (contextLoader != null) {
-        Class.forName(databaseDriver, true, contextLoader);
-      } else {
-        Class.forName(databaseDriver, true, this.getClass().getClassLoader());
+    if (hasDriver()) {
+      try {
+        ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+        if (contextLoader != null) {
+          Class.forName(databaseDriver, true, contextLoader);
+        } else {
+          Class.forName(databaseDriver, true, this.getClass().getClassLoader());
+        }
+      } catch (Throwable e) {
+        throw new IllegalStateException("Problem loading Database Driver [" + this.databaseDriver + "]: " + e.getMessage(), e);
       }
-    } catch (Throwable e) {
-      throw new IllegalStateException("Problem loading Database Driver [" + this.databaseDriver + "]: " + e.getMessage(), e);
     }
   }
 
@@ -980,11 +989,13 @@ public PoolStatus getStatus(boolean reset) {
    * Deregister the JDBC driver.
    */
   private void deregisterDriver() {
-    try {
-      logger.debug("Deregister the JDBC driver " + this.databaseDriver);
-      DriverManager.deregisterDriver(DriverManager.getDriver(this.databaseUrl));
-    } catch (SQLException e) {
-      logger.warn("Error trying to deregister the JDBC driver " + this.databaseDriver, e);
+    if (hasDriver()) {
+      try {
+        logger.debug("Deregister the JDBC driver " + databaseDriver);
+        DriverManager.deregisterDriver(DriverManager.getDriver(databaseUrl));
+      } catch (SQLException e) {
+        logger.warn("Error trying to deregister the JDBC driver " + databaseDriver, e);
+      }
     }
   }
 

src/test/java/io/ebean/datasource/PostgresInitTest.java

@@ -25,7 +25,6 @@ public void test() throws SQLException {
       container.startWithDropCreate();
 
       DataSourceConfig ds = new DataSourceConfig();
-      ds.setDriver("org.postgresql.Driver");
       ds.setUrl("jdbc:postgresql://127.0.0.1:9999/app");
 
       // our application credentials (typically same as db and schema name with Postgres)

src/test/java/io/ebean/datasource/core/DataSourcePoolFactoryTest.java

@@ -14,7 +14,6 @@ public class DataSourcePoolFactoryTest {
   public void createPool() throws Exception {
 
     DataSourceConfig config = new DataSourceConfig();
-    config.setDriver("org.h2.Driver");
     config.setUrl("jdbc:h2:mem:factory");
     config.setUsername("sa");
     config.setPassword("");

src/test/java/io/ebean/datasource/pool/ConnectionPoolTest.java

@@ -22,7 +22,6 @@ public class ConnectionPoolTest {
   private ConnectionPool createPool() {
 
     DataSourceConfig config = new DataSourceConfig();
-    config.setDriver("org.h2.Driver");
     config.setUrl("jdbc:h2:mem:tests");
     config.setUsername("sa");
     config.setPassword("");