Skip to content

Commit d5d6e3a

Browse files
manticore-projectsmanticore-projects
committed
Merge github.com:JSQLParser/JSqlParser
2 parents 05a02eb + 4863eb5 commit d5d6e3a

27 files changed

Lines changed: 858 additions & 152 deletions

File tree

‎build.gradle‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ repositories {
3030
}
3131

3232
dependencies {
33-
testImplementation 'commons-io:commons-io:2.+'
34-
testImplementation 'org.mockito:mockito-core:4.+'
35-
testImplementation 'org.assertj:assertj-core:3.+'
36-
testImplementation 'org.hamcrest:hamcrest-core:2.+'
37-
testImplementation 'org.apache.commons:commons-lang3:3.+'
38-
testImplementation 'com.h2database:h2:2.+'
39-
33+
testImplementation 'commons-io:commons-io:2.11.0'
34+
testImplementation 'junit:junit:4.13.2'
35+
testImplementation 'org.mockito:mockito-core:4.5.1'
36+
testImplementation 'org.assertj:assertj-core:3.22.0'
37+
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
38+
testImplementation 'com.h2database:h2:2.1.212'
39+
4040
// for JaCoCo Reports
4141
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.+'
4242
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.+'
@@ -46,6 +46,7 @@ dependencies {
4646
testImplementation 'org.junit.jupiter:junit-jupiter-params:+'
4747

4848
// enforce latest version of JavaCC
49+
implementation 'net.java.dev.javacc:javacc:7.0.12'
4950
javacc 'net.java.dev.javacc:javacc:7.0.12'
5051
}
5152

@@ -95,7 +96,8 @@ jacocoTestCoverageVerification {
9596
rule {
9697
//element = 'CLASS'
9798
limit {
98-
minimum = 0.84
99+
//@todo: temporarily reduced it 80%, we need to bring that back to 84% accepting the Keywords PR
100+
minimum = 0.80
99101
}
100102
excludes = [
101103
'net.sf.jsqlparser.util.validation.*',
@@ -115,7 +117,9 @@ jacocoTestCoverageVerification {
115117
limit {
116118
counter = 'LINE'
117119
value = 'MISSEDCOUNT'
118-
maximum = 5700
120+
121+
//@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
122+
maximum = 7000
119123
}
120124
excludes = [
121125
'net.sf.jsqlparser.util.validation.*',
@@ -226,15 +230,15 @@ task renderRR() {
226230

227231
javaexec {
228232
standardOutput = new FileOutputStream("${buildDir}/rr/JSqlParserCC.ebnf")
229-
main="-jar";
233+
main="-jar"
230234
args = [
231235
"$buildDir/rr/convert.war",
232236
"$buildDir/generated/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jj"
233237
]
234238
}
235239

236240
javaexec {
237-
main="-jar";
241+
main="-jar"
238242
args = [
239243
"$buildDir/rr/rr.war",
240244
"-noepsilon",
@@ -249,7 +253,17 @@ task renderRR() {
249253
}
250254
}
251255
}
252-
256+
257+
task updateKeywords(type: JavaExec) {
258+
group = "Execution"
259+
description = "Run the main class with JavaExecTask"
260+
classpath = sourceSets.main.runtimeClasspath
261+
args = [
262+
//project(':JSQLParser').file('src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt').absolutePath
263+
file('src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt').absolutePath
264+
]
265+
mainClass = 'net.sf.jsqlparser.parser.ParserKeywordsUtils'
266+
}
253267

254268
publishing {
255269
publications {

‎config/pmd/ruleset.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ under the License.
4040
<rule ref="category/java/bestpractices.xml/UnusedPrivateField" />
4141
<rule ref="category/java/bestpractices.xml/UnusedPrivateMethod" />
4242

43-
<rule ref="category/java/codestyle.xml/DontImportJavaLang" />
44-
<rule ref="category/java/codestyle.xml/DuplicateImports" />
4543
<rule ref="category/java/codestyle.xml/ExtendsObject" />
4644
<rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop" />
4745
<rule ref="category/java/codestyle.xml/TooManyStaticImports" />
@@ -101,7 +99,6 @@ under the License.
10199
<rule ref="category/java/errorprone.xml/EmptySynchronizedBlock" />
102100
<rule ref="category/java/errorprone.xml/EmptyTryBlock" />
103101
<rule ref="category/java/errorprone.xml/EmptyWhileStmt" />
104-
<rule ref="category/java/errorprone.xml/ImportFromSamePackage" />
105102
<rule ref="category/java/errorprone.xml/JumbledIncrementer" />
106103
<rule ref="category/java/errorprone.xml/MisplacedNullCheck" />
107104
<rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
@@ -112,15 +109,12 @@ under the License.
112109
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable" />
113110

114111
<!-- for Codazy -->
115-
<!-- <rule ref="category/java/errorprone.xml/MissingBreakInSwitch" /> -->
116-
117112
<rule ref="category/java/multithreading.xml/AvoidThreadGroup" />
118113
<rule ref="category/java/multithreading.xml/DontCallThreadRun" />
119114
<rule ref="category/java/multithreading.xml/DoubleCheckedLocking" />
120115

121116
<rule ref="category/java/performance.xml/BigIntegerInstantiation" />
122-
<rule ref="category/java/performance.xml/BooleanInstantiation" />
123-
117+
124118
<!-- for Codazy -->
125119
<!-- <rule ref="category/java/documentation.xml/UncommentedEmptyMethodBody" /> -->
126120
</ruleset>

‎pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@
2525
</licenses>
2626

2727
<dependencies>
28+
<!-- needed for parsing the Keywords via JTree in ParserKeywordsUtils -->
29+
<dependency>
30+
<groupId>net.java.dev.javacc</groupId>
31+
<artifactId>javacc</artifactId>
32+
<version>7.0.11</version>
33+
</dependency>
34+
2835
<dependency>
2936
<groupId>commons-io</groupId>
3037
<artifactId>commons-io</artifactId>
@@ -146,6 +153,7 @@
146153
<artifactId>pmd-java</artifactId>
147154
<version>${pmdVersion}</version>
148155
</dependency>
156+
<!-- Do we really need those? What for?
149157
<dependency>
150158
<groupId>net.sourceforge.pmd</groupId>
151159
<artifactId>pmd-javascript</artifactId>
@@ -156,6 +164,7 @@
156164
<artifactId>pmd-jsp</artifactId>
157165
<version>${pmdVersion}</version>
158166
</dependency>
167+
-->
159168
</dependencies>
160169
</plugin>
161170
<plugin>
@@ -202,15 +211,6 @@
202211
<goal>jjtree-javacc</goal>
203212
</goals>
204213
</execution>
205-
206-
<!-- execute JJTree explicitely in order to generate the *.jj file needed for JJDoc -->
207-
<execution>
208-
<id>jjtree</id>
209-
<phase>generate-sources</phase>
210-
<goals>
211-
<goal>jjtree</goal>
212-
</goals>
213-
</execution>
214214
</executions>
215215
<dependencies>
216216
<dependency>

‎src/main/java/net/sf/jsqlparser/parser/AbstractJSqlParser.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,4 @@ public void setErrorRecovery(boolean errorRecovery) {
6666
public List<ParseException> getParseErrors() {
6767
return parseErrors;
6868
}
69-
7069
}

‎src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,5 +370,4 @@ public static int getNestingDepth(String sql) {
370370
}
371371
return maxlevel;
372372
}
373-
374373
}

0 commit comments

Comments
 (0)