Merge origin/master

Author: wumpz

README.md

@@ -46,7 +46,7 @@ Assertions.assertEquals("b", b.getColumnName());
 }
 ```
 
-JSQLParser-4.9 is the last JDK8 compatible version and any future development will depend on JDK11.
+JSQLParser-4.9 is the last JDK8 compatible version. The upcoming JSQLParser-5.0 will depend on JDK11 and introduces API breaking changes to the AST Visitors. Please see the Migration Guide for the details.
 
 ## [Supported Grammar and Syntax](https://jsqlparser.github.io/JSqlParser/syntax.html)
 

build.gradle

@@ -226,7 +226,7 @@ jacocoTestCoverageVerification {
             //element = 'CLASS'
             limit {
                 //@todo: temporarily reduced it 80%, we need to bring that back to 84% accepting the Keywords PR
-                minimum = 0.80
+                minimum = 0.50
             }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',
@@ -241,7 +241,7 @@ jacocoTestCoverageVerification {
                 value = 'MISSEDCOUNT'
 
                 //@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
-                maximum = 7000
+                maximum = 20000
                 }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',
@@ -605,5 +605,6 @@ tasks.register('upload') {
         }
     }
 }
+check.dependsOn jacocoTestCoverageVerification
 upload.dependsOn(check, assemble, gitChangelogTask, renderRR, xslt, xmldoc)
 

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/Model.java

@@ -12,8 +12,12 @@
 import java.io.Serializable;
 
 /**
- * <p>A marker interface for jsqlparser-model-classes.</p>
- * <p>The datastructure where the sql syntax is represented by a tree consists of {@link Model}'s</p>   
+ * <p>
+ * A marker interface for jsqlparser-model-classes.
+ * </p>
+ * <p>
+ * The datastructure where the sql syntax is represented by a tree consists of {@link Model}'s
+ * </p>
  */
 public interface Model extends Serializable {
 

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

@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 
 public class Alias implements Serializable {
@@ -62,14 +63,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 +95,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 context) {
+        return expressionVisitor.visit(this, context);
     }
 
     @Override

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

@@ -41,7 +41,7 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private Expression filterExpression = null;
     private List<OrderByElement> funcOrderBy = null;
     private String windowName = null; // refers to an external window definition (paritionBy,
-                                      // orderBy, windowElement)
+    // orderBy, windowElement)
     private WindowDefinition windowDef = new WindowDefinition();
 
     private Function.HavingClause havingClause;
@@ -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 context) {
+        return expressionVisitor.visit(this, context);
     }
 
     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 context) {
+        return expressionVisitor.visit(this, context);
     }
 
     public AnyType getAnyType() {

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

@@ -16,6 +16,15 @@ public class ArrayConstructor extends ASTNodeAccessImpl implements Expression {
     private ExpressionList<?> expressions;
     private boolean arrayKeyword;
 
+    public ArrayConstructor(ExpressionList<?> expressions, boolean arrayKeyword) {
+        this.expressions = expressions;
+        this.arrayKeyword = arrayKeyword;
+    }
+
+    public ArrayConstructor(Expression... expressions) {
+        this(new ExpressionList<Expression>(expressions), false);
+    }
+
     public ExpressionList<?> getExpressions() {
         return expressions;
     }
@@ -32,18 +41,9 @@ public void setArrayKeyword(boolean arrayKeyword) {
         this.arrayKeyword = arrayKeyword;
     }
 
-    public ArrayConstructor(ExpressionList<?> expressions, boolean arrayKeyword) {
-        this.expressions = expressions;
-        this.arrayKeyword = arrayKeyword;
-    }
-
-    public ArrayConstructor(Expression... expressions) {
-        this(new ExpressionList<Expression>(expressions), false);
-    }
-
     @Override
-    public void accept(ExpressionVisitor expressionVisitor) {
-        expressionVisitor.visit(this);
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
+        return expressionVisitor.visit(this, context);
     }
 
     @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 context) {
+        return expressionVisitor.visit(this, context);
     }
 
     @Override

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

@@ -226,28 +226,28 @@ public Expression getLeftExpression() {
         return leftExpression;
     }
 
+    public void setLeftExpression(Expression expression) {
+        leftExpression = expression;
+    }
+
     public Expression getRightExpression() {
         return rightExpression;
     }
 
+    public void setRightExpression(Expression expression) {
+        rightExpression = expression;
+    }
+
     public BinaryExpression withLeftExpression(Expression expression) {
         setLeftExpression(expression);
         return this;
     }
 
-    public void setLeftExpression(Expression expression) {
-        leftExpression = expression;
-    }
-
     public BinaryExpression withRightExpression(Expression expression) {
         setRightExpression(expression);
         return this;
     }
 
-    public void setRightExpression(Expression expression) {
-        rightExpression = expression;
-    }
-
     @Override
     public String toString() {
         return // (not ? "NOT " : "") +

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

@@ -15,14 +15,15 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 /**
  * CASE/WHEN expression.
- *
+ * <p>
  * Syntax:
- * 
+ *
  * <pre>
  * <code>
  * CASE
@@ -46,7 +47,6 @@
  * END
  * </code>
  * </pre>
- *
  */
 public class CaseExpression extends ASTNodeAccessImpl implements Expression {
 
@@ -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 context) {
+        return expressionVisitor.visit(this, context);
     }
 
     public Expression getSwitchExpression() {