Add some jooq helpers and bump version

billoneil · billoneil · commit ff368ea3766a · 2017-11-02T23:11:12.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
 
     // Using Jitpack so I need the repo name in the group to match.
     group = 'com.stubbornjava.StubbornJava'
-    version = '0.1.23-SNAPSHOT'
+    version = '0.1.24-SNAPSHOT'
 
     repositories { 
         mavenLocal()
diff --git a/stubbornjava-common/build.gradle b/stubbornjava-common/build.gradle
@@ -34,6 +34,8 @@ dependencies {
     compile libs.jsoup
     compile libs.sitemapgen4j
     compile libs.jbcrypt
+    compile libs.jooq
+    compile libs.jooqCodegen
     
     testCompile libs.junit
 }
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/db/jooq/JooqConfig.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/db/jooq/JooqConfig.java
@@ -0,0 +1,40 @@
+package com.stubbornjava.common.db.jooq;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.jooq.SQLDialect;
+import org.jooq.impl.DataSourceConnectionProvider;
+import org.jooq.impl.DefaultConfiguration;
+import org.jooq.util.jaxb.ForcedType;
+
+import com.google.common.collect.Lists;
+
+public class JooqConfig {
+
+    public static DefaultConfiguration defaultConfigFromDataSource(DataSource ds) {
+        DataSourceConnectionProvider dcp = new DataSourceConnectionProvider(ds);
+        DefaultConfiguration jooqConfig = new DefaultConfiguration();
+        jooqConfig.set(SQLDialect.MYSQL);
+        jooqConfig.set(dcp);
+        return jooqConfig;
+    }
+
+    public static List<ForcedType> defaultForcedTypes() {
+        return Lists.newLinkedList(Arrays.asList(new ForcedType[] {
+            forcedType("BOOLEAN", "tinyint", Boolean.class),
+            forcedType("LocalDate", "date", LocalDateConverter.class),
+            forcedType("LocalDateTime", "datetime", LocalDateTimeConverter.class)
+        }));
+    }
+
+    private static ForcedType forcedType(String name, String types, Class<?> clazz) {
+        ForcedType type = new ForcedType();
+        type.setName(name);
+        type.setTypes(types);
+        type.setConverter(clazz.getName());
+        return type;
+    }
+}
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/db/jooq/LocalDateConverter.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/db/jooq/LocalDateConverter.java
@@ -0,0 +1,33 @@
+package com.stubbornjava.common.db.jooq;
+
+import org.jooq.Converter;
+
+import java.sql.Date;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+public class LocalDateConverter implements Converter<Date, LocalDate> {
+
+    @Override
+    public LocalDate from(Date date) {
+        return null == date ? null : LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault()).toLocalDate();
+    }
+
+    @Override
+    public Date to(LocalDate localDate) {
+        return null == localDate ? null : java.sql.Date.valueOf(localDate);
+    }
+
+    @Override
+    public Class<Date> fromType() {
+        return Date.class;
+    }
+
+    @Override
+    public Class<LocalDate> toType() {
+        return LocalDate.class;
+    }
+
+}
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/db/jooq/LocalDateTimeConverter.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/db/jooq/LocalDateTimeConverter.java
@@ -0,0 +1,32 @@
+package com.stubbornjava.common.db.jooq;
+
+import org.jooq.Converter;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+public class LocalDateTimeConverter implements Converter<Timestamp, LocalDateTime> {
+
+    @Override
+    public LocalDateTime from(Timestamp date) {
+        return null == date ? null : LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());
+    }
+
+    @Override
+    public Timestamp to(LocalDateTime localDate) {
+        return null == localDate ? null : Timestamp.from(localDate.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
+    @Override
+    public Class<Timestamp> fromType() {
+        return Timestamp.class;
+    }
+
+    @Override
+    public Class<LocalDateTime> toType() {
+        return LocalDateTime.class;
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ dependencies {`
`34`	`34`	`compile libs.jsoup`
`35`	`35`	`compile libs.sitemapgen4j`
`36`	`36`	`compile libs.jbcrypt`
	`37`	`+ compile libs.jooq`
	`38`	`+ compile libs.jooqCodegen`
`37`	`39`
`38`	`40`	`testCompile libs.junit`
`39`	`41`	`}`