#20 - ENH: Generate query bean constructor taking Transaction

Author: rbygrave

src/main/java/io/ebean/querybean/generator/Constants.java

@@ -27,6 +27,7 @@ interface Constants {
   String DB = "io.ebean.DB";
   String FETCHGROUP = "io.ebean.FetchGroup";
   String QUERY = "io.ebean.Query";
+  String TRANSACTION = "io.ebean.Transaction";
 
   String MODULEINFO = "io.ebean.config.ModuleInfo";
   String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf";

src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java

@@ -69,12 +69,6 @@ public void rootBeanConstructor(Append writer, String shortName, String dbName)
 
     String name = (dbName == null) ? "default" : dbName;
 
-    writer.eol();
-    writer.append("  /**").eol();
-    writer.append("   * Construct with a given Database.").eol();
-    writer.append("   */").eol();
-    writer.append("  constructor(database: Database) : super(%s::class.java, database)", shortName).eol().eol();
-
     writer.append("  /**").eol();
     writer.append("   * Construct using the %s Database.", name).eol();
     writer.append("   */").eol();
@@ -83,6 +77,22 @@ public void rootBeanConstructor(Append writer, String shortName, String dbName)
     } else {
       writer.append("  constructor() : super(%s::class.java, DB.byName(\"%s\"))", shortName, dbName).eol().eol();
     }
+
+    writer.append("  /**").eol();
+    writer.append("   * Construct with a given Transaction.", name).eol();
+    writer.append("   */").eol();
+    if (dbName == null) {
+      writer.append("  constructor(transaction: Transaction) : super(%s::class.java, transaction)", shortName).eol().eol();
+    } else {
+      writer.append("  constructor(transaction: Transaction) : super(%s::class.java, DB.byName(\"%s\"), transaction)", shortName, dbName).eol().eol();
+    }
+
+    writer.eol();
+    writer.append("  /**").eol();
+    writer.append("   * Construct with a given Database.").eol();
+    writer.append("   */").eol();
+    writer.append("  constructor(database: Database) : super(%s::class.java, database)", shortName).eol().eol();
+
     writer.append("  /**").eol();
     writer.append("   * Construct for Alias.").eol();
     writer.append("   */").eol();

src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -22,6 +22,7 @@
 import static io.ebean.querybean.generator.Constants.TQASSOCBEAN;
 import static io.ebean.querybean.generator.Constants.TQPROPERTY;
 import static io.ebean.querybean.generator.Constants.TQROOTBEAN;
+import static io.ebean.querybean.generator.Constants.TRANSACTION;
 import static io.ebean.querybean.generator.Constants.TYPEQUERYBEAN;
 
 /**
@@ -108,6 +109,7 @@ private void gatherPropertyDetails() {
     importTypes.add(DATABASE);
     importTypes.add(FETCHGROUP);
     importTypes.add(QUERY);
+    importTypes.add(TRANSACTION);
     if (dbName != null) {
       importTypes.add(DB);
     }