Update for Ebean API 10.3.1 - findOne() and findOneOrEmpty()

Author: rbygrave

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-mocker</artifactId>
-  <version>10.2.2-SNAPSHOT</version>
+  <version>10.3.1-SNAPSHOT</version>
   <name>ebean-mocker</name>
 
   <description>Ability to set a Mockito mock EbeanServer as 'default' EbeanServer</description>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>10.2.1</version>
+      <version>10.3.1</version>
       <scope>provided</scope>
     </dependency>
 

src/main/java/io/ebean/DelegateEbeanServer.java

@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -551,14 +552,29 @@ public <T> T find(Class<T> beanType, Object id, Transaction transaction) {
 
   @Override
   public <T> T findUnique(Query<T> query, Transaction transaction) {
-    methodCalls.add(MethodCall.of("findUnique").with("query", query, "transaction", transaction));
+    return findOne(query, transaction);
+  }
+
+  @Override
+  public <T> T findOne(Query<T> query, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findOne").with("query", query, "transaction", transaction));
     WhenBeanReturn match = whenFind.findMatchByUnique(((SpiQuery)query).getBeanType());
     if (match != null) {
       return (T)match.val();
     }
     return find.findUnique(query, transaction);
   }
 
+  @Override
+  public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findOneOrEmpty").with("query", query, "transaction", transaction));
+    WhenBeanReturn match = whenFind.findMatchByUnique(((SpiQuery)query).getBeanType());
+    if (match != null) {
+      return Optional.ofNullable((T)match.val());
+    }
+    return Optional.ofNullable(find.findUnique(query, transaction));
+  }
+
   @Override
   public <T> int findCount(Query<T> query, Transaction transaction) {
     methodCalls.add(MethodCall.of("findCount").with("query", query, "transaction", transaction));
@@ -652,7 +668,12 @@ public List<SqlRow> findList(SqlQuery sqlQuery, Transaction transaction) {
 
   @Override
   public SqlRow findUnique(SqlQuery sqlQuery, Transaction transaction) {
-    methodCalls.add(MethodCall.of("findUnique").with("sqlQuery", sqlQuery, "transaction", transaction));
+    return findOne(sqlQuery, transaction);
+  }
+
+  @Override
+  public SqlRow findOne(SqlQuery sqlQuery, Transaction transaction) {
+    methodCalls.add(MethodCall.of("findOne").with("sqlQuery", sqlQuery, "transaction", transaction));
     return findSqlQuery.findUnique(sqlQuery, transaction);
   }
 

src/main/java/io/ebean/NoopEbeanServer.java

@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -61,6 +62,16 @@ public <T> T findUnique(Query<T> query, Transaction transaction) {
     return null;
   }
 
+  @Override
+  public <T> T findOne(Query<T> query, Transaction transaction) {
+    return null;
+  }
+
+  @Override
+  public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public <T> T execute(TxScope scope, TxCallable<T> c) {
     return null;
@@ -330,6 +341,11 @@ public SqlRow findUnique(SqlQuery query, Transaction transaction) {
     return Mockito.mock(SqlRow.class);
   }
 
+  @Override
+  public SqlRow findOne(SqlQuery query, Transaction transaction) {
+    return Mockito.mock(SqlRow.class);
+  }
+
   @Override
   public void findEach(SqlQuery sqlQuery, Consumer<SqlRow> queryEachConsumer, Transaction transaction) {
 

src/main/java/io/ebean/TDEbeanServer.java

@@ -12,6 +12,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -295,6 +296,15 @@ public <T> T findUnique(Query<T> query, Transaction transaction) {
     return null;
   }
 
+  @Override
+  public <T> T findOne(Query<T> query, Transaction transaction) {
+    return null;
+  }
+  @Override
+  public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public List<SqlRow> findList(SqlQuery query, Transaction transaction) {
     return null;
@@ -305,6 +315,11 @@ public SqlRow findUnique(SqlQuery query, Transaction transaction) {
     return null;
   }
 
+  @Override
+  public SqlRow findOne(SqlQuery query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public void findEach(SqlQuery sqlQuery, Consumer<SqlRow> queryEachConsumer, Transaction transaction) {