#826 - Remove deprecated methods - migrate findRowCount() to findCount() & findFutureRowCount() to findFutureCount()

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

@@ -746,14 +746,6 @@ public interface EbeanServer {
    */
   <T> int findCount(Query<T> query, Transaction transaction);
 
-  /**
-   * Deprecated in favor of findCount()
-   *
-   * Return the number of 'top level' or 'root' entities this query should return.
-   * @deprecated
-   */
-  <T> int findRowCount(Query<T> query, Transaction transaction);
-
   /**
    * Return the Id values of the query as a List.
    *
@@ -892,18 +884,10 @@ public interface EbeanServer {
    * @param query       the query to execute the row count on
    * @param transaction the transaction (can be null).
    * @return a Future object for the row count query
-   * @see com.avaje.ebean.Query#findFutureRowCount()
+   * @see com.avaje.ebean.Query#findFutureCount()
    */
   <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
 
-  /**
-   * Deprecated in favor of findFutureCount().
-   *
-   * Execute find row count query in a background thread.
-   * @deprecated
-   */
-   <T> FutureRowCount<T> findFutureRowCount(Query<T> query, Transaction transaction);
-
   /**
    * Execute find Id's query in a background thread.
    * <p>

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

@@ -185,13 +185,6 @@ public interface ExpressionList<T> {
    */
   int findCount();
 
-  /**
-   * Deprecated in favor of findCount().
-   *
-   * @deprecated
-   */
-  int findRowCount();
-
   /**
    * Execute the query returning a set.
    *
@@ -265,13 +258,6 @@ public interface ExpressionList<T> {
    */
   FutureRowCount<T> findFutureCount();
 
-  /**
-   * Deprecated in favor of findFutureCount().
-   *
-   * @deprecated
-   */
-  FutureRowCount<T> findFutureRowCount();
-
   /**
    * Execute find Id's query in a background thread.
    * <p>

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

@@ -845,15 +845,6 @@ public interface Query<T> {
    */
   int findCount();
 
-  /**
-   * Deprecated in favor of findCount().
-   * <p>
-   * Return the count of entities this query should return.
-   *
-   * @deprecated
-   */
-  int findRowCount();
-
   /**
    * Execute find row count query in a background thread.
    * <p>
@@ -866,21 +857,6 @@ public interface Query<T> {
    */
   FutureRowCount<T> findFutureCount();
 
-  /**
-   * Deprecated in favor of findFutureCount().
-   * <p>
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the row count query
-   * @deprecated
-   */
-  FutureRowCount<T> findFutureRowCount();
-
   /**
    * Execute find Id's query in a background thread.
    * <p>

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

@@ -323,11 +323,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findFutureCount();
   }
 
-  @Override
-  public FutureRowCount<T> findFutureRowCount() {
-    return findFutureCount();
-  }
-
   @Override
   public FutureList<T> findFutureList() {
     return query.findFutureList();
@@ -343,11 +338,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findCount();
   }
 
-  @Override
-  public int findRowCount() {
-    return findCount();
-  }
-
   @Override
   public <A> List<A> findIds() {
     return query.findIds();

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

@@ -53,11 +53,6 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
     return rootQuery.findFutureCount();
   }
 
-  @Override
-  public FutureRowCount<T> findFutureRowCount() {
-    return findFutureCount();
-  }
-
   @Override
   public List<T> findList() {
     return rootQuery.findList();
@@ -73,11 +68,6 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
     return rootQuery.findCount();
   }
 
-  @Override
-  public int findRowCount() {
-    return findCount();
-  }
-
   @Override
   public Set<T> findSet() {
     return rootQuery.findSet();

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

@@ -362,11 +362,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.findFutureCount();
   }
 
-  @Override
-  public FutureRowCount<T> findFutureRowCount() {
-    return findFutureCount();
-  }
-
   @Override
   public <A> List<A> findIds() {
     return exprList.findIds();
@@ -409,12 +404,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public int findCount() {
-    return exprList.findRowCount();
-  }
-
-  @Override
-  public int findRowCount() {
-    return findCount();
+    return exprList.findCount();
   }
 
   @Override

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

@@ -1099,11 +1099,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findCount(this, null);
   }
 
-  @Override
-  public int findRowCount() {
-    return findCount();
-  }
-
   @Override
   public void findEachWhile(QueryEachWhileConsumer<T> consumer) {
     server.findEachWhile(this, consumer, null);
@@ -1177,11 +1172,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findFutureCount(this, null);
   }
 
-  @Override
-  public FutureRowCount<T> findFutureRowCount() {
-    return findFutureCount();
-  }
-
   @Override
   public PagedList<T> findPagedList() {
     return server.findPagedList(this, null);