Cleanup jdbc module

jknack · jknack · commit ec18e3031fb1 · 2018-02-16T19:20:09.000-03:00
diff --git a/modules/jooby-jdbc/src/main/java/org/jooby/jdbc/Jdbc.java b/modules/jooby-jdbc/src/main/java/org/jooby/jdbc/Jdbc.java
@@ -226,7 +226,6 @@
 import org.jooby.funzy.Try;
 
 import javax.sql.DataSource;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -406,16 +405,6 @@
  */
 public final class Jdbc implements Jooby.Module {
 
-  static final Function<Throwable, Void> CCE = x -> {
-    if (x instanceof ClassCastException) {
-      StackTraceElement src = x.getStackTrace()[0];
-      if (src.getFileName() == null || src.getClassName().equals(Jdbc.class.getName())) {
-        return null;
-      }
-    }
-    throw Throwing.sneakyThrow(x);
-  };
-
   public static Function<String, String> DB_NAME = url -> {
     Throwing.Function3<String, String, String, Object[]> indexOf = (str, t1,
         t2) -> {
@@ -444,8 +433,7 @@ public final class Jdbc implements Jooby.Module {
 
   private static final int DEFAULT_POOL_SIZE = 10;
 
-  @SuppressWarnings("rawtypes")
-  private final List<BiConsumer> callback = new ArrayList<>();
+  private BiConsumer<HikariConfig, Config> callback;
 
   protected final String dbref;
 
@@ -471,40 +459,34 @@ public Jdbc() {
   }
 
   /**
-   * Configurer callback to apply advanced configuration while bootstrapping hibernate:
+   * Apply advanced configuration options:
    *
    * <pre>{@code
    * {
    *   use(new Jdbc()
-   *       .doWith((HikariConfig conf) -> {
-   *         // do with conf
-   *       })
-   *       .doWith((HikariDataSource ds) -> {
-   *         // do with ds
+   *       .doWith((hikari, conf) -> {
+   *         // do with hikari
    *       })
    *   );
    * }
    * }</pre>
    *
    * @param configurer Configurer callback.
-   * @return This module
+   * @return This module.
    */
-  public <T> Jdbc doWith(final BiConsumer<T, Config> configurer) {
-    this.callback.add(requireNonNull(configurer, "Configurer required."));
+  public <T> Jdbc doWith(final BiConsumer<HikariConfig, Config> configurer) {
+    this.callback = requireNonNull(configurer, "Callback required.");
     return this;
   }
 
   /**
-   * Configurer callback to apply advanced configuration while bootstrapping hibernate:
+   * Apply advanced configuration options:
    *
    * <pre>{@code
    * {
    *   use(new Jdbc()
-   *       .doWith((HikariConfig conf) -> {
-   *         // do with conf
-   *       })
-   *       .doWith((HikariDataSource ds) -> {
-   *         // do with ds
+   *       .doWith(hikari -> {
+   *         // do with hikari
    *       })
    *   );
    * }
@@ -513,9 +495,9 @@ public <T> Jdbc doWith(final BiConsumer<T, Config> configurer) {
    * @param configurer Configurer callback.
    * @return This module
    */
-  public <T> Jdbc doWith(final Consumer<T> configurer) {
+  public Jdbc doWith(final Consumer<HikariConfig> configurer) {
     requireNonNull(configurer, "Configurer required.");
-    return doWith((final T b, final Config c) -> configurer.accept(b));
+    return doWith((h, c) -> configurer.accept(h));
   }
 
   @Override
@@ -543,7 +525,9 @@ public void configure(final Env env, final Config config, final Binder binder) {
       props.setProperty("url", url);
     }
 
-    callback(hikariConf, config);
+    if (callback != null) {
+      callback.accept(hikariConf, config);
+    }
     HikariDataSource ds = new HikariDataSource(hikariConf);
 
     // bind datasource using dbkey and dbname
@@ -680,15 +664,6 @@ private boolean dataSourcePresent(final ClassLoader loader, final String classNa
     }
   }
 
-  @SuppressWarnings("unchecked")
-  protected void callback(final Object value, final Config conf) {
-    callback.forEach(it -> Try.apply(() -> {
-      it.accept(value, conf);
-      return null;
-      // FIXME: review recover
-    }).recover(CCE::apply).get());
-  }
-
   private Optional<String> dbtype(final String url) {
     String type = Arrays.stream(url.toLowerCase().split(":"))
         .filter(
diff --git a/modules/jooby-jdbc/src/test/java/org/jooby/jdbc/JdbcTest.java b/modules/jooby-jdbc/src/test/java/org/jooby/jdbc/JdbcTest.java
@@ -169,22 +169,6 @@ public void fsdb() throws Exception {
         });
   }
 
-  @Test
-  public void cceExceptionInSource() throws Exception {
-    ClassCastException cce = new ClassCastException();
-    StackTraceElement e = new StackTraceElement(Jdbc.class.getName(), "accept", null, 0);
-    cce.setStackTrace(new StackTraceElement[]{e});
-    Jdbc.CCE.apply(cce);
-  }
-
-  @Test
-  public void cceExceptionWithoutSource() throws Exception {
-    ClassCastException cce = new ClassCastException();
-    StackTraceElement e = new StackTraceElement(JdbcTest.class.getName(), "accept", null, 0);
-    cce.setStackTrace(new StackTraceElement[]{e});
-    Jdbc.CCE.apply(cce);
-  }
-
   @Test
   public void dbWithCallback() throws Exception {
     Config config = ConfigFactory.parseResources(getClass(), "jdbc.conf");
@@ -785,11 +769,6 @@ public void unknownDb() throws Exception {
         });
   }
 
-  @Test(expected = IllegalStateException.class)
-  public void cceShouldRethrowException() throws Exception {
-    Jdbc.CCE.apply(new IllegalStateException());
-  }
-
   private Block serviceKey(final String db) {
     return serviceKey(db, null, null);
   }
