From de6ba31996bcbfc65d55c8140f856aa18af2e0a4 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Tue, 29 Mar 2016 16:38:09 +1300 Subject: [PATCH] #627 - Rename Query.includeSoftDeletes() to Query.setIncludeSoftDeletes() --- src/main/java/com/avaje/ebean/ExpressionList.java | 8 +++++++- src/main/java/com/avaje/ebean/Query.java | 8 +++++++- .../server/expression/DefaultExpressionList.java | 7 ++++++- .../server/expression/JunctionExpression.java | 7 ++++++- .../ebeaninternal/server/loadcontext/DLoadContext.java | 2 +- .../ebeaninternal/server/persist/DefaultPersister.java | 2 +- .../server/persist/DeleteUnloadedForeignKeys.java | 2 +- .../ebeaninternal/server/querydefn/DefaultOrmQuery.java | 5 +++++ .../com/avaje/tests/softdelete/TestSoftDeleteBasic.java | 4 ++-- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java index f05031add..10d805c88 100644 --- a/src/main/java/com/avaje/ebean/ExpressionList.java +++ b/src/main/java/com/avaje/ebean/ExpressionList.java @@ -116,10 +116,16 @@ public interface ExpressionList { */ Query asDraft(); + /** + * Deprecated in favour of setIncludeSoftDeletes(). + */ + @Deprecated + Query includeSoftDeletes(); + /** * Execute the query including soft deleted rows. */ - Query includeSoftDeletes(); + Query setIncludeSoftDeletes(); /** * Execute as a delete query deleting the 'root level' beans that match the predicates diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java index fecc7eeb9..f8046524c 100644 --- a/src/main/java/com/avaje/ebean/Query.java +++ b/src/main/java/com/avaje/ebean/Query.java @@ -302,8 +302,9 @@ public interface Query { Query asDraft(); /** - * Execute the query including soft deleted rows. + * Deprecated in favour of setIncludeSoftDeletes(). */ + @Deprecated Query includeSoftDeletes(); /** @@ -375,6 +376,11 @@ public interface Query { */ Query setLazyLoadBatchSize(int lazyLoadBatchSize); + /** + * Execute the query including soft deleted rows. + */ + Query setIncludeSoftDeletes(); + /** * Disable read auditing for this query. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java index bb6ce53e6..1f997f1f2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java @@ -219,7 +219,12 @@ public class DefaultExpressionList implements SpiExpressionList { @Override public Query includeSoftDeletes() { - return query.includeSoftDeletes(); + return setIncludeSoftDeletes(); + } + + @Override + public Query setIncludeSoftDeletes() { + return query.setIncludeSoftDeletes(); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java index fd228160e..4170034e2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java @@ -292,7 +292,12 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression @Override public Query includeSoftDeletes() { - return exprList.includeSoftDeletes(); + return setIncludeSoftDeletes(); + } + + @Override + public Query setIncludeSoftDeletes() { + return exprList.setIncludeSoftDeletes(); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java index 4eeb0decd..608236266 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/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(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java index 5583366e7..bad7189a2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java +++ b/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; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index 6b5093d25..9a8488231 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/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(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 5165329dc..34ebb9a87 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -358,6 +358,11 @@ public class DefaultOrmQuery implements SpiQuery { @Override public Query includeSoftDeletes() { + return setIncludeSoftDeletes(); + } + + @Override + public Query setIncludeSoftDeletes() { this.temporalMode = TemporalMode.SOFT_DELETED; return this; } diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java index 47f6603b6..5e27ca7b3 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java +++ b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java @@ -37,7 +37,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { EBasicSoftDelete findInclude = Ebean.find(EBasicSoftDelete.class) .setId(bean.getId()) - .includeSoftDeletes() + .setIncludeSoftDeletes() .findUnique(); assertThat(findInclude).isNotNull(); @@ -70,7 +70,7 @@ public class TestSoftDeleteBasic extends BaseTestCase { // -- test includeSoftDeletes().findRowCount() LoggedSqlCollector.start(); - int rowCountFull = Ebean.find(EBasicSoftDelete.class).includeSoftDeletes().findRowCount(); + int rowCountFull = Ebean.find(EBasicSoftDelete.class).setIncludeSoftDeletes().findRowCount(); assertThat(rowCountFull).isGreaterThan(rowCountAfter); loggedSql = LoggedSqlCollector.stop();