Update to Play 2.3 and jOOQ 3.4

README.md

@@ -1,4 +1,4 @@
-# JOOQ Play 2.1 Module
+# JOOQ Play 2.3 Module
 
 This project provides a very simple Play plugin that will invoke the JOOQ generation for a database.
 The plugin will be invoked on startup of a Play app but will not be executed in Prod mode.

project-code/app/org/jooq/play/JooqPlugin.scala

@@ -5,7 +5,7 @@ import play.core._
 import play.api._
 
 import db.{DBApi, DBPlugin}
-import play.api.mvc.{SimpleResult, RequestHeader}
+import play.api.mvc.{Result, RequestHeader}
 import java.io.File
 import org.jooq.util.GenerationTool
 import org.jooq.util.jaxb.{Target, Database, Generator}
@@ -43,7 +43,7 @@ class JooqPlugin(val app: Application) extends Plugin with HandleWebCommandSuppo
     }
   }
 
-  def handleWebCommand(request: RequestHeader, sbtLink: SBTLink, path: File): Option[SimpleResult] = {
+  def handleWebCommand(request: RequestHeader, sbtLink: BuildLink, path: File): Option[Result] = {
 
     val applyGeneration = """/@jooq/generate""".r
 

project-code/build.sbt

@@ -0,0 +1,16 @@
+name := """play-jooq"""
+
+version := "1.0-SNAPSHOT"
+
+organization := "org.jooq"
+
+lazy val root = (project in file(".")).enablePlugins(PlayScala)
+
+scalaVersion := "2.11.2"
+
+libraryDependencies ++= Seq(
+  javaJdbc,
+  "org.jooq" % "jooq" % "3.4.2",
+  "org.jooq" % "jooq-meta" % "3.4.2",
+  "org.jooq" % "jooq-codegen" % "3.4.2"
+)

project-code/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.5

project-code/project/plugins.sbt

@@ -5,4 +5,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.4")

samples/play-jooq-sample/README.md

@@ -5,15 +5,15 @@ It's using Guice to inject the correct implementation of a helper that executes
 
 To run the h2 version simple do:
 
-    > play
+    > activator
     [play-jooq-sample] $ run
 
 To run the mysql version you can either run it in Dev mode with the following:
 
-    > play 
+    > activator
     [play-jooq-sample] $ run -Dconfig.file=conf/application.mysql.conf
 
 Or run it in Production mode with
 
-    > play
+    > activator
     [play-jooq-sample] $ start -Dconfig.file=conf/application.mysql.conf

samples/play-jooq-sample/app/controllers/Application.java

@@ -1,21 +1,27 @@
 package controllers;
 
+import models.task.Task;
 import models.task.TaskHelper;
 import play.mvc.Controller;
 import play.mvc.Result;
+import scala.collection.JavaConverters;
 import views.html.index;
 
 import javax.inject.Inject;
+import java.util.List;
 
-import static play.data.Form.form;
+import static play.data.Form.*;
 
 public class Application extends Controller {
 
     @Inject
     TaskHelper taskHelper;
 
     public Result index() {
-        return ok(index.render(taskHelper.getAll()));
+        List<Task> tasks = taskHelper.getAll();
+        scala.collection.immutable.List<Task> convertedTasks =
+                JavaConverters.asScalaBufferConverter(tasks).asScala().toList();
+        return ok(index.render(convertedTasks));
     }
 
     public Result createTask() {

samples/play-jooq-sample/app/models/PlayConnectionProvider.java

@@ -5,7 +5,8 @@
 import org.jooq.ConnectionProvider;
 import org.jooq.exception.DataAccessException;
 import play.Logger;
-import play.db.DB;
+import play.api.Play;
+import play.api.db.DB;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -20,7 +21,7 @@ public class PlayConnectionProvider implements ConnectionProvider {
     @Override
     public Connection acquire() throws DataAccessException {
         if (connection == null) {
-            connection = DB.getConnection();
+            connection = DB.getConnection("default", true, Play.current());
         }
         return connection;
     }

samples/play-jooq-sample/app/models/generated/h2/Keys.java

@@ -9,7 +9,7 @@
  * A class modelling foreign key relationships between tables of the <code>PUBLIC</code> 
  * schema
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Keys {

samples/play-jooq-sample/app/models/generated/h2/Public.java

@@ -6,12 +6,12 @@
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Public extends org.jooq.impl.SchemaImpl {
 
-	private static final long serialVersionUID = 706109300;
+	private static final long serialVersionUID = 385647136;
 
 	/**
 	 * The singleton instance of <code>PUBLIC</code>
@@ -34,7 +34,7 @@ public final java.util.List<org.jooq.Sequence<?>> getSequences() {
 
 	private final java.util.List<org.jooq.Sequence<?>> getSequences0() {
 		return java.util.Arrays.<org.jooq.Sequence<?>>asList(
-			models.generated.h2.Sequences.SYSTEM_SEQUENCE_481007AC_A7F8_4495_A921_F5321346FC31);
+			models.generated.h2.Sequences.SYSTEM_SEQUENCE_70298E0C_BC7D_4C45_9454_2511C6EE3F0D);
 	}
 
 	@Override

samples/play-jooq-sample/app/models/generated/h2/Sequences.java

@@ -8,13 +8,13 @@
  *
  * Convenience access to all sequences in PUBLIC
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Sequences {
 
 	/**
-	 * The sequence <code>PUBLIC.SYSTEM_SEQUENCE_481007AC_A7F8_4495_A921_F5321346FC31</code>
+	 * The sequence <code>PUBLIC.SYSTEM_SEQUENCE_70298E0C_BC7D_4C45_9454_2511C6EE3F0D</code>
 	 */
-	public static final org.jooq.Sequence<java.lang.Long> SYSTEM_SEQUENCE_481007AC_A7F8_4495_A921_F5321346FC31 = new org.jooq.impl.SequenceImpl<java.lang.Long>("SYSTEM_SEQUENCE_481007AC_A7F8_4495_A921_F5321346FC31", models.generated.h2.Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT);
+	public static final org.jooq.Sequence<java.lang.Long> SYSTEM_SEQUENCE_70298E0C_BC7D_4C45_9454_2511C6EE3F0D = new org.jooq.impl.SequenceImpl<java.lang.Long>("SYSTEM_SEQUENCE_70298E0C_BC7D_4C45_9454_2511C6EE3F0D", models.generated.h2.Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT);
 }

samples/play-jooq-sample/app/models/generated/h2/Tables.java

@@ -8,7 +8,7 @@
  *
  * Convenience access to all tables in PUBLIC
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Tables {

samples/play-jooq-sample/app/models/generated/h2/tables/Task.java

@@ -6,12 +6,12 @@
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Task extends org.jooq.impl.TableImpl<models.generated.h2.tables.records.TaskRecord> {
 
-	private static final long serialVersionUID = 915945629;
+	private static final long serialVersionUID = 170638844;
 
 	/**
 	 * The singleton instance of <code>PUBLIC.TASK</code>
@@ -27,27 +27,35 @@ public java.lang.Class<models.generated.h2.tables.records.TaskRecord> getRecordT
 	}
 
 	/**
-	 * The column <code>PUBLIC.TASK.ID</code>. 
+	 * The column <code>PUBLIC.TASK.ID</code>.
 	 */
-	public final org.jooq.TableField<models.generated.h2.tables.records.TaskRecord, java.lang.Long> ID = createField("ID", org.jooq.impl.SQLDataType.BIGINT, this);
+	public final org.jooq.TableField<models.generated.h2.tables.records.TaskRecord, java.lang.Long> ID = createField("ID", org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaulted(true), this, "");
 
 	/**
-	 * The column <code>PUBLIC.TASK.LABEL</code>. 
+	 * The column <code>PUBLIC.TASK.LABEL</code>.
 	 */
-	public final org.jooq.TableField<models.generated.h2.tables.records.TaskRecord, java.lang.String> LABEL = createField("LABEL", org.jooq.impl.SQLDataType.VARCHAR.length(255), this);
+	public final org.jooq.TableField<models.generated.h2.tables.records.TaskRecord, java.lang.String> LABEL = createField("LABEL", org.jooq.impl.SQLDataType.VARCHAR.length(255).defaulted(true), this, "");
 
 	/**
 	 * Create a <code>PUBLIC.TASK</code> table reference
 	 */
 	public Task() {
-		super("TASK", models.generated.h2.Public.PUBLIC);
+		this("TASK", null);
 	}
 
 	/**
 	 * Create an aliased <code>PUBLIC.TASK</code> table reference
 	 */
 	public Task(java.lang.String alias) {
-		super(alias, models.generated.h2.Public.PUBLIC, models.generated.h2.tables.Task.TASK);
+		this(alias, models.generated.h2.tables.Task.TASK);
+	}
+
+	private Task(java.lang.String alias, org.jooq.Table<models.generated.h2.tables.records.TaskRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private Task(java.lang.String alias, org.jooq.Table<models.generated.h2.tables.records.TaskRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, models.generated.h2.Public.PUBLIC, aliased, parameters, "");
 	}
 
 	/**
@@ -79,6 +87,13 @@ public java.util.List<org.jooq.UniqueKey<models.generated.h2.tables.records.Task
 	 */
 	@Override
 	public models.generated.h2.tables.Task as(java.lang.String alias) {
-		return new models.generated.h2.tables.Task(alias);
+		return new models.generated.h2.tables.Task(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public models.generated.h2.tables.Task rename(java.lang.String name) {
+		return new models.generated.h2.tables.Task(name, null);
 	}
 }

samples/play-jooq-sample/app/models/generated/h2/tables/records/TaskRecord.java

@@ -6,36 +6,36 @@
 /**
  * This class is generated by jOOQ.
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class TaskRecord extends org.jooq.impl.UpdatableRecordImpl<models.generated.h2.tables.records.TaskRecord> implements org.jooq.Record2<java.lang.Long, java.lang.String> {
 
-	private static final long serialVersionUID = 1025693091;
+	private static final long serialVersionUID = -96768823;
 
 	/**
-	 * Setter for <code>PUBLIC.TASK.ID</code>. 
+	 * Setter for <code>PUBLIC.TASK.ID</code>.
 	 */
 	public void setId(java.lang.Long value) {
 		setValue(0, value);
 	}
 
 	/**
-	 * Getter for <code>PUBLIC.TASK.ID</code>. 
+	 * Getter for <code>PUBLIC.TASK.ID</code>.
 	 */
 	public java.lang.Long getId() {
 		return (java.lang.Long) getValue(0);
 	}
 
 	/**
-	 * Setter for <code>PUBLIC.TASK.LABEL</code>. 
+	 * Setter for <code>PUBLIC.TASK.LABEL</code>.
 	 */
 	public void setLabel(java.lang.String value) {
 		setValue(1, value);
 	}
 
 	/**
-	 * Getter for <code>PUBLIC.TASK.LABEL</code>. 
+	 * Getter for <code>PUBLIC.TASK.LABEL</code>.
 	 */
 	public java.lang.String getLabel() {
 		return (java.lang.String) getValue(1);
@@ -105,6 +105,32 @@ public java.lang.String value2() {
 		return getLabel();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public TaskRecord value1(java.lang.Long value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public TaskRecord value2(java.lang.String value) {
+		setLabel(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public TaskRecord values(java.lang.Long value1, java.lang.String value2) {
+		return this;
+	}
+
 	// -------------------------------------------------------------------------
 	// Constructors
 	// -------------------------------------------------------------------------
@@ -115,4 +141,14 @@ public java.lang.String value2() {
 	public TaskRecord() {
 		super(models.generated.h2.tables.Task.TASK);
 	}
+
+	/**
+	 * Create a detached, initialised TaskRecord
+	 */
+	public TaskRecord(java.lang.Long id, java.lang.String label) {
+		super(models.generated.h2.tables.Task.TASK);
+
+		setValue(0, id);
+		setValue(1, label);
+	}
 }

samples/play-jooq-sample/app/models/generated/mysql/Keys.java

@@ -9,7 +9,7 @@
  * A class modelling foreign key relationships between tables of the <code>tasks</code> 
  * schema
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Keys {

samples/play-jooq-sample/app/models/generated/mysql/Tables.java

@@ -8,7 +8,7 @@
  *
  * Convenience access to all tables in tasks
  */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.1.0" },
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Tables {