Skip to content

Commit 2eb8c80

Browse files
manticore-projectsmanticore-projects
committed
style: Appease Codacy
1 parent e16ba5d commit 2eb8c80

9 files changed

Lines changed: 39 additions & 30 deletions

File tree

‎src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ public DateTimeLiteralExpression withType(DateTime type) {
5555
public enum DateTime {
5656
DATE("DATE"), TIME("TIME"), TIMESTAMP("TIMESTAMP"), TIMESTAMPTZ("TIMESTAMPTZ");
5757

58-
public String getDateTime() {
59-
return dateTime;
60-
}
61-
6258
private final String dateTime;
6359

6460
DateTime(String dateTime) {
@@ -68,5 +64,9 @@ public String getDateTime() {
6864
public static DateTime from(String dateTimeStr) {
6965
return Enum.valueOf(DateTime.class, dateTimeStr.toUpperCase());
7066
}
67+
68+
public String getDateTime() {
69+
return dateTime;
70+
}
7171
}
7272
}

‎src/main/java/net/sf/jsqlparser/expression/operators/relational/ExpressionList.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@
2525
*/
2626
public class ExpressionList<T extends Expression> extends ArrayList<T>
2727
implements ItemsList, Expression, Serializable {
28+
private transient SimpleNode node;
29+
2830
public ExpressionList(Collection<? extends T> expressions) {
2931
addAll(expressions);
3032
}
3133

32-
@Deprecated
33-
public boolean isUsingBrackets() {
34-
return false;
35-
}
36-
3734
public ExpressionList(List<T> expressions) {
3835
super(expressions);
3936
}
@@ -42,6 +39,11 @@ public ExpressionList(T... expressions) {
4239
this(Arrays.asList(expressions));
4340
}
4441

42+
@Deprecated
43+
public boolean isUsingBrackets() {
44+
return false;
45+
}
46+
4547
@Deprecated
4648
public List<T> getExpressions() {
4749
return this;
@@ -88,8 +90,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
8890
expressionVisitor.visit(this);
8991
}
9092

91-
private transient SimpleNode node;
92-
9393
@Override
9494
public SimpleNode getASTNode() {
9595
return node;

‎src/main/java/net/sf/jsqlparser/statement/ReferentialAction.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ public boolean equals(Object obj) {
9090
public enum Type {
9191
DELETE("DELETE"), UPDATE("UPDATE");
9292

93-
public String getType() {
94-
return type;
95-
}
96-
9793
private final String type;
9894

9995
Type(String type) {
@@ -103,18 +99,22 @@ public String getType() {
10399
public static Type from(String name) {
104100
return Enum.valueOf(Type.class, name.toUpperCase());
105101
}
102+
103+
public String getType() {
104+
return type;
105+
}
106106
}
107107

108108
public enum Action {
109109
CASCADE("CASCADE"), RESTRICT("RESTRICT"), NO_ACTION("NO ACTION"), SET_DEFAULT(
110110
"SET DEFAULT"), SET_NULL("SET NULL");
111111

112+
private final String action;
113+
112114
Action(String action) {
113115
this.action = action;
114116
}
115117

116-
private final String action;
117-
118118
/**
119119
* @param action
120120
* @return the {@link Action}, if found, otherwise <code>null</code>

‎src/main/java/net/sf/jsqlparser/statement/create/view/AutoRefreshOption.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
public enum AutoRefreshOption {
1313
NONE("NONE"),
1414

15-
YES("YESY"),
15+
YES("YES"),
1616

1717
NO("NO");
1818

19-
public String getOption() {
20-
return option;
21-
}
22-
2319
private final String option;
2420

2521
AutoRefreshOption(String option) {
@@ -30,4 +26,8 @@ public static AutoRefreshOption from(String option) {
3026
return Enum.valueOf(AutoRefreshOption.class, option.toUpperCase());
3127
}
3228

29+
public String getOption() {
30+
return option;
31+
}
32+
3333
}

‎src/main/java/net/sf/jsqlparser/statement/insert/InsertModifierPriority.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ public enum InsertModifierPriority {
1313
LOW_PRIORITY("LOW_PRIORITY"), DELAYED("DELAYED"), HIGH_PRIORITY("HIGH_PRIORITY"), IGNORE(
1414
"IGNORE");
1515

16-
public String getPriority() {
17-
return priority;
18-
}
19-
2016
private final String priority;
2117

2218
InsertModifierPriority(String priority) {
@@ -26,4 +22,8 @@ public String getPriority() {
2622
public final static InsertModifierPriority from(String priority) {
2723
return Enum.valueOf(InsertModifierPriority.class, priority.toUpperCase());
2824
}
25+
26+
public String getPriority() {
27+
return priority;
28+
}
2929
}

‎src/main/java/net/sf/jsqlparser/statement/select/KSQLJoinWindow.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public class KSQLJoinWindow extends ASTNodeAccessImpl {
2222
private long afterDuration;
2323
private TimeUnit afterTimeUnit;
2424

25-
public KSQLJoinWindow() {}
26-
2725
public boolean isBeforeAfterWindow() {
2826
return beforeAfter;
2927
}

‎src/test/java/net/sf/jsqlparser/parser/CCJSqlParserTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class CCJSqlParserTest {
1919
@Test
2020
public void parserWithTimeout() throws Exception {
2121
CCJSqlParser parser = CCJSqlParserUtil.newParser("foo").withTimeOut(123L);
22-
22+
2323
Long timeOut = parser.getAsLong(Feature.timeOut);
2424

2525
assertThat(timeOut).isEqualTo(123L);

‎src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ public class SpecialOracleTest {
8282
"datetime02.sql", "datetime04.sql", "datetime05.sql", "datetime06.sql", "dblink01.sql",
8383
"for_update01.sql", "for_update02.sql", "for_update03.sql", "function04.sql",
8484
"function05.sql", "for_update04.sql", "for_update05.sql", "for_update06.sql",
85-
"for_update08.sql", "function01.sql", "function02.sql", "function03.sql", "function06.sql",
85+
"for_update08.sql", "function01.sql", "function02.sql", "function03.sql",
86+
"function06.sql",
8687
"groupby01.sql",
8788
"groupby02.sql", "groupby03.sql", "groupby04.sql", "groupby05.sql", "groupby06.sql",
8889
"groupby08.sql", "groupby09.sql", "groupby10.sql", "groupby11.sql", "groupby12.sql",

‎src/test/java/net/sf/jsqlparser/test/HowToUseSample.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import net.sf.jsqlparser.statement.select.Select;
2525
import net.sf.jsqlparser.statement.select.SelectItem;
2626
import net.sf.jsqlparser.statement.select.SelectVisitorAdapter;
27+
import net.sf.jsqlparser.statement.update.Update;
2728
import net.sf.jsqlparser.util.deparser.StatementDeParser;
2829
import org.junit.jupiter.api.Assertions;
2930
import org.junit.jupiter.api.Test;
@@ -166,4 +167,13 @@ public void howToUseFeatures() throws JSQLParserException {
166167
Statement stmt2 = CCJSqlParserUtil.parse(sqlStr, parser -> parser
167168
.withSquareBracketQuotation(true).withAllowComplexParsing(true).withTimeOut(6000));
168169
}
170+
171+
@Test
172+
public void showBracketHandling() throws JSQLParserException {
173+
String sqlStr = " ( (values(1,2), (3,4)) UNION (values((1,2), (3,4))) )";
174+
Statement statement = CCJSqlParserUtil.parse(sqlStr);
175+
final String reflectionString = TestUtils.toReflectionString(statement);
176+
177+
System.out.println(reflectionString);
178+
}
169179
}

0 commit comments

Comments
 (0)