From c427009b93b7647c1607077b3905b7f81dce4fc3 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 5 Aug 2016 13:47:32 +1200
Subject: [PATCH] #812 - Remove deprecated includeSoftDeletes() ... migrate to
 setIncludeSoftDeletes()

---
 src/main/java/com/avaje/ebean/ExpressionList.java         | 6 ------
 .../server/expression/DefaultExpressionList.java          | 5 -----
 .../server/expression/JunctionExpression.java             | 8 ++------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java
index 40db32065..4f8d38d29 100644
--- a/src/main/java/com/avaje/ebean/ExpressionList.java
+++ b/src/main/java/com/avaje/ebean/ExpressionList.java
@@ -116,12 +116,6 @@ public interface ExpressionList<T> {
    */
   Query<T> asDraft();
 
-  /**
-   * Deprecated in favour of setIncludeSoftDeletes().
-   */
-  @Deprecated
-  Query<T> includeSoftDeletes();
-
   /**
    * Execute the query including soft deleted rows.
    */
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 a62f9a7bd..9c3eb64d1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -253,11 +253,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.asDraft();
   }
 
-  @Override
-  public Query<T> includeSoftDeletes() {
-    return setIncludeSoftDeletes();
-  }
-
   @Override
   public Query<T> setIncludeSoftDeletes() {
     return query.setIncludeSoftDeletes();
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 1df86c1e7..1788ce7cb 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
@@ -63,6 +63,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
    * This is expected to only used after expressions are built via query language parsing.
    * </p>
    */
+  @SuppressWarnings("unchecked")
   public void simplify() {
     exprList.simplifyEntries();
 
@@ -326,11 +327,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.asDraft();
   }
 
-  @Override
-  public Query<T> includeSoftDeletes() {
-    return setIncludeSoftDeletes();
-  }
-
   @Override
   public Query<T> setIncludeSoftDeletes() {
     return exprList.setIncludeSoftDeletes();
@@ -372,7 +368,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   }
 
   @Override
-  public List<Object> findIds() {
+  public <A> List<A> findIds() {
     return exprList.findIds();
   }