From 014a9aef6fdd8a445fb667e806972269449577aa Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 3 Oct 2016 22:31:33 +1300 Subject: [PATCH] #826 - Remove deprecated methods - migrate findRowCount() to findCount() & findFutureRowCount() to findFutureCount() --- .../java/com/avaje/ebean/EbeanServer.java | 18 +------------- .../java/com/avaje/ebean/ExpressionList.java | 14 ----------- src/main/java/com/avaje/ebean/Query.java | 24 ------------------- .../expression/DefaultExpressionList.java | 10 -------- .../expression/FilterExpressionList.java | 10 -------- .../server/expression/JunctionExpression.java | 12 +--------- .../server/querydefn/DefaultOrmQuery.java | 10 -------- .../ebeaninternal/api/TDSpiEbeanServer.java | 10 -------- .../query/TestQueryPlanCacheRowCount.java | 2 +- 9 files changed, 3 insertions(+), 107 deletions(-) diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java index 3490bd203..d4f72b1a5 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/com/avaje/ebean/EbeanServer.java @@ -746,14 +746,6 @@ public interface EbeanServer { */ int findCount(Query query, Transaction transaction); - /** - * Deprecated in favor of findCount() - * - * Return the number of 'top level' or 'root' entities this query should return. - * @deprecated - */ - int findRowCount(Query 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() */ FutureRowCount findFutureCount(Query query, Transaction transaction); - /** - * Deprecated in favor of findFutureCount(). - * - * Execute find row count query in a background thread. - * @deprecated - */ - FutureRowCount findFutureRowCount(Query query, Transaction transaction); - /** * Execute find Id's query in a background thread. *

diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java index 4f8d38d29..1d123899c 100644 --- a/src/main/java/com/avaje/ebean/ExpressionList.java +++ b/src/main/java/com/avaje/ebean/ExpressionList.java @@ -185,13 +185,6 @@ public interface ExpressionList { */ int findCount(); - /** - * Deprecated in favor of findCount(). - * - * @deprecated - */ - int findRowCount(); - /** * Execute the query returning a set. * @@ -265,13 +258,6 @@ public interface ExpressionList { */ FutureRowCount findFutureCount(); - /** - * Deprecated in favor of findFutureCount(). - * - * @deprecated - */ - FutureRowCount findFutureRowCount(); - /** * Execute find Id's query in a background thread. *

diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java index 47b4661cc..a3fc51e58 100644 --- a/src/main/java/com/avaje/ebean/Query.java +++ b/src/main/java/com/avaje/ebean/Query.java @@ -845,15 +845,6 @@ public interface Query { */ int findCount(); - /** - * Deprecated in favor of findCount(). - *

- * Return the count of entities this query should return. - * - * @deprecated - */ - int findRowCount(); - /** * Execute find row count query in a background thread. *

@@ -866,21 +857,6 @@ public interface Query { */ FutureRowCount findFutureCount(); - /** - * Deprecated in favor of findFutureCount(). - *

- * Execute find row count query in a background thread. - *

- * 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). - *

- * - * @return a Future object for the row count query - * @deprecated - */ - FutureRowCount findFutureRowCount(); - /** * Execute find Id's query in a background thread. *

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 9c3eb64d1..497317fcf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java @@ -323,11 +323,6 @@ public class DefaultExpressionList implements SpiExpressionList { return query.findFutureCount(); } - @Override - public FutureRowCount findFutureRowCount() { - return findFutureCount(); - } - @Override public FutureList findFutureList() { return query.findFutureList(); @@ -343,11 +338,6 @@ public class DefaultExpressionList implements SpiExpressionList { return query.findCount(); } - @Override - public int findRowCount() { - return findCount(); - } - @Override public List findIds() { return query.findIds(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java index cea91d4bf..dc3852ef6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java @@ -53,11 +53,6 @@ public class FilterExpressionList extends DefaultExpressionList { return rootQuery.findFutureCount(); } - @Override - public FutureRowCount findFutureRowCount() { - return findFutureCount(); - } - @Override public List findList() { return rootQuery.findList(); @@ -73,11 +68,6 @@ public class FilterExpressionList extends DefaultExpressionList { return rootQuery.findCount(); } - @Override - public int findRowCount() { - return findCount(); - } - @Override public Set findSet() { return rootQuery.findSet(); 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 1788ce7cb..6a3351d66 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java @@ -362,11 +362,6 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression return exprList.findFutureCount(); } - @Override - public FutureRowCount findFutureRowCount() { - return findFutureCount(); - } - @Override public List findIds() { return exprList.findIds(); @@ -409,12 +404,7 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression @Override public int findCount() { - return exprList.findRowCount(); - } - - @Override - public int findRowCount() { - return findCount(); + return exprList.findCount(); } @Override 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 370fd8bc8..fa84c0039 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1099,11 +1099,6 @@ public class DefaultOrmQuery implements SpiQuery { return server.findCount(this, null); } - @Override - public int findRowCount() { - return findCount(); - } - @Override public void findEachWhile(QueryEachWhileConsumer consumer) { server.findEachWhile(this, consumer, null); @@ -1177,11 +1172,6 @@ public class DefaultOrmQuery implements SpiQuery { return server.findFutureCount(this, null); } - @Override - public FutureRowCount findFutureRowCount() { - return findFutureCount(); - } - @Override public PagedList findPagedList() { return server.findPagedList(this, null); diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index a05d5fc98..878c487e7 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -460,11 +460,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { return 0; } - @Override - public int findRowCount(Query query, Transaction transaction) { - return 0; - } - @Override public List findIds(Query query, Transaction transaction) { return null; @@ -495,11 +490,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { return null; } - @Override - public FutureRowCount findFutureRowCount(Query query, Transaction transaction) { - return null; - } - @Override public FutureIds findFutureIds(Query query, Transaction transaction) { return null; diff --git a/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java b/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java index 475fc4cfc..fd74211ce 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java +++ b/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java @@ -21,7 +21,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { Query query = Ebean.find(Order.class).where().eq("status", Order.Status.NEW).ge("id", 1) .order().desc("id"); - int rc0 = query.findRowCount(); + int rc0 = query.findCount(); List ids = query.findIds(); Assert.assertEquals(rc0, ids.size());