From 8e98e88e8aa6b2dec7c5f5bbd295fb5e26eb7ae9 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 18 Mar 2016 14:24:07 +1300
Subject: [PATCH] #607 - Tidy "text" extensions to criteria API - remove
 endMust(), endShould(), endMustNot() ... just use endJunction()

---
 .../java/com/avaje/ebean/ExpressionList.java  | 38 +++----------------
 .../expression/DefaultExpressionList.java     | 29 --------------
 .../server/expression/JunctionExpression.java | 30 ---------------
 .../avaje/ebean/TextExpressionListTest.java   |  6 +--
 .../query/TestExprNestedDisjunction.java      |  7 ++--
 5 files changed, 12 insertions(+), 98 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java
index 278dfc2ab..1f862c1d1 100644
--- a/src/main/java/com/avaje/ebean/ExpressionList.java
+++ b/src/main/java/com/avaje/ebean/ExpressionList.java
@@ -931,41 +931,15 @@ public interface ExpressionList<T> {
   Junction<T> mustNot();
 
   /**
-   * End a Conjunction or Disjunction returning the parent expression list.
+   * End a junction returning the parent expression list.
    * <p>
-   * Alternatively you can always use where() to return the top level expression
-   * list.
+   *   Ends a and(), or(), not(), must(), mustNot() or should() junction
+   *   such that you get the parent expression.
+   * </p>
+   * <p>
+   * Alternatively you can always use where() to return the top level expression list.
    * </p>
    */
   ExpressionList<T> endJunction();
 
-  /**
-   * End the list of AND expressions.
-   */
-  ExpressionList<T> endAnd();
-
-  /**
-   * End the list of OR expressions.
-   */
-  ExpressionList<T> endOr();
-
-  /**
-   * End the list of NOT expressions.
-   */
-  ExpressionList<T> endNot();
-
-  /**
-   * End the list of MUST expressions.
-   */
-  ExpressionList<T> endMust();
-
-  /**
-   * End the list of SHOULD expressions.
-   */
-  ExpressionList<T> endShould();
-
-  /**
-   * End the list of MUST NOT expressions.
-   */
-  ExpressionList<T> endMustNot();
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
index d8d4332e1..ea71cf9ed 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -923,33 +923,4 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return junction(Junction.Type.MUST_NOT);
   }
 
-  @Override
-  public ExpressionList<T> endAnd() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endOr() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endNot() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endMust() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endShould() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endMustNot() {
-    return endJunction();
-  }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
index beca6b9e1..3f907539a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
@@ -742,34 +742,4 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.endJunction();
   }
 
-  @Override
-  public ExpressionList<T> endAnd() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endOr() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endNot() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endMust() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endShould() {
-    return endJunction();
-  }
-
-  @Override
-  public ExpressionList<T> endMustNot() {
-    return endJunction();
-  }
-
 }
diff --git a/src/test/java/com/avaje/ebean/TextExpressionListTest.java b/src/test/java/com/avaje/ebean/TextExpressionListTest.java
index fec23efd8..d13c0df39 100644
--- a/src/test/java/com/avaje/ebean/TextExpressionListTest.java
+++ b/src/test/java/com/avaje/ebean/TextExpressionListTest.java
@@ -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);
 
diff --git a/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java b/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java
index 3f178646d..eea82841e 100644
--- a/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java
+++ b/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java
@@ -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();