#51 - 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/SimpleQueryBeanWriter.java

@@ -21,6 +21,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;
 
 /**
@@ -77,6 +78,8 @@ private void gatherPropertyDetails() {
     importTypes.add(DATABASE);
     importTypes.add(FETCHGROUP);
     importTypes.add(QUERY);
+    importTypes.add(TRANSACTION);
+
     if (dbName != null) {
       importTypes.add(DB);
     }
@@ -199,15 +202,6 @@ private void writeRootBeanConstructor() {
     writer.append("  }").eol();
     writer.eol();
 
-    writer.eol();
-    writer.append("  /**").eol();
-    writer.append("   * Construct with a given Database.").eol();
-    writer.append("   */").eol();
-    writer.append("  public Q%s(Database server) {", shortName).eol();
-    writer.append("    super(%s.class, server);", shortName).eol();
-    writer.append("  }").eol();
-    writer.eol();
-
     String name = (dbName == null) ? "default" : dbName;
     writer.append("  /**").eol();
     writer.append("   * Construct using the %s Database.", name).eol();
@@ -219,6 +213,27 @@ private void writeRootBeanConstructor() {
       writer.append("    super(%s.class, DB.byName(\"%s\"));", shortName, dbName).eol();
     }
     writer.append("  }").eol();
+    writer.eol();
+
+    writer.append("  /**").eol();
+    writer.append("   * Construct with a given transaction.", name).eol();
+    writer.append("   */").eol();
+    writer.append("  public Q%s(Transaction transaction) {", shortName).eol();
+    if (dbName == null) {
+      writer.append("    super(%s.class, transaction);", shortName).eol();
+    } else {
+      writer.append("    super(%s.class, DB.byName(\"%s\"), transaction);", shortName, dbName).eol();
+    }
+    writer.append("  }").eol();
+
+    writer.eol();
+    writer.append("  /**").eol();
+    writer.append("   * Construct with a given Database.").eol();
+    writer.append("   */").eol();
+    writer.append("  public Q%s(Database database) {", shortName).eol();
+    writer.append("    super(%s.class, database);", shortName).eol();
+    writer.append("  }").eol();
+    writer.eol();
 
     writer.eol();
     writer.append("  /**").eol();