diff --git a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java index bd6f4c704..a6578ed01 100644 --- a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java +++ b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java @@ -11,10 +11,10 @@ import io.ebean.Query; import io.ebeaninternal.api.SpiExpressionList; import javax.persistence.PersistenceException; - import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; public class FilterExpressionList extends DefaultExpressionList { @@ -89,6 +89,16 @@ public class FilterExpressionList extends DefaultExpressionList { return rootQuery.findSet(); } + @Override + public T findOne() { + return rootQuery.findOne(); + } + + @Override + public Optional findOneOrEmpty() { + return rootQuery.findOneOrEmpty(); + } + @Override public ExpressionList having() { throw new PersistenceException(notAllowedMessage); diff --git a/src/test/java/org/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java index f0c21fd21..9a1f19375 100644 --- a/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -12,6 +12,7 @@ import org.tests.model.basic.ResetBasicData; import java.time.LocalDate; import java.util.List; +import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; @@ -43,6 +44,36 @@ public class TestQueryFilterMany extends BaseTestCase { } + @Test + public void test_with_findOne() { + + ResetBasicData.reset(); + + Customer customer = Ebean.find(Customer.class) + .setMaxRows(1) + .orderBy().asc("id") + .fetch("orders") + .filterMany("orders").raw("1 = 0") + .findOne(); + + assertThat(customer).isNotNull(); + } + + @Test + public void test_with_findOneOrEmpty() { + + ResetBasicData.reset(); + + Optional customer = Ebean.find(Customer.class) + .setMaxRows(1) + .orderBy().asc("id") + .fetch("orders") + .filterMany("orders").raw("1 = 0") + .findOneOrEmpty(); + + assertThat(customer).isPresent(); + } + @Test public void test_filterMany_in_findCount() {