From 72688903323632c273b2afa36bd1b575aa1df352 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 20 May 2016 23:08:28 +1200 Subject: [PATCH] #719 - Remove deprecated Query.includeSoftDeletes() ... migrate to setIncludeSoftDeletes() --- src/main/java/com/avaje/ebean/Query.java | 6 ------ .../ebeaninternal/server/querydefn/DefaultOrmQuery.java | 5 ----- 2 files changed, 11 deletions(-) diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java index c8266ad56..f4f205018 100644 --- a/src/main/java/com/avaje/ebean/Query.java +++ b/src/main/java/com/avaje/ebean/Query.java @@ -301,12 +301,6 @@ public interface Query { */ Query asDraft(); - /** - * Deprecated in favour of setIncludeSoftDeletes(). - */ - @Deprecated - Query includeSoftDeletes(); - /** * Cancel the query execution if supported by the underlying database and * driver. 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 6765f5398..2d343c0cf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -313,11 +313,6 @@ public class DefaultOrmQuery implements SpiQuery { return this; } - @Override - public Query includeSoftDeletes() { - return setIncludeSoftDeletes(); - } - @Override public Query setIncludeSoftDeletes() { this.temporalMode = TemporalMode.SOFT_DELETED;