#996 Add findOne() and findOneOrEmpty() - SqlQuery

src/main/java/io/ebean/EbeanServer.java

@@ -1177,6 +1177,16 @@ public interface EbeanServer {
    * @see SqlQuery#findUnique()
    */
   @Nullable
+  SqlRow findOne(SqlQuery query, Transaction transaction);
+
+  /**
+   * Synonym for findOne().
+   * <p>
+   * This proceeded findOne which was introduced to better match spring data.
+   * This will be deprecated at some future point.
+   * </p>
+   */
+  @Nullable
   SqlRow findUnique(SqlQuery query, Transaction transaction);
 
   /**

src/main/java/io/ebean/SqlQuery.java

@@ -2,6 +2,7 @@ package io.ebean;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -70,6 +71,16 @@ public interface SqlQuery extends Serializable {
    * PersistenceException.
    * </p>
    */
+  SqlRow findOne();
+
+  /**
+   * Execute the query returning an optional row.
+   */
+  Optional<SqlRow> findOneOrEmpty();
+
+  /**
+   * Synonym for findOne().
+   */
   SqlRow findUnique();
 
   /**

src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -1503,6 +1503,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public SqlRow findUnique(SqlQuery query, Transaction t) {
+    return findOne(query, t);
+  }
+
+  @Override
+  public SqlRow findOne(SqlQuery query, Transaction t) {
 
     // no findId() method for SqlQuery...
     // a query that is expected to return either 0 or 1 rows

src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java

@@ -6,6 +6,7 @@ import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiSqlQuery;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -61,9 +62,19 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return server.findList(this, null);
   }
 
+  @Override
+  public SqlRow findOne() {
+    return server.findOne(this, null);
+  }
+
+  @Override
+  public Optional<SqlRow> findOneOrEmpty() {
+    return Optional.ofNullable(findOne());
+  }
+
   @Override
   public SqlRow findUnique() {
-    return server.findUnique(this, null);
+    return findOne();
   }
 
   @Override