feat: Visitors return Objects and accept parameters

BREAKING CHANGE: New signatures for all Visitor interfaces

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

src/main/java/module-info.java

@@ -9,6 +9,7 @@
  */
 module net.sf.jsqlparser {
     requires java.sql;
+    requires java.desktop;
 
     exports net.sf.jsqlparser;
     exports net.sf.jsqlparser.expression;

src/main/java/net/sf/jsqlparser/expression/Alias.java

@@ -62,14 +62,14 @@ public String toString() {
         String alias = (useAs ? " AS " : " ") + name;
 
         if (aliasColumns != null && !aliasColumns.isEmpty()) {
-            String ac = "";
+            StringBuilder ac = new StringBuilder();
             for (AliasColumn col : aliasColumns) {
                 if (ac.length() > 0) {
-                    ac += ", ";
+                    ac.append(", ");
                 }
-                ac += col.name;
+                ac.append(col.name);
                 if (col.colDataType != null) {
-                    ac += " " + col.colDataType.toString();
+                    ac.append(" ").append(col.colDataType.toString());
                 }
             }
             alias += "(" + ac + ")";
@@ -94,13 +94,15 @@ public Alias withAliasColumns(List<AliasColumn> aliasColumns) {
     }
 
     public Alias addAliasColumns(AliasColumn... aliasColumns) {
-        List<AliasColumn> collection = Optional.ofNullable(getAliasColumns()).orElseGet(ArrayList::new);
+        List<AliasColumn> collection =
+                Optional.ofNullable(getAliasColumns()).orElseGet(ArrayList::new);
         Collections.addAll(collection, aliasColumns);
         return this.withAliasColumns(collection);
     }
 
     public Alias addAliasColumns(Collection<? extends AliasColumn> aliasColumns) {
-        List<AliasColumn> collection = Optional.ofNullable(getAliasColumns()).orElseGet(ArrayList::new);
+        List<AliasColumn> collection =
+                Optional.ofNullable(getAliasColumns()).orElseGet(ArrayList::new);
         collection.addAll(aliasColumns);
         return this.withAliasColumns(collection);
     }

src/main/java/net/sf/jsqlparser/expression/AllValue.java

@@ -14,8 +14,8 @@
 public class AllValue extends ASTNodeAccessImpl implements Expression {
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     @Override

src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java

@@ -84,8 +84,8 @@ public AnalyticExpression(Function function) {
 
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     public List<OrderByElement> getOrderByElements() {

src/main/java/net/sf/jsqlparser/expression/AnyComparisonExpression.java

@@ -32,8 +32,8 @@ public Select getSelect() {
 
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     public AnyType getAnyType() {

src/main/java/net/sf/jsqlparser/expression/ArrayConstructor.java

@@ -42,8 +42,8 @@ public ArrayConstructor(Expression... expressions) {
     }
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     @Override

src/main/java/net/sf/jsqlparser/expression/ArrayExpression.java

@@ -73,8 +73,8 @@ public void setStopIndexExpression(Expression stopIndexExpression) {
     }
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     @Override

src/main/java/net/sf/jsqlparser/expression/CaseExpression.java

@@ -68,8 +68,8 @@ public CaseExpression(Expression elseExpression, WhenClause... whenClauses) {
 
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     public Expression getSwitchExpression() {

src/main/java/net/sf/jsqlparser/expression/CastExpression.java

@@ -121,8 +121,8 @@ public CastExpression setImplicitCast(boolean implicitCast) {
     }
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     @Deprecated

src/main/java/net/sf/jsqlparser/expression/CollateExpression.java

@@ -26,8 +26,8 @@ public CollateExpression(Expression leftExpression, String collate) {
     }
 
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S arguments) {
+        return expressionVisitor.visit(this, arguments);
     }
 
     public Expression getLeftExpression() {