Merge pull request #780 from jooby-project/763

Support mySQL driver 6.x and upgrade to latest 5.x fix #763 fix #779

Author: jknack

jooby-jdbc/pom.xml

@@ -30,7 +30,6 @@
     <dependency>
       <groupId>com.impossibl.pgjdbc-ng</groupId>
       <artifactId>pgjdbc-ng</artifactId>
-      <version>0.7.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -87,13 +86,20 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- mySQL -->
+    <!-- h2 -->
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
 
+    <!-- mySQL -->
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>

jooby-jdbc/src/main/java/org/jooby/jdbc/Jdbc.java

@@ -45,8 +45,10 @@
 import com.google.inject.Binder;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigObject;
 import com.typesafe.config.ConfigValue;
 import com.typesafe.config.ConfigValueFactory;
+import com.typesafe.config.ConfigValueType;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
@@ -247,7 +249,7 @@ public class Jdbc implements Jooby.Module {
     Map<String, String> params = new HashMap<>(result._2);
     result = indexOf.apply(result._1, ";", ";");
     params.putAll(result._2);
-    List<String> parts = Splitter.on(CharMatcher.JAVA_LETTER_OR_DIGIT.negate())
+    List<String> parts = Splitter.on(CharMatcher.javaLetterOrDigit().negate())
         .trimResults()
         .omitEmptyStrings()
         .splitToList(result._1);
@@ -429,7 +431,7 @@ private HikariConfig hikariConfig(final String url, final String key, final Stri
      * # db.* -> dataSource.*
      * # hikari.* -> * (no prefix)
      */
-    dbtype.ifPresent(type -> config.getConfig("databases." + type)
+    dbtype.ifPresent(type -> dbconf(config, type)
         .entrySet().forEach(entry -> dumper.accept("dataSource.", entry)));
 
     dbconf.apply(key)
@@ -453,6 +455,30 @@ private HikariConfig hikariConfig(final String url, final String key, final Stri
     return new HikariConfig(props);
   }
 
+  @SuppressWarnings("unchecked")
+  private Config dbconf(final Config conf, final String type) {
+    String dbtype = "databases." + type;
+    ConfigValue value = conf.getValue(dbtype);
+    if (value.valueType() == ConfigValueType.OBJECT) {
+      return ((ConfigObject) value).toConfig();
+    }
+    List<Config> list = (List<Config>) conf.getConfigList(dbtype);
+    ClassLoader loader = getClass().getClassLoader();
+    return list.stream()
+        .filter(it -> dataSourcePresent(loader, it.getString("dataSourceClassName")))
+        .findFirst()
+        .orElse(list.get(0));
+  }
+
+  private boolean dataSourcePresent(final ClassLoader loader, final String className) {
+    try {
+      loader.loadClass(className.trim());
+      return true;
+    } catch (ClassNotFoundException e) {
+      return false;
+    }
+  }
+
   @SuppressWarnings("unchecked")
   protected void callback(final Object value, final Config conf) {
     this.callback.forEach(it -> Try.run(() -> it.accept(value, conf))

jooby-jdbc/src/main/resources/org/jooby/jdbc/jdbc.conf

@@ -60,14 +60,18 @@ databases {
   # mysql
   #      url jdbc:mysql://<host>:<port>/<database>?<key1>=<value1>&<key2>=<value2>...
   ###############################################################################################
-  mysql {
+  mysql: [{
+    # v6.x
+    dataSourceClassName = com.mysql.cj.jdbc.MysqlDataSource
+  }, {
+    # v5.x
     dataSourceClassName = com.mysql.jdbc.jdbc2.optional.MysqlDataSource
     encoding = ${application.charset}
     cachePrepStmts = true
     prepStmtCacheSize = 250
     prepStmtCacheSqlLimit = 2048
     useServerPrepStmts = true
-  }
+  }]
 
   ###############################################################################################
   # sqlserver

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jooby</groupId>
@@ -1116,6 +1117,13 @@
         <version>${mysql-connector-java.version}</version>
       </dependency>
 
+      <!-- pgjdbc-ng -->
+      <dependency>
+        <groupId>com.impossibl.pgjdbc-ng</groupId>
+        <artifactId>pgjdbc-ng</artifactId>
+        <version>${pgjdbc-ng.version}</version>
+      </dependency>
+
       <!-- Elasticsearch -->
       <dependency>
         <groupId>org.elasticsearch.client</groupId>
@@ -1871,7 +1879,7 @@
               </goals>
               <configuration>
                 <transformers>
-                  <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                  <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                   <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                     <mainClass>${application.class}</mainClass>
                   </transformer>
@@ -2964,7 +2972,8 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
     <config.version>1.3.1</config.version>
     <handlebars.version>4.0.5</handlebars.version>
     <h2.version>1.4.190</h2.version>
-    <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+    <mysql-connector-java.version>5.1.42</mysql-connector-java.version>
+    <pgjdbc-ng.version>0.7.1</pgjdbc-ng.version>
     <hikariCP.version>2.6.1</hikariCP.version>
     <hibernate.version>5.2.1.Final</hibernate.version>
     <hibernate4.version>4.3.9.Final</hibernate4.version>