#718 - Remove findPagedList(pageIndex, pageSize) ... migrate to setFirstRows().setMaxRows().findPagedList()

This commit is contained in:
Robin Bygrave
2016-05-20 23:04:35 +12:00
parent 662be92a16
commit b2a3f0c99b
15 changed files with 19 additions and 168 deletions
@@ -475,11 +475,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
return null;
}
@Override
public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction, int pageIndex, int pageSize) {
return null;
}
@Override
public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
return null;
@@ -90,7 +90,8 @@ public class TestCKeyLazyLoad extends BaseTestCase {
PagedList<CKeyParent> siteUserPage = Ebean.find(CKeyParent.class).where()
.orderBy("name asc")
.findPagedList(0, 10);
.setMaxRows(10)
.findPagedList();
siteUserPage.getList();
}
}
@@ -101,7 +101,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
PagedList<Order> pagedList =
Ebean.find(Order.class)
.findPagedList(0, 10);
.setMaxRows(10)
.findPagedList();
pagedList.getList();
@@ -119,7 +120,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
LoggedSqlCollector.start();
Ebean.find(Order.class)
.findPagedList(1, 10)
.setFirstRow(10)
.setMaxRows(10)
.findPagedList()
.getList();
List<String> loggedSql = LoggedSqlCollector.stop();
@@ -138,7 +141,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
Ebean.find(Order.class)
.order().asc("orderDate")
.findPagedList(0, 10)
.setMaxRows(10)
.findPagedList()
.getList();
List<String> loggedSql = LoggedSqlCollector.stop();
@@ -157,7 +161,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
Ebean.find(Order.class)
.order().asc("orderDate")
.order().desc("id")
.findPagedList(0, 10)
.setMaxRows(10)
.findPagedList()
.getList();
List<String> loggedSql = LoggedSqlCollector.stop();
@@ -142,7 +142,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
ResetBasicData.reset();
PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 4);
PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(4).findPagedList();
LoggedSqlCollector.start();
@@ -159,7 +159,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
ResetBasicData.reset();
PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 3);
PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
Future<Integer> rowCount = pagedList.getFutureRowCount();
List<Order> orders = pagedList.getList();
@@ -181,7 +181,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
ResetBasicData.reset();
// fetch less that total orders (page size 3)
PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 3);
PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
pagedList.loadRowCount();
List<Order> orders = pagedList.getList();
@@ -196,7 +196,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
ResetBasicData.reset();
PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 6);
PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(6).findPagedList();
LoggedSqlCollector.start();
@@ -237,7 +237,8 @@ public class TestQueryFindPagedList extends BaseTestCase {
PagedList<Order> pagedList = Ebean.find(Order.class)
.alias("b")
.where().raw("b.id > 0")
.findPagedList(0, 6);
.setMaxRows(6)
.findPagedList();
LoggedSqlCollector.start();
@@ -93,7 +93,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
int initialRowCount = query.findRowCount();
PagedList<Customer> page = query.findPagedList(0, 2);
PagedList<Customer> page = query.setMaxRows(2).findPagedList();
List<Customer> list = page.getList();
int rowCount = page.getTotalRowCount();