#788 - Deprecate findRowCount() ... add findCount(). Effectively renaming findRowCount() to findCount()

src/test/java/com/avaje/tests/query/TestQueryFindFutureList.java

@@ -48,7 +48,7 @@ public class TestQueryFindFutureList extends BaseTestCase {
     // wait for it to complete
     List<Order> orders = futureList.getUnchecked();
 
-    assertEquals(Ebean.find(Order.class).findRowCount(), orders.size());
+    assertEquals(Ebean.find(Order.class).findCount(), orders.size());
   }
 
   @Test
@@ -61,7 +61,7 @@ public class TestQueryFindFutureList extends BaseTestCase {
     // wait for it to complete
     List<Order> orders = futureList.getUnchecked(1, TimeUnit.SECONDS);
 
-    assertEquals(Ebean.find(Order.class).findRowCount(), orders.size());
+    assertEquals(Ebean.find(Order.class).findCount(), orders.size());
   }
 
 }

src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java

@@ -83,7 +83,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     pagedList.loadRowCount();
     List<Order> orders = pagedList.getList();
-    int totalRowCount = pagedList.getTotalRowCount();
+    int totalRowCount = pagedList.getTotalCount();
 
     assertThat(orders.size()).isLessThan(totalRowCount);
     assertTrue(pagedList.hasNext());
@@ -96,9 +96,9 @@ public class TestQueryFindPagedList extends BaseTestCase {
         .setMaxRows(3)
         .findPagedList();
 
-    pagedList2.loadRowCount();
+    pagedList2.loadCount();
     List<Order> orders2 = pagedList2.getList();
-    int totalRowCount2 = pagedList2.getTotalRowCount();
+    int totalRowCount2 = pagedList2.getTotalCount();
     assertTrue(pagedList2.hasNext());
     assertTrue(pagedList2.hasPrev());
 
@@ -161,11 +161,11 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
 
-    Future<Integer> rowCount = pagedList.getFutureRowCount();
+    Future<Integer> rowCount = pagedList.getFutureCount();
     List<Order> 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();
 
@@ -183,9 +183,9 @@ public class TestQueryFindPagedList extends BaseTestCase {
     // fetch less that total orders (page size 3)
     PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
 
-    pagedList.loadRowCount();
+    pagedList.loadCount();
     List<Order> orders = pagedList.getList();
-    int totalRowCount = pagedList.getTotalRowCount();
+    int totalRowCount = pagedList.getTotalCount();
 
     assertThat(orders.size()).isLessThan(totalRowCount);
   }
@@ -207,10 +207,10 @@ public class TestQueryFindPagedList extends BaseTestCase {
     try {
 
       List<Order> orders = pagedList.getList();
-      int totalRowCount = pagedList.getTotalRowCount();
+      int totalRowCount = pagedList.getTotalCount();
 
       // invoke it again but cached...
-      int totalRowCountAgain = pagedList.getTotalRowCount();
+      int totalRowCountAgain = pagedList.getTotalCount();
 
       List<String> loggedSql = LoggedSqlCollector.stop();
 
@@ -242,7 +242,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    pagedList.getTotalRowCount();
+    pagedList.getTotalCount();
     pagedList.getList();
 
     List<String> loggedSql = LoggedSqlCollector.stop();

src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java

@@ -29,7 +29,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase {
     List<Order> list0 = query.findList();
     Assert.assertEquals(rc0, list0.size());
 
-    int rc1 = query.findRowCount();
+    int rc1 = query.findCount();
     Assert.assertEquals(rc0, rc1);
 
     List<Object> ids1 = query.findIds();
@@ -48,7 +48,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase {
     Query<Order> query2 = Ebean.find(Order.class).where().eq("status", Order.Status.NEW)
         .ge("id", idGt).order().desc("id");
 
-    int rc2 = query2.findRowCount();
+    int rc2 = query2.findCount();
 
     System.out.println("Expection Not same " + rc0 + " != " + rc2);
     Assert.assertNotSame(rc0, rc2);

src/test/java/com/avaje/tests/query/TestRowCount.java

@@ -21,7 +21,7 @@ public class TestRowCount extends BaseTestCase {
     Query<Order> query = Ebean.find(Order.class).fetch("details").where().gt("id", 1)
         .gt("details.id", 1).order("id desc");
 
-    int rc = query.findRowCount();
+    int rc = query.findCount();
 
     List<Object> ids = query.findIds();
 

src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java

@@ -44,7 +44,7 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase {
         .query();
     
     List<UUOne> list = query.findList();
-    int rowCount = query.findRowCount();
+    int rowCount = query.findCount();
     
     // select distinct t0.id c0, t0.name c1 
     // from uuone t0 

src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java

@@ -31,7 +31,7 @@ public class TestFormulaWithFindCount extends BaseTestCase {
     }
     
     ExpressionList<Order> expressionList = server.find(Order.class).where().gt("totalAmount", 1d);
-    int rowCount = expressionList.findRowCount();
+    int rowCount = expressionList.findCount();
     Assert.assertEquals(list.size(), rowCount);
   }
 

src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java

@@ -28,7 +28,7 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase {
     
     MetaInfoManager infoManager = server.getMetaInfoManager();
     
-    server.find(Order.class).findRowCount();
+    server.find(Order.class).findCount();
     
     infoManager.collectNodeStatistics(true);
     infoManager.collectQueryPlanStatistics(true);

src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java

@@ -47,7 +47,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
 
     
     LoggedSqlCollector.start();
-    query.findRowCount();
+    query.findCount();
 
     // select count(*) from ( 
     //   select distinct t0.id c0 

src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java

@@ -27,7 +27,7 @@ public class TestQueryRawExpressionMany extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    query.findRowCount();
+    query.findCount();
     List<String> sql = LoggedSqlCollector.stop();
 
     assertThat(sql.get(0)).contains("select count(*) from ( select distinct t0.id c0 from o_order t0 left outer join o_order_detail t1 on t1.order_id = t0.id  where t1.order_qty = ?)");

src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java

@@ -47,7 +47,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
     Assert.assertTrue(generatedSql.contains(" order by t0.cretime"));
 
     
-    int rowCount = query.findRowCount();
+    int rowCount = query.findCount();
 
     // select count(*) from o_order t0
     // left outer join o_order_detail t1 on t1.order_id = t0.id
@@ -84,7 +84,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
         .orderBy("cretime asc");
 
     LoggedSqlCollector.start();
-    query.findRowCount();
+    query.findCount();
 
     List<String> sqlLogged = LoggedSqlCollector.stop();
 

src/test/java/com/avaje/tests/query/other/TestSelfParent.java

@@ -14,7 +14,7 @@ public class TestSelfParent extends BaseTestCase {
   @Test
   public void test() {
 
-    if (Ebean.find(SelfParent.class).findRowCount() > 0) {
+    if (Ebean.find(SelfParent.class).findCount() > 0) {
       // only run once
       return;
     }

src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java

@@ -31,7 +31,7 @@ public class TestSoftDeletePagingList {
         .setMaxRows(10)
         .findPagedList();
 
-    int totalRowCount = pagedList.getTotalRowCount();
+    int totalRowCount = pagedList.getTotalCount();
     List<Cover> resultList = pagedList.getList();
 
     List<String> sql = LoggedSqlCollector.stop();

src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java

@@ -111,7 +111,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    int expectedRows = Ebean.find(Order.class).findRowCount();
+    int expectedRows = Ebean.find(Order.class).findCount();
 
     final AtomicInteger count = new AtomicInteger();