#627 - Rename Query.includeSoftDeletes() to Query.setIncludeSoftDeletes()

src/main/java/com/avaje/ebean/ExpressionList.java

@@ -116,10 +116,16 @@ public interface ExpressionList<T> {
    */
   Query<T> asDraft();
 
+  /**
+   * Deprecated in favour of setIncludeSoftDeletes().
+   */
+  @Deprecated
+  Query<T> includeSoftDeletes();
+
   /**
    * Execute the query including soft deleted rows.
    */
-  Query<T> includeSoftDeletes();
+  Query<T> setIncludeSoftDeletes();
 
   /**
    * Execute as a delete query deleting the 'root level' beans that match the predicates

src/main/java/com/avaje/ebean/Query.java

@@ -302,8 +302,9 @@ public interface Query<T> {
   Query<T> asDraft();
 
   /**
-   * Execute the query including soft deleted rows.
+   * Deprecated in favour of setIncludeSoftDeletes().
    */
+  @Deprecated
   Query<T> includeSoftDeletes();
 
   /**
@@ -375,6 +376,11 @@ public interface Query<T> {
    */
   Query<T> setLazyLoadBatchSize(int lazyLoadBatchSize);
 
+  /**
+   * Execute the query including soft deleted rows.
+   */
+  Query<T> setIncludeSoftDeletes();
+
   /**
    * Disable read auditing for this query.
    * <p>

src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java

@@ -219,7 +219,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   @Override
   public Query<T> includeSoftDeletes() {
-    return query.includeSoftDeletes();
+    return setIncludeSoftDeletes();
+  }
+
+  @Override
+  public Query<T> setIncludeSoftDeletes() {
+    return query.setIncludeSoftDeletes();
   }
 
   @Override

src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java

@@ -292,7 +292,12 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public Query<T> includeSoftDeletes() {
-    return exprList.includeSoftDeletes();
+    return setIncludeSoftDeletes();
+  }
+
+  @Override
+  public Query<T> setIncludeSoftDeletes() {
+    return exprList.setIncludeSoftDeletes();
   }
 
   @Override

src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java

@@ -344,7 +344,7 @@ public class DLoadContext implements LoadContext {
       query.asDraft();
     }
     if (includeSoftDeletes) {
-      query.includeSoftDeletes();
+      query.setIncludeSoftDeletes();
     }
     if (disableReadAudit) {
       query.setDisableReadAuditing();

src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java

@@ -729,7 +729,7 @@ public final class DefaultPersister implements Persister {
     q.select(sb.toString());
     if (!softDelete) {
       // hard delete so we want this query to include logically deleted rows (if any)
-      q.includeSoftDeletes();
+      q.setIncludeSoftDeletes();
     }
     return q;
   }

src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java

@@ -68,7 +68,7 @@ class DeleteUnloadedForeignKeys {
     q.setPersistenceContextScope(PersistenceContextScope.QUERY);
     q.setAutoTune(false);
     q.select(sb.toString());
-    q.includeSoftDeletes();
+    q.setIncludeSoftDeletes();
     q.where().idEq(id);
 
     SpiTransaction t = request.getTransaction();

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -358,6 +358,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public Query<T> includeSoftDeletes() {
+    return setIncludeSoftDeletes();
+  }
+
+  @Override
+  public Query<T> setIncludeSoftDeletes() {
     this.temporalMode = TemporalMode.SOFT_DELETED;
     return this;
   }