Skip to content

Commit 0c55268

Browse files
ANeumann82ANeumann82
committed
[chore] Code Review
1 parent 8773eea commit 0c55268

22 files changed

Lines changed: 120 additions & 57 deletions

‎src/main/java/module-info.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,6 @@
5757
exports net.sf.jsqlparser.util.validation.feature;
5858
exports net.sf.jsqlparser.util.validation.metadata;
5959
exports net.sf.jsqlparser.util.validation.validator;
60+
exports net.sf.jsqlparser.expression.json;
61+
exports net.sf.jsqlparser.statement.from;
6062
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,6 @@ default void visit(JsonFunction jsonFunction) {
652652
this.visit(jsonFunction, null);
653653
}
654654

655-
<S> T visit(JsonTable jsonTable, S context);
656-
657-
default void visit(JsonTable jsonTable) {
658-
this.visit(jsonTable, null);
659-
}
660-
661655
<S> T visit(ConnectByRootOperator connectByRootOperator, S context);
662656

663657
default void visit(ConnectByRootOperator connectByRootOperator) {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -728,12 +728,6 @@ public <S> T visit(JsonFunction jsonFunction, S context) {
728728
return visitExpressions(jsonFunction, context, subExpressions);
729729
}
730730

731-
@Override
732-
public <S> T visit(JsonTable jsonTable, S context) {
733-
// TODO: Implement
734-
return null;
735-
}
736-
737731
@Override
738732
public <S> T visit(ConnectByRootOperator connectByRootOperator, S context) {
739733
return connectByRootOperator.getColumn().accept(this, context);

src/main/java/net/sf/jsqlparser/expression/JsonOnEmptyType.java renamed to src/main/java/net/sf/jsqlparser/expression/json/JsonOnEmptyType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* 02110-1301 USA
2424
*/
2525

26-
package net.sf.jsqlparser.expression;
26+
package net.sf.jsqlparser.expression.json;
2727

2828
/**
2929
*

src/main/java/net/sf/jsqlparser/expression/JsonOnErrorType.java renamed to src/main/java/net/sf/jsqlparser/expression/json/JsonOnErrorType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* 02110-1301 USA
2424
*/
2525

26-
package net.sf.jsqlparser.expression;
26+
package net.sf.jsqlparser.expression.json;
2727

2828
/**
2929
*

src/main/java/net/sf/jsqlparser/expression/JsonQueryWrapperType.java renamed to src/main/java/net/sf/jsqlparser/expression/json/JsonQueryWrapperType.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,22 @@
2323
* 02110-1301 USA
2424
*/
2525

26-
package net.sf.jsqlparser.expression;
26+
package net.sf.jsqlparser.expression.json;
2727

2828
/**
2929
*
3030
*/
3131
public enum JsonQueryWrapperType {
32-
WITHOUT_WRAPPER("WITHOUT WRAPPER"), WITHOUT_ARRAY_WRAPPER(
33-
"WITHOUT ARRAY WRAPPER"), WITH_WRAPPER("WITH WRAPPER"), WITH_ARRAY_WRAPPER(
34-
"WITH ARRAY WRAPPER"), WITH_UNCONDITIONAL_WRAPPER(
35-
"WITH UNCONDITIONAL WRAPPER"), WITH_UNCONDITIONAL_ARRAY_WRAPPER(
36-
"WITH UNCONDITIONAL ARRAY WRAPPER"), WITH_CONDITIONAL_WRAPPER(
37-
"WITH CONDITIONAL WRAPPER"), WITH_CONDITIONAL_ARRAY_WRAPPER(
38-
"WITH CONDITIONAL ARRAY WRAPPER");
32+
//@formatter:off
33+
WITHOUT_WRAPPER("WITHOUT WRAPPER"),
34+
WITHOUT_ARRAY_WRAPPER("WITHOUT ARRAY WRAPPER"),
35+
WITH_WRAPPER("WITH WRAPPER"),
36+
WITH_ARRAY_WRAPPER("WITH ARRAY WRAPPER"),
37+
WITH_UNCONDITIONAL_WRAPPER("WITH UNCONDITIONAL WRAPPER"),
38+
WITH_UNCONDITIONAL_ARRAY_WRAPPER("WITH UNCONDITIONAL ARRAY WRAPPER"),
39+
WITH_CONDITIONAL_WRAPPER("WITH CONDITIONAL WRAPPER"),
40+
WITH_CONDITIONAL_ARRAY_WRAPPER("WITH CONDITIONAL ARRAY WRAPPER");
41+
//@formatter:on
3942

4043
private final String value;
4144

src/main/java/net/sf/jsqlparser/expression/JsonReturnClause.java renamed to src/main/java/net/sf/jsqlparser/expression/json/JsonReturnClause.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.sf.jsqlparser.expression;
1+
package net.sf.jsqlparser.expression.json;
22

33
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
44

src/main/java/net/sf/jsqlparser/expression/JsonReturnType.java renamed to src/main/java/net/sf/jsqlparser/expression/json/JsonReturnType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* 02110-1301 USA
2424
*/
2525

26-
package net.sf.jsqlparser.expression;
26+
package net.sf.jsqlparser.expression.json;
2727

2828
/**
2929
*

src/main/java/net/sf/jsqlparser/expression/JsonTable.java renamed to src/main/java/net/sf/jsqlparser/statement/from/JsonTable.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package net.sf.jsqlparser.expression;
1+
package net.sf.jsqlparser.statement.from;
22

3-
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
3+
import net.sf.jsqlparser.expression.Expression;
4+
import net.sf.jsqlparser.expression.json.JsonOnEmptyType;
5+
import net.sf.jsqlparser.expression.json.JsonOnErrorType;
46
import net.sf.jsqlparser.statement.select.AbstractFromitem;
57
import net.sf.jsqlparser.statement.select.FromItem;
68
import net.sf.jsqlparser.statement.select.FromItemVisitor;

src/main/java/net/sf/jsqlparser/expression/JsonTableColumn.java renamed to src/main/java/net/sf/jsqlparser/statement/from/JsonTableColumn.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
package net.sf.jsqlparser.expression;
1+
package net.sf.jsqlparser.statement.from;
22

3+
import net.sf.jsqlparser.expression.json.JsonOnEmptyType;
4+
import net.sf.jsqlparser.expression.json.JsonOnErrorType;
5+
import net.sf.jsqlparser.expression.json.JsonQueryWrapperType;
6+
import net.sf.jsqlparser.expression.json.JsonReturnClause;
37
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
48

59
public class JsonTableColumn extends ASTNodeAccessImpl {

0 commit comments

Comments
 (0)