Support 8.2.1 API ... with findIterate(), findSingleAttributeList() etc

Author: rbygrave

pom.xml

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

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

@@ -558,11 +558,22 @@ public <T> int findRowCount(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> List<Object> findIds(Query<T> query, Transaction transaction) {
+  public <A> List<A> findIds(Query<?> query, Transaction transaction) {
     methodCalls.add(MethodCall.of("findIds").with("query", query, "transaction", transaction));
     return find.findIds(query, transaction);
   }
 
+  @Override
+  public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findSingleAttributeList").with("query", query, "transaction", transaction));
+    return find.findSingleAttributeList(query, transaction);  }
+
+  @Override
+  public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findIterate").with("query", query, "transaction", transaction));
+    return find.findIterate(query, transaction);
+  }
+
   @Override
   public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
     methodCalls.add(MethodCall.of("findEach").with("query", query, "consumer", consumer, "transaction", transaction));
@@ -618,7 +629,7 @@ public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> Map<?, T> findMap(Query<T> query, Transaction transaction) {
+  public <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction) {
     methodCalls.add(MethodCall.of("findMap").with("query", query, "transaction", transaction));
     return find.findMap(query, transaction);
   }

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

@@ -248,16 +248,26 @@ public <T> int findCount(Query<T> query, Transaction transaction) {
     return 0;
   }
 
+  @Override
+  public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public <T> int findRowCount(Query<T> query, Transaction transaction) {
     return 0;
   }
 
   @Override
-  public <T> List<Object> findIds(Query<T> query, Transaction transaction) {
+  public <A> List<A> findIds(Query<?> query, Transaction transaction) {
     return Mockito.mock(List.class);
   }
 
+  @Override
+  public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
 
@@ -304,7 +314,7 @@ public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> Map<?, T> findMap(Query<T> query, Transaction transaction) {
+  public <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction) {
     return Mockito.mock(Map.class);
   }
 

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

@@ -224,7 +224,17 @@ public <T> int findRowCount(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> List<Object> findIds(Query<T> query, Transaction transaction) {
+  public <A> List<A> findIds(Query<?> query, Transaction transaction) {
+    return null;
+  }
+
+  @Override
+  public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
+    return null;
+  }
+
+  @Override
+  public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction) {
     return null;
   }
 
@@ -274,7 +284,7 @@ public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> Map<?, T> findMap(Query<T> query, Transaction transaction) {
+  public <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction) {
     return null;
   }
 

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

@@ -8,6 +8,7 @@
 import com.avaje.ebean.Query;
 import com.avaje.ebean.QueryEachConsumer;
 import com.avaje.ebean.QueryEachWhileConsumer;
+import com.avaje.ebean.QueryIterator;
 import com.avaje.ebean.Transaction;
 import com.avaje.ebean.Version;
 import com.avaje.ebeaninternal.api.SpiQuery;
@@ -61,10 +62,20 @@ public <T> int findCount(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> List<Object> findIds(Query<T> query, Transaction transaction) {
+  public <A> List<A> findIds(Query<?> query, Transaction transaction) {
     return delegate.findIds(query, transaction);
   }
 
+  @Override
+  public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
+    return delegate.findSingleAttributeList(query, transaction);
+  }
+
+  @Override
+  public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction) {
+    return delegate.findIterate(query, transaction);
+  }
+
   @Override
   public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
     delegate.findEach(query, consumer, transaction);
@@ -109,7 +120,7 @@ public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
   }
 
   @Override
-  public <T> Map<?, T> findMap(Query<T> query, Transaction transaction) {
+  public <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction) {
     return delegate.findMap(query, transaction);
   }
 

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

@@ -7,6 +7,7 @@
 import com.avaje.ebean.Query;
 import com.avaje.ebean.QueryEachConsumer;
 import com.avaje.ebean.QueryEachWhileConsumer;
+import com.avaje.ebean.QueryIterator;
 import com.avaje.ebean.Transaction;
 import com.avaje.ebean.Version;
 
@@ -29,7 +30,7 @@ public interface InterceptFind {
 
   <T> int findCount(Query<T> query, Transaction transaction);
 
-  <T> List<Object> findIds(Query<T> query, Transaction transaction);
+  <A> List<A> findIds(Query<?> query, Transaction transaction);
 
   <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction);
 
@@ -47,8 +48,11 @@ public interface InterceptFind {
 
   <T> Set<T> findSet(Query<T> query, Transaction transaction);
 
-  <T> Map<?, T> findMap(Query<T> query, Transaction transaction);
+  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
 
   <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
 
+  <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction);
+
+  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
 }