#15 - Support 7.21.1 API ... rename from findRowCount() to ... findCount()

Author: rbygrave

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm-mocker</artifactId>
-  <version>7.19.2-SNAPSHOT</version>
+  <version>7.21.1-SNAPSHOT</version>
   <name>avaje-ebeanorm-mocker</name>
 
   <description>Ability to set a Mockito mock EbeanServer as 'default' EbeanServer</description>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm</artifactId>
-      <version>7.19.1</version>
+      <version>7.21.1</version>
       <scope>provided</scope>
     </dependency>
 

src/main/java/com/avaje/ebean/DelegateEbeanServer.java

@@ -545,10 +545,16 @@ public <T> T findUnique(Query<T> query, Transaction transaction) {
     return find.findUnique(query, transaction);
   }
 
+  @Override
+  public <T> int findCount(Query<T> query, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findCount").with("query", query, "transaction", transaction));
+    return find.findCount(query, transaction);
+  }
+
   @Override
   public <T> int findRowCount(Query<T> query, Transaction transaction) {
     methodCalls.add(MethodCall.of("findRowCount").with("query", query, "transaction", transaction));
-    return find.findRowCount(query, transaction);
+    return find.findCount(query, transaction);
   }
 
   @Override
@@ -575,10 +581,16 @@ public <T> List<T> findList(Query<T> query, Transaction transaction) {
     return find.findList(query, transaction);
   }
 
+  @Override
+  public <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findFutureCount").with("query", query, "transaction", transaction));
+    return find.findFutureCount(query, transaction);
+  }
+
   @Override
   public <T> FutureRowCount<T> findFutureRowCount(Query<T> query, Transaction transaction) {
     methodCalls.add(MethodCall.of("findFutureRowCount").with("query", query, "transaction", transaction));
-    return find.findFutureRowCount(query, transaction);
+    return find.findFutureCount(query, transaction);
   }
 
   @Override

src/main/java/com/avaje/ebean/NoopEbeanServer.java

@@ -243,6 +243,11 @@ public <T> T getReference(Class<T> beanType, Object id) {
     return Mockito.mock(beanType);
   }
 
+  @Override
+  public <T> int findCount(Query<T> query, Transaction transaction) {
+    return 0;
+  }
+
   @Override
   public <T> int findRowCount(Query<T> query, Transaction transaction) {
     return 0;
@@ -268,6 +273,11 @@ public <T> List<T> findList(Query<T> query, Transaction transaction) {
     return Mockito.mock(List.class);
   }
 
+  @Override
+  public <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction) {
+    return Mockito.mock(FutureRowCount.class);
+  }
+
   @Override
   public <T> FutureRowCount<T> findFutureRowCount(Query<T> query, Transaction transaction) {
     return Mockito.mock(FutureRowCount.class);

src/main/java/com/avaje/ebean/TDEbeanServer.java

@@ -213,6 +213,11 @@ public <T> T getReference(Class<T> beanType, Object id) {
     return null;
   }
 
+  @Override
+  public <T> int findCount(Query<T> query, Transaction transaction) {
+    return 0;
+  }
+
   @Override
   public <T> int findRowCount(Query<T> query, Transaction transaction) {
     return 0;
@@ -238,6 +243,11 @@ public <T> List<T> findList(Query<T> query, Transaction transaction) {
     return null;
   }
 
+  @Override
+  public <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public <T> FutureRowCount<T> findFutureRowCount(Query<T> query, Transaction transaction) {
     return null;

src/main/java/com/avaje/ebean/delegate/DelegateFind.java

@@ -56,8 +56,8 @@ public <T> T find(Class<T> beanType, Object id, Transaction transaction) {
   }
 
   @Override
-  public <T> int findRowCount(Query<T> query, Transaction transaction) {
-    return delegate.findRowCount(query, transaction);
+  public <T> int findCount(Query<T> query, Transaction transaction) {
+    return delegate.findCount(query, transaction);
   }
 
   @Override
@@ -84,8 +84,8 @@ public <T> List<T> findList(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> FutureRowCount<T> findFutureRowCount(Query<T> query, Transaction transaction) {
-    return delegate.findFutureRowCount(query, transaction);
+  public <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction) {
+    return delegate.findFutureCount(query, transaction);
   }
 
   @Override

src/main/java/com/avaje/ebean/delegate/InterceptFind.java

@@ -27,7 +27,7 @@ public interface InterceptFind {
 
   <T> T find(Class<T> beanType, Object id, Transaction transaction);
 
-  <T> int findRowCount(Query<T> query, Transaction transaction);
+  <T> int findCount(Query<T> query, Transaction transaction);
 
   <T> List<Object> findIds(Query<T> query, Transaction transaction);
 
@@ -37,7 +37,7 @@ public interface InterceptFind {
 
   <T> List<T> findList(Query<T> query, Transaction transaction);
 
-  <T> FutureRowCount<T> findFutureRowCount(Query<T> query, Transaction transaction);
+  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
 
   <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);