#36 - Simplify remove deregister driver option for shutdown method

Author: rbygrave

src/main/java/io/ebean/datasource/DataSourcePool.java

@@ -44,11 +44,6 @@ public interface DataSourcePool extends DataSource {
    */
   void shutdown();
 
-  /**
-   * Shutdown the pool with the option to deregister the driver.
-   */
-  void shutdown(boolean deregisterDriver);
-
   /**
    * Return the current status of the connection pool.
    * <p>

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

@@ -789,11 +789,6 @@ public void testAlert() {
     }
   }
 
-  @Override
-  public void shutdown() {
-    shutdown(false);
-  }
-
   /**
    * This will close all the free connections, and then go into a wait loop,
    * waiting for the busy connections to be freed.
@@ -802,11 +797,8 @@ public void shutdown() {
    * Connections are not waited on, as that would hang the server.
    */
   @Override
-  public void shutdown(boolean deregisterDriver) {
+  public void shutdown() {
     shutdownPool(true);
-    if (deregisterDriver) {
-      deregisterDriver();
-    }
   }
 
   @Override
@@ -985,20 +977,6 @@ public PoolStatus getStatus(boolean reset) {
     return queue.getStatus(reset);
   }
 
-  /**
-   * Deregister the JDBC driver.
-   */
-  private void deregisterDriver() {
-    if (hasDriver()) {
-      try {
-        logger.debug("Deregister the JDBC driver " + driver);
-        DriverManager.deregisterDriver(DriverManager.getDriver(url));
-      } catch (SQLException e) {
-        logger.warn("Error trying to deregister the JDBC driver " + driver, e);
-      }
-    }
-  }
-
   public static class Status implements PoolStatus {
 
     private final int minSize;

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

@@ -27,6 +27,6 @@ public void createPool() throws Exception {
       }
     }
 
-    pool.shutdown(false);
+    pool.shutdown();
   }
 }

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

@@ -31,7 +31,7 @@ private ConnectionPool createPool() {
 
   @AfterClass
   public void after() {
-    pool.shutdown(false);
+    pool.shutdown();
   }
 
   @Test

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

@@ -41,7 +41,7 @@ private ConnectionPool createPool() {
 
   @AfterClass
   public void after() {
-    pool.shutdown(false);
+    pool.shutdown();
   }
 
   @Test

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

@@ -33,7 +33,7 @@ private ConnectionPool createPool() {
 
   @AfterClass
   public void after() {
-    pool.shutdown(false);
+    pool.shutdown();
   }
 
   @Test

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

@@ -50,7 +50,7 @@ public void test() throws SQLException, InterruptedException {
       assertThat(pool.getStatus(false).getFree()).isEqualTo(1);
 
     } finally {
-      pool.shutdown(false);
+      pool.shutdown();
     }
   }
 
@@ -90,7 +90,7 @@ public void test_withDecreasingActivity_expect_trimToActivityLevel() throws SQLE
       assertThat(pool.getStatus(false).getFree()).isEqualTo(1);
 
     } finally {
-      pool.shutdown(false);
+      pool.shutdown();
     }
   }