Merge pull request #3514 from ebean-orm/feature/querybean-txn-ctor

Remove deprecated QueryBean constructor that takes transaction, migrate to query.usingTransaction()

Author: rbygrave

ebean-querybean/src/main/java/io/ebean/typequery/QueryBean.java

@@ -99,22 +99,6 @@ protected QueryBean(Class<T> beanType, Database database) {
     this(database.find(beanType));
   }
 
-  /**
-   * Construct with a transaction.
-   */
-  protected QueryBean(Class<T> beanType, Transaction transaction) {
-    this(beanType);
-    query.usingTransaction(transaction);
-  }
-
-  /**
-   * Construct with a database and transaction.
-   */
-  protected QueryBean(Class<T> beanType, Database database, Transaction transaction) {
-    this(beanType, database);
-    query.usingTransaction(transaction);
-  }
-
   /**
    * Construct using a query.
    */

ebean-querybean/src/test/java/org/querytest/QCustomerTest.java

@@ -47,8 +47,9 @@ public void findWithTransaction() {
 
       database.save(customer, txn);
 
-      final Customer found = new QCustomer(txn)
+      final Customer found = new QCustomer()
         .name.eq("explicitTransaction")
+        .usingTransaction(txn)
         .findOne();
       assertThat(found).isNotNull();
 

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

@@ -28,14 +28,6 @@ void rootBeanConstructor(Append writer, String shortName, String dbName, String
       writer.append("  constructor() : super(%s::class.java, io.ebean.DB.byName(\"%s\"))", fullName, dbName).eol().eol();
     }
 
-    writer.append("  /**  @deprecated migrate to query.usingTransaction() */", name).eol();
-    writer.append("  @Deprecated(message=\"migrate to query.usingTransaction()\")").eol();
-    if (dbName == null) {
-      writer.append("  constructor(transaction: io.ebean.Transaction) : super(%s::class.java, transaction)", fullName).eol().eol();
-    } else {
-      writer.append("  constructor(transaction: io.ebean.Transaction) : super(%s::class.java, io.ebean.DB.byName(\"%s\"), transaction)", fullName, dbName).eol().eol();
-    }
-
     writer.append("  /**  Construct with a given Database. */").eol();
     writer.append("  constructor(database: io.ebean.Database) : super(%s::class.java, database)", fullName).eol().eol();
 

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

@@ -160,16 +160,6 @@ private void writeConstructors() {
     writer.append("  }").eol();
     writer.eol();
 
-    writer.append("  /** @deprecated migrate to query.usingTransaction() */").eol();
-    writer.append("  @Deprecated(forRemoval = true)").eol();
-    writer.append("  public Q%s(io.ebean.Transaction transaction) {", shortName).eol();
-    if (dbName == null) {
-      writer.append("    super(%s.class, transaction);", beanFullName).eol();
-    } else {
-      writer.append("    super(%s.class, io.ebean.DB.byName(\"%s\"), transaction);", beanFullName, dbName).eol();
-    }
-    writer.append("  }").eol();
-
     writer.eol();
     writer.append("  /** Construct with a given Database */").eol();
     writer.append("  public Q%s(io.ebean.Database database) {", shortName).eol();