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

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();
 }

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();
-  }
 }

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();
-  }
-
 }