Merge pull request #3562 from ebean-orm/feature/remove-deprecated-queryUpdTxn

Remove deprecated query.update(txn) & query.delete(txn)

Author: rbygrave

ebean-api/src/main/java/io/ebean/ExpressionList.java

@@ -221,21 +221,6 @@ default OrderBy<T> order() {
    */
   int delete();
 
-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   * </p>
-   *
-   * @return the number of rows that were deleted.
-   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
-  int delete(Transaction transaction);
-
   /**
    * Execute as a update query.
    *
@@ -244,17 +229,6 @@ default OrderBy<T> order() {
    */
   int update();
 
-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
-   * Execute as a update query with the given transaction.
-   *
-   * @return the number of rows that were updated.
-   * @see UpdateQuery
-   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
-  int update(Transaction transaction);
-
   /**
    * Execute the query returning true if a row is found.
    * <p>

ebean-api/src/main/java/io/ebean/Query.java

@@ -218,29 +218,6 @@ enum LockWait {
    */
   boolean isCountDistinct();
 
-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
-   * Execute as a delete query returning the number of rows deleted using the given transaction.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  @Deprecated(forRemoval = true, since = "14.1.0")
-  int delete(Transaction transaction);
-
-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
-   * Execute the UpdateQuery returning the number of rows updated using the given transaction.
-   *
-   * @return the number of beans/rows updated.
-   */
-  @Deprecated(forRemoval = true, since = "14.1.0")
-  int update(Transaction transaction);
-
   /**
    * Execute the UpdateQuery returning the number of rows updated.
    *

ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java

@@ -332,21 +332,11 @@ public int delete() {
     return query.delete();
   }
 
-  @Override
-  public int delete(Transaction transaction) {
-    return query.delete(transaction);
-  }
-
   @Override
   public int update() {
     return query.update();
   }
 
-  @Override
-  public int update(Transaction transaction) {
-    return query.update(transaction);
-  }
-
   @Override
   public FutureIds<T> findFutureIds() {
     return query.findFutureIds();

ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java

@@ -337,21 +337,11 @@ public int delete() {
     return exprList.delete();
   }
 
-  @Override
-  public int delete(Transaction transaction) {
-    return exprList.delete(transaction);
-  }
-
   @Override
   public int update() {
     return exprList.update();
   }
 
-  @Override
-  public int update(Transaction transaction) {
-    return exprList.update(transaction);
-  }
-
   @Override
   public Query<T> asOf(Timestamp asOf) {
     return exprList.asOf(asOf);

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -340,21 +340,11 @@ public int delete() {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public int delete(Transaction transaction) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public int update() {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public int update(Transaction transaction) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public int findCount() {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -1481,21 +1481,11 @@ public final int delete() {
     return server.delete(this);
   }
 
-  @Override
-  public final int delete(Transaction transaction) {
-    return server.delete(this);
-  }
-
   @Override
   public final int update() {
     return server.update(this);
   }
 
-  @Override
-  public final int update(Transaction transaction) {
-    return server.update(this);
-  }
-
   @Override
   public final <A> List<A> findIds() {
     // a copy of this query is made in the server

ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java

@@ -356,14 +356,14 @@ public void updateQuery_withExplicitTransaction() {
         .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE)
         .where()
         .gt("id", 10000)
-        .update(transaction); // .usingTransaction(transaction).update();
+        .usingTransaction(transaction).update();
 
       rowsQuery = server
         .update(Customer.class)
         .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE)
         .where()
         .gt("id", 10001)
-        .query().update(transaction);
+        .usingTransaction(transaction).update();
 
       transaction.commit();
     }
@@ -387,13 +387,13 @@ public void deleteQuery_withExplicitTransaction() {
         .update(Customer.class)
         .where()
         .gt("id", 10000)
-        .delete(transaction);
+        .usingTransaction(transaction).delete();
 
       rowsQuery = server
         .update(Customer.class)
         .where()
         .gt("id", 10001)
-        .query().delete(transaction);
+        .usingTransaction(transaction).delete();
 
       transaction.commit();
     }