Skip to content

Commit 1387986

Browse files
feat: rework the Visitors
Signed-off-by: Andreas Reichel <[email protected]>
1 parent 709476c commit 1387986

22 files changed

+79
-95
lines changed

build.gradle

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ def getVersion = { boolean considerSnapshot ->
3434
commandLine "git", "--no-pager", "describe", "--tags", "--always", "--dirty=-SNAPSHOT"
3535
}.standardOutput.asText.get().trim()
3636

37-
def pattern = /(?<major>\d*)\.(?<minor>\d*)(\.(?<patch>\d*))?(-(?<build>\d*)-(?<commit>[a-zA-Z\d]*))?/
37+
println "Version String: $versionStr"
38+
39+
def pattern = /jsqlparser-(?<major>\d*)\.(?<minor>\d*)(\.(?<patch>\d*))?(-(?<build>\d*)-(?<commit>[a-zA-Z\d]*))?/
3840
def matcher = versionStr =~ pattern
3941

4042
if (matcher.find()) {
@@ -124,7 +126,10 @@ java {
124126
}
125127

126128
javadoc {
127-
include("build/generated/javacc/net/sf/jsqlparser/parser/*.java" )
129+
dependsOn(compileJavacc, compileJava )
130+
source = layout.buildDirectory.dir("generated/javacc/net/sf/jsqlparser/parser").get().asFileTree.matching {
131+
include("**/*.java")
132+
}
128133
if(JavaVersion.current().isJava9Compatible()) {
129134
options.addBooleanOption('html5', true)
130135
}
@@ -140,6 +145,8 @@ jar {
140145
}
141146

142147
tasks.register('xmldoc', Javadoc) {
148+
println getVersion( true )
149+
143150
def outFile = reporting.file(
144151
version.endsWith("-SNAPSHOT")
145152
? "xmlDoclet/javadoc_snapshot.xml"
@@ -153,17 +160,25 @@ tasks.register('xmldoc', Javadoc) {
153160
)
154161

155162
source = sourceSets.main.allJava
163+
// source += fileTree(layout.buildDirectory.dir("generated/javacc/net/sf/jsqlparser/parser").get()) {
164+
// include("**/*.java")
165+
// }
166+
// source += fileTree(layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser").get()) {
167+
// include("**/*.java")
168+
// }
156169
// beware: Gradle deletes this folder automatically and there is no switch-off
157170
destinationDir = reporting.file("xmlDoclet")
158171
options.docletpath = configurations.xmlDoclet.files as List
159172
options.doclet = "com.github.markusbernhardt.xmldoclet.XmlDoclet"
160-
title = "API $version"
173+
title = "API " + getVersion( !System.getenv("RELEASE") )
161174
options.addBooleanOption("rst", true)
162175
options.addBooleanOption("withFloatingToc", Boolean.parseBoolean(System.getenv().getOrDefault("FLOATING_TOC", "true")))
163176
options.addStringOption("basePackage", "net.sf.jsqlparser")
164177
options.addStringOption("filename", outFile.getName())
178+
options.addStringOption('J-Xmx4g')
179+
options.addStringOption('J-Xss2m')
165180

166-
dependsOn(compileJava)
181+
dependsOn(compileJavacc, compileJava )
167182
doLast {
168183
copy {
169184
from rstFile
@@ -181,7 +196,7 @@ test {
181196
maxHeapSize = "4G"
182197

183198
// set JVM stack size
184-
jvmArgs = ['-Xss2m']
199+
jvmArgs = ['-Xss2m', '--add-opens=java.base/java.lang=ALL-UNNAMED']
185200

186201
jacoco {
187202
excludes = ['net/sf/jsqlparser/parser/CCJSqlParserTokenManager']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public AggregatePipeOperator setShorthandOrdering(boolean usingShortHandOrdering
4949
}
5050

5151
@Override
52-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
52+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
5353
return visitor.visit(this, context);
5454
}
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public AsPipeOperator setAlias(Alias alias) {
1919
}
2020

2121
@Override
22-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
22+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
2323
return visitor.visit(this, context);
2424
}
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public StringBuilder appendTo(StringBuilder builder) {
4141
}
4242

4343
@Override
44-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
44+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
4545
return visitor.visit(this, context);
4646
}
4747
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public ListIterator<Column> listIterator() {
193193
}
194194

195195
@Override
196-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
196+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
197197
return visitor.visit(this, context);
198198
}
199199

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ public <T, S> T accept(SelectVisitor<T> selectVisitor, S context) {
204204
}
205205

206206

207-
208207
@Override
209208
public StringBuilder appendTo(StringBuilder builder) {
210209
if (usingFromKeyword) {

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public JoinPipeOperator setJoin(Join join) {
1919
}
2020

2121
@Override
22-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
22+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
2323
return visitor.visit(this, context);
2424
}
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public LimitPipeOperator setOffsetExpression(Expression offsetExpression) {
3434
}
3535

3636
@Override
37-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
37+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
3838
return visitor.visit(this, context);
3939
}
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public StringBuilder appendTo(StringBuilder builder) {
3232
}
3333

3434
@Override
35-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
35+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
3636
return visitor.visit(this, context);
3737
}
3838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
44

55
public abstract class PipeOperator extends ASTNodeAccessImpl {
6-
public abstract <T, S> T accept(PipeOperatorVisitor<T> visitor, S context);
6+
public abstract <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context);
77
}
Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,38 @@
11
package net.sf.jsqlparser.statement.piped;
22

3-
public interface PipeOperatorVisitor<T> {
4-
<S> T visit(AggregatePipeOperator aggregate, S context);
3+
public interface PipeOperatorVisitor<T, S> {
4+
T visit(AggregatePipeOperator aggregate, S context);
55

6-
<S> T visit(AsPipeOperator as, S context);
6+
T visit(AsPipeOperator as, S context);
77

8-
<S> T visit(CallPipeOperator call, S context);
8+
T visit(CallPipeOperator call, S context);
99

10-
<S> T visit(DropPipeOperator drop, S context);
10+
T visit(DropPipeOperator drop, S context);
1111

12-
<S> T visit(ExceptPipeOperator except, S context);
12+
T visit(ExtendPipeOperator extend, S context);
1313

14-
<S> T visit(ExtendPipeOperator extend, S context);
14+
T visit(JoinPipeOperator join, S context);
1515

16-
<S> T visit(IntersectPipeOperator intersect, S context);
16+
T visit(LimitPipeOperator limit, S context);
1717

18-
<S> T visit(JoinPipeOperator join, S context);
18+
T visit(OrderByPipeOperator orderBy, S context);
1919

20-
<S> T visit(LimitPipeOperator limit, S context);
20+
T visit(PivotPipeOperator pivot, S context);
2121

22-
<S> T visit(OrderByPipeOperator orderBy, S context);
22+
T visit(RenamePipeOperator rename, S context);
2323

24-
<S> T visit(PivotPipeOperator pivot, S context);
24+
T visit(SelectPipeOperator select, S context);
2525

26-
<S> T visit(RenamePipeOperator rename, S context);
26+
T visit(SetPipeOperator set, S context);
2727

28-
<S> T visit(SelectPipeOperator select, S context);
28+
T visit(TableSamplePipeOperator tableSample, S context);
2929

30-
<S> T visit(SetPipeOperator set, S context);
30+
T visit(SetOperationPipeOperator union, S context);
3131

32-
<S> T visit(TableSamplePipeOperator tableSample, S context);
32+
T visit(UnPivotPipeOperator unPivot, S context);
3333

34-
<S> T visit(SetOperationPipeOperator union, S context);
34+
T visit(WherePipeOperator where, S context);
3535

36-
<S> T visit(UnPivotPipeOperator unPivot, S context);
37-
38-
<S> T visit(WherePipeOperator where, S context);
39-
40-
<S> T visit(WindowPipeOperator window, S context);
36+
T visit(WindowPipeOperator window, S context);
4137
}
4238

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public StringBuilder appendTo(StringBuilder builder) {
7474
}
7575

7676
@Override
77-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
77+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
7878
return visitor.visit(this, context);
7979
}
8080
}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.sf.jsqlparser.statement.piped;
22

3-
public class RenamePipeOperator extends PipeOperator {
4-
@Override
5-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
6-
return visitor.visit(this, context);
3+
import net.sf.jsqlparser.statement.select.SelectItem;
4+
5+
public class RenamePipeOperator extends SelectPipeOperator {
6+
public RenamePipeOperator(SelectItem<?> selectItem) {
7+
super("RENAME", selectItem);
78
}
89
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public SelectPipeOperator with(SelectItem<?> selectItem) {
3636
}
3737

3838
@Override
39-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
39+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
4040
return visitor.visit(this, context);
4141
}
4242

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public StringBuilder appendTo(StringBuilder builder) {
7171
}
7272

7373
@Override
74-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
74+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
7575
return visitor.visit(this, context);
7676
}
7777
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public boolean isEmpty() {
155155
}
156156

157157
@Override
158-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
158+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
159159
return visitor.visit(this, context);
160160
}
161161

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public StringBuilder appendTo(StringBuilder builder) {
2727
}
2828

2929
@Override
30-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
30+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
3131
return visitor.visit(this, context);
3232
}
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public StringBuilder appendTo(StringBuilder builder) {
7373
}
7474

7575
@Override
76-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
76+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
7777
return visitor.visit(this, context);
7878
}
7979
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public WherePipeOperator setExpression(Expression expression) {
1919
}
2020

2121
@Override
22-
public <T, S> T accept(PipeOperatorVisitor<T> visitor, S context) {
22+
public <T, S> T accept(PipeOperatorVisitor<T, S> visitor, S context) {
2323
return visitor.visit(this, context);
2424
}
2525

0 commit comments

Comments
 (0)