#607 - Tidy "text" extensions to criteria API - remove endMust(), endShould(), endMustNot() ... just use endJunction()

This commit is contained in:
Robin Bygrave
2016-03-18 14:24:07 +13:00
parent 5de67e1939
commit 8e98e88e8a
5 changed files with 12 additions and 98 deletions
@@ -47,14 +47,14 @@ public class TextExpressionListTest {
.text()
.must()
.match("title", "quick")
.endMust()
.endJunction()
.should()
.match("title", "brown")
.match("title", "dog")
.endShould()
.endJunction()
.mustNot()
.match("title", "lazy")
.endMustNot()
.endJunction()
.where()
.gt("reviewDate", 12345);
@@ -44,10 +44,9 @@ public class TestExprNestedDisjunction extends BaseTestCase {
.where()
.or()
.and()
.startsWith("name", "r").eq("anniversary", onAfter).endAnd()
.startsWith("name", "r").eq("anniversary", onAfter).endJunction()
.and()
.eq("status", Customer.Status.ACTIVE).gt("id", 0).endAnd()
.endOr()
.eq("status", Customer.Status.ACTIVE).gt("id", 0).endJunction()
.orderBy().asc("name");
q.findList();
@@ -69,7 +68,7 @@ public class TestExprNestedDisjunction extends BaseTestCase {
.not()
.gt("id", 1)
.eq("anniversary", onAfter)
.endNot()
.endJunction()
.orderBy().asc("name");
q.findList();