From e1ad210bb088aa7da3a6ee15fe6775742becf784 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 10 Aug 2021 22:18:33 +1200
Subject: [PATCH] Tidy JunctionExpression

---
 .../server/expression/JunctionExpression.java | 38 ++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 51eba8f39..88614873d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -114,9 +114,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
     context.startBool(type);
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.writeDocQuery(context);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.writeDocQuery(context);
     }
     context.endBool();
   }
@@ -124,9 +123,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
   @Override
   public void writeDocQueryJunction(DocQueryContext context) throws IOException {
     context.startBoolGroupList(type);
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.writeDocQuery(context);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.writeDocQuery(context);
     }
     context.endBoolGroupList();
   }
@@ -139,18 +137,15 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
-
     List<SpiExpression> list = exprList.internalList();
-
     // get the current state for 'require outer joins'
     boolean parentOuterJoins = manyWhereJoin.isRequireOuterJoins();
     if (type == Type.OR) {
       // turn on outer joins required for disjunction expressions
       manyWhereJoin.setRequireOuterJoins(true);
     }
-
-    for (SpiExpression aList : list) {
-      aList.containsMany(desc, manyWhereJoin);
+    for (SpiExpression expr : list) {
+      expr.containsMany(desc, manyWhereJoin);
     }
     if (type == Type.OR && !parentOuterJoins) {
       // restore state to not forcing outer joins
@@ -177,18 +172,14 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.addBindValues(request);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.addBindValues(request);
     }
   }
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     List<SpiExpression> list = exprList.internalList();
-
     if (!list.isEmpty()) {
       request.append(type.prefix());
       request.append("(");
@@ -205,9 +196,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.prepareExpression(request);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.prepareExpression(request);
     }
   }
 
@@ -227,10 +217,8 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public void queryBindHash(BindHash hash) {
-    int hc = JunctionExpression.class.getName().hashCode();
-    List<SpiExpression> list = exprList.internalList();
-    for (SpiExpression aList : list) {
-      aList.queryBindHash(hash);
+    for (SpiExpression expr : exprList.internalList()) {
+      expr.queryBindHash(hash);
     }
   }
 
@@ -275,7 +263,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.textCommonTerms(search, options);
   }
 
-
   @Override
   public ExpressionList<T> allEq(Map<String, Object> propertyMap) {
     return exprList.allEq(propertyMap);
@@ -1025,7 +1012,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
 
   @Override
   public String nestedPath(BeanDescriptor<?> desc) {
-
     PrepareDocNested.prepare(exprList, desc, type);
     String nestedPath = exprList.allDocNestedPath;
     if (nestedPath != null) {