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

This commit is contained in:
Robin Bygrave
2016-10-03 22:31:33 +13:00
parent f21c33df7b
commit 014a9aef6f
9 changed files with 3 additions and 107 deletions
@@ -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();
@@ -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();
@@ -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
@@ -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);