diff --git a/src/main/java/com/avaje/ebean/PagedList.java b/src/main/java/com/avaje/ebean/PagedList.java index e6daf3573..5aeef1895 100644 --- a/src/main/java/com/avaje/ebean/PagedList.java +++ b/src/main/java/com/avaje/ebean/PagedList.java @@ -112,13 +112,6 @@ public interface PagedList { */ void loadCount(); - /** - * Deprecated in favor of loadCount(). - * - * @deprecated - */ - void loadRowCount(); - /** * Return the Future row count. You might get this if you wish to cancel the total row count query * or specify a timeout for the row count query. @@ -147,13 +140,6 @@ public interface PagedList { */ Future getFutureCount(); - /** - * Deprecated in favor of getFutureCount(). - * - * @deprecated - */ - Future getFutureRowCount(); - /** * Return the list of entities for this page. */ @@ -186,13 +172,6 @@ public interface PagedList { */ int getTotalCount(); - /** - * Deprecated in favor of getTotalCount(). - * - * @deprecated - */ - int getTotalRowCount(); - /** * Return the total number of pages based on the page size and total row count. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java b/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java index 07c4d04dc..301fc884f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -47,10 +47,6 @@ public class LimitOffsetPagedList implements PagedList { getFutureCount(); } - public void loadRowCount() { - loadCount(); - } - public Future getFutureCount() { synchronized (monitor) { if (futureRowCount == null) { @@ -60,10 +56,6 @@ public class LimitOffsetPagedList implements PagedList { } } - public Future getFutureRowCount() { - return getFutureCount(); - } - public List getList() { synchronized (monitor) { if (list == null) { @@ -110,10 +102,6 @@ public class LimitOffsetPagedList implements PagedList { } } - public int getTotalRowCount() { - return getTotalCount(); - } - public boolean hasNext() { return (firstRow + maxRows) < getTotalCount(); } diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java index 3581fb475..0543710f3 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java @@ -58,11 +58,11 @@ public class TestQueryFindPagedList extends BaseTestCase { .setMaxRows(3) .findPagedList(); - Future rowCount = pagedList.getFutureRowCount(); + Future rowCount = pagedList.getFutureCount(); List orders = pagedList.getList(); // these are each getting the total row count - int totalRowCount = pagedList.getTotalRowCount(); + int totalRowCount = pagedList.getTotalCount(); Integer totalRowCountWithTimeout = rowCount.get(30, TimeUnit.SECONDS); Integer totalRowCountViaFuture = rowCount.get(); @@ -81,7 +81,7 @@ public class TestQueryFindPagedList extends BaseTestCase { .setMaxRows(3) .findPagedList(); - pagedList.loadRowCount(); + pagedList.loadCount(); List orders = pagedList.getList(); int totalRowCount = pagedList.getTotalCount();