Use a builder per coding standards

jeffgbutler · jeffgbutler · commit 3b25fc2d6991 · 2022-03-01T20:42:31.000-05:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/TableAliasCalculatorWithParent.java b/src/main/java/org/mybatis/dynamic/sql/render/TableAliasCalculatorWithParent.java
@@ -24,9 +24,9 @@ public class TableAliasCalculatorWithParent implements TableAliasCalculator {
     private final TableAliasCalculator parent;
     private final TableAliasCalculator child;
 
-    public TableAliasCalculatorWithParent(TableAliasCalculator parent, TableAliasCalculator child) {
-        this.parent = Objects.requireNonNull(parent);
-        this.child = Objects.requireNonNull(child);
+    private TableAliasCalculatorWithParent(Builder builder) {
+        parent = Objects.requireNonNull(builder.parent);
+        child = Objects.requireNonNull(builder.child);
     }
 
     @Override
@@ -46,4 +46,23 @@ public Optional<String> aliasForTable(SqlTable table) {
         }
         return parent.aliasForTable(table);
     }
+
+    public static class Builder {
+        private TableAliasCalculator parent;
+        private TableAliasCalculator child;
+
+        public Builder withParent(TableAliasCalculator parent) {
+            this.parent = parent;
+            return this;
+        }
+
+        public Builder withChild(TableAliasCalculator child) {
+            this.child = child;
+            return this;
+        }
+
+        public TableAliasCalculatorWithParent build() {
+            return new TableAliasCalculatorWithParent(this);
+        }
+    }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpressionRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpressionRenderer.java
@@ -59,9 +59,10 @@ private QueryExpressionRenderer(Builder builder) {
     }
 
     /**
-     * This function calculates a table alias calculator to use in the current context. In general,
-     * there are two possibilities: this could be a renderer for a regular select statement, or it
-     * could be a renderer for a select statement in an "exists" condition.
+     * This function calculates a table alias calculator to use in the current context. There are several
+     * possibilities: this could be a renderer for a regular select statement, or it could be a renderer for a table
+     * expression in a join, or a column to sub query where condition, or it could be a renderer for a select
+     * statement in an "exists" condition.
      *
      * <p>In the case of "exists" conditions, we will have a parent table alias calculator. We want to give visibility
      * to the aliases in the outer select statement to this renderer so columns in aliased tables can be used in exists
@@ -91,7 +92,10 @@ private TableAliasCalculator calculateTableAliasCalculator(QueryExpressionModel
         if (parentTableAliasCalculator == null) {
             return baseTableAliasCalculator;
         } else {
-            return new TableAliasCalculatorWithParent(parentTableAliasCalculator, baseTableAliasCalculator);
+            return new TableAliasCalculatorWithParent.Builder()
+                    .withParent(parentTableAliasCalculator)
+                    .withChild(baseTableAliasCalculator)
+                    .build();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,10 @@ private QueryExpressionRenderer(Builder builder) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * This function calculates a table alias calculator to use in the current context. In general,`
`63`		`- * there are two possibilities: this could be a renderer for a regular select statement, or it`
`64`		`- * could be a renderer for a select statement in an "exists" condition.`
	`62`	`+ * This function calculates a table alias calculator to use in the current context. There are several`
	`63`	`+ * possibilities: this could be a renderer for a regular select statement, or it could be a renderer for a table`
	`64`	`+ * expression in a join, or a column to sub query where condition, or it could be a renderer for a select`
	`65`	`+ * statement in an "exists" condition.`
`65`	`66`	`*`
`66`	`67`	`* <p>In the case of "exists" conditions, we will have a parent table alias calculator. We want to give visibility`
`67`	`68`	`* to the aliases in the outer select statement to this renderer so columns in aliased tables can be used in exists`
`@@ -91,7 +92,10 @@ private TableAliasCalculator calculateTableAliasCalculator(QueryExpressionModel`
`91`	`92`	`if (parentTableAliasCalculator == null) {`
`92`	`93`	`return baseTableAliasCalculator;`
`93`	`94`	`} else {`
`94`		`- return new TableAliasCalculatorWithParent(parentTableAliasCalculator, baseTableAliasCalculator);`
	`95`	`+ return new TableAliasCalculatorWithParent.Builder()`
	`96`	`+ .withParent(parentTableAliasCalculator)`
	`97`	`+ .withChild(baseTableAliasCalculator)`
	`98`	`+ .build();`
`95`	`99`	`}`
`96`	`100`	`}`
`97`	`101`