feat: rework the Visitors

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

Author: manticore-projects

build.gradle

@@ -34,7 +34,9 @@ def getVersion = { boolean considerSnapshot ->
         commandLine "git", "--no-pager", "describe", "--tags", "--always", "--dirty=-SNAPSHOT"
     }.standardOutput.asText.get().trim()
 
-    def pattern = /(?<major>\d*)\.(?<minor>\d*)(\.(?<patch>\d*))?(-(?<build>\d*)-(?<commit>[a-zA-Z\d]*))?/
+    println "Version String: $versionStr"
+
+    def pattern = /jsqlparser-(?<major>\d*)\.(?<minor>\d*)(\.(?<patch>\d*))?(-(?<build>\d*)-(?<commit>[a-zA-Z\d]*))?/
     def matcher = versionStr =~ pattern
 
     if (matcher.find()) {
@@ -124,7 +126,10 @@ java {
 }
 
 javadoc {
-    include("build/generated/javacc/net/sf/jsqlparser/parser/*.java" )
+    dependsOn(compileJavacc, compileJava )
+    source = layout.buildDirectory.dir("generated/javacc/net/sf/jsqlparser/parser").get().asFileTree.matching {
+        include("**/*.java")
+    }
     if(JavaVersion.current().isJava9Compatible()) {
         options.addBooleanOption('html5', true)
     }
@@ -140,6 +145,8 @@ jar {
 }
 
 tasks.register('xmldoc', Javadoc) {
+    println getVersion( true )
+
     def outFile =  reporting.file(
             version.endsWith("-SNAPSHOT")
                     ? "xmlDoclet/javadoc_snapshot.xml"
@@ -153,17 +160,25 @@ tasks.register('xmldoc', Javadoc) {
     )
 
     source = sourceSets.main.allJava
+//    source += fileTree(layout.buildDirectory.dir("generated/javacc/net/sf/jsqlparser/parser").get()) {
+//        include("**/*.java")
+//    }
+//    source += fileTree(layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser").get()) {
+//        include("**/*.java")
+//    }
     // beware: Gradle deletes this folder automatically and there is no switch-off
     destinationDir = reporting.file("xmlDoclet")
     options.docletpath = configurations.xmlDoclet.files as List
     options.doclet = "com.github.markusbernhardt.xmldoclet.XmlDoclet"
-    title = "API $version"
+    title = "API " + getVersion( !System.getenv("RELEASE") )
     options.addBooleanOption("rst", true)
     options.addBooleanOption("withFloatingToc", Boolean.parseBoolean(System.getenv().getOrDefault("FLOATING_TOC", "true")))
     options.addStringOption("basePackage", "net.sf.jsqlparser")
     options.addStringOption("filename", outFile.getName())
+    options.addStringOption('J-Xmx4g')
+    options.addStringOption('J-Xss2m')
 
-    dependsOn(compileJava)
+    dependsOn(compileJavacc, compileJava )
     doLast {
         copy {
             from rstFile
@@ -181,7 +196,7 @@ test {
     maxHeapSize = "4G"
 
     // set JVM stack size
-    jvmArgs = ['-Xss2m']
+    jvmArgs = ['-Xss2m', '--add-opens=java.base/java.lang=ALL-UNNAMED']
 
     jacoco {
         excludes = ['net/sf/jsqlparser/parser/CCJSqlParserTokenManager']

src/main/java/net/sf/jsqlparser/statement/piped/AggregatePipeOperator.java

@@ -49,7 +49,7 @@ public AggregatePipeOperator setShorthandOrdering(boolean usingShortHandOrdering
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/AsPipeOperator.java

@@ -19,7 +19,7 @@ public AsPipeOperator setAlias(Alias alias) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/CallPipeOperator.java

@@ -41,7 +41,7 @@ public StringBuilder appendTo(StringBuilder builder) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/DropPipeOperator.java

@@ -193,7 +193,7 @@ public ListIterator<Column> listIterator() {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/ExceptPipeOperator.java

@@ -204,7 +204,6 @@ public <T, S> T accept(SelectVisitor<T> selectVisitor, S context) {
     }
 
 
-
     @Override
     public StringBuilder appendTo(StringBuilder builder) {
         if (usingFromKeyword) {

src/main/java/net/sf/jsqlparser/statement/piped/FromQuery.java

@@ -19,7 +19,7 @@ public JoinPipeOperator setJoin(Join join) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/IntersectPipeOperator.java

@@ -34,7 +34,7 @@ public LimitPipeOperator setOffsetExpression(Expression offsetExpression) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/JoinPipeOperator.java

@@ -32,7 +32,7 @@ public StringBuilder appendTo(StringBuilder builder) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/LimitPipeOperator.java

@@ -3,5 +3,5 @@
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 public abstract class PipeOperator extends ASTNodeAccessImpl {
-    public abstract <T, S> T accept(PipeOperatorVisitor<T> visitor, S context);
+    public abstract <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context);
 }

src/main/java/net/sf/jsqlparser/statement/piped/OrderByPipeOperator.java

@@ -1,42 +1,38 @@
 package net.sf.jsqlparser.statement.piped;
 
-public interface PipeOperatorVisitor<T> {
-    <S> T visit(AggregatePipeOperator aggregate, S context);
+public interface PipeOperatorVisitor<T, S> {
+    T visit(AggregatePipeOperator aggregate, S context);
 
-    <S> T visit(AsPipeOperator as, S context);
+    T visit(AsPipeOperator as, S context);
 
-    <S> T visit(CallPipeOperator call, S context);
+    T visit(CallPipeOperator call, S context);
 
-    <S> T visit(DropPipeOperator drop, S context);
+    T visit(DropPipeOperator drop, S context);
 
-    <S> T visit(ExceptPipeOperator except, S context);
+    T visit(ExtendPipeOperator extend, S context);
 
-    <S> T visit(ExtendPipeOperator extend, S context);
+    T visit(JoinPipeOperator join, S context);
 
-    <S> T visit(IntersectPipeOperator intersect, S context);
+    T visit(LimitPipeOperator limit, S context);
 
-    <S> T visit(JoinPipeOperator join, S context);
+    T visit(OrderByPipeOperator orderBy, S context);
 
-    <S> T visit(LimitPipeOperator limit, S context);
+    T visit(PivotPipeOperator pivot, S context);
 
-    <S> T visit(OrderByPipeOperator orderBy, S context);
+    T visit(RenamePipeOperator rename, S context);
 
-    <S> T visit(PivotPipeOperator pivot, S context);
+    T visit(SelectPipeOperator select, S context);
 
-    <S> T visit(RenamePipeOperator rename, S context);
+    T visit(SetPipeOperator set, S context);
 
-    <S> T visit(SelectPipeOperator select, S context);
+    T visit(TableSamplePipeOperator tableSample, S context);
 
-    <S> T visit(SetPipeOperator set, S context);
+    T visit(SetOperationPipeOperator union, S context);
 
-    <S> T visit(TableSamplePipeOperator tableSample, S context);
+    T visit(UnPivotPipeOperator unPivot, S context);
 
-    <S> T visit(SetOperationPipeOperator union, S context);
+    T visit(WherePipeOperator where, S context);
 
-    <S> T visit(UnPivotPipeOperator unPivot, S context);
-
-    <S> T visit(WherePipeOperator where, S context);
-
-    <S> T visit(WindowPipeOperator window, S context);
+    T visit(WindowPipeOperator window, S context);
 }
 

src/main/java/net/sf/jsqlparser/statement/piped/PipeOperator.java

@@ -74,7 +74,7 @@ public StringBuilder appendTo(StringBuilder builder) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/PipeOperatorVisitor.java

@@ -1,8 +1,9 @@
 package net.sf.jsqlparser.statement.piped;
 
-public class RenamePipeOperator extends PipeOperator {
-    @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
-        return visitor.visit(this, context);
+import net.sf.jsqlparser.statement.select.SelectItem;
+
+public class RenamePipeOperator extends SelectPipeOperator {
+    public RenamePipeOperator(SelectItem<?> selectItem) {
+        super("RENAME", selectItem);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/PivotPipeOperator.java

@@ -36,7 +36,7 @@ public SelectPipeOperator with(SelectItem<?> selectItem) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/RenamePipeOperator.java

@@ -71,7 +71,7 @@ public StringBuilder appendTo(StringBuilder builder) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/SelectPipeOperator.java

@@ -155,7 +155,7 @@ public boolean isEmpty() {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 

src/main/java/net/sf/jsqlparser/statement/piped/SetOperationPipeOperator.java

@@ -27,7 +27,7 @@ public StringBuilder appendTo(StringBuilder builder) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/SetPipeOperator.java

@@ -73,7 +73,7 @@ public StringBuilder appendTo(StringBuilder builder) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }
 }

src/main/java/net/sf/jsqlparser/statement/piped/TableSamplePipeOperator.java

@@ -19,7 +19,7 @@ public WherePipeOperator setExpression(Expression expression) {
     }
 
     @Override
-    public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
+    public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
         return visitor.visit(this, context);
     }