Skip to content

Commit 90e852a

Browse files
author
Stefan Steinhauser
committed
refactor: Replace wildcard imports
1 parent dd06a17 commit 90e852a

File tree

6 files changed

+331
-9
lines changed

6 files changed

+331
-9
lines changed

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,36 @@
2424
import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
2525
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
2626
import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
27-
import net.sf.jsqlparser.expression.operators.relational.*;
27+
import net.sf.jsqlparser.expression.operators.relational.Between;
28+
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
29+
import net.sf.jsqlparser.expression.operators.relational.Contains;
30+
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
31+
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
32+
import net.sf.jsqlparser.expression.operators.relational.ExcludesExpression;
33+
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
34+
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
35+
import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
36+
import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
37+
import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
38+
import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
39+
import net.sf.jsqlparser.expression.operators.relational.InExpression;
40+
import net.sf.jsqlparser.expression.operators.relational.IncludesExpression;
41+
import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
42+
import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
43+
import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
44+
import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
45+
import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
46+
import net.sf.jsqlparser.expression.operators.relational.Matches;
47+
import net.sf.jsqlparser.expression.operators.relational.MemberOfExpression;
48+
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
49+
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
50+
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
51+
import net.sf.jsqlparser.expression.operators.relational.Plus;
52+
import net.sf.jsqlparser.expression.operators.relational.PriorTo;
53+
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
54+
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
55+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
56+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
2857
import net.sf.jsqlparser.schema.Column;
2958
import net.sf.jsqlparser.statement.select.AllColumns;
3059
import net.sf.jsqlparser.statement.select.AllTableColumns;

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,59 @@
2525
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
2626
import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
2727
import net.sf.jsqlparser.expression.operators.relational.Between;
28+
import net.sf.jsqlparser.expression.operators.relational.Between;
29+
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
2830
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
2931
import net.sf.jsqlparser.expression.operators.relational.Contains;
32+
import net.sf.jsqlparser.expression.operators.relational.Contains;
3033
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
34+
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
35+
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
3136
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
37+
import net.sf.jsqlparser.expression.operators.relational.ExcludesExpression;
38+
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
3239
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
3340
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
41+
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
42+
import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
3443
import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
3544
import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
45+
import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
3646
import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
47+
import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
48+
import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
3749
import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
3850
import net.sf.jsqlparser.expression.operators.relational.InExpression;
51+
import net.sf.jsqlparser.expression.operators.relational.InExpression;
52+
import net.sf.jsqlparser.expression.operators.relational.IncludesExpression;
3953
import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
54+
import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
55+
import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
4056
import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
4157
import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
58+
import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
4259
import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
60+
import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
61+
import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
4362
import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
4463
import net.sf.jsqlparser.expression.operators.relational.Matches;
64+
import net.sf.jsqlparser.expression.operators.relational.Matches;
4565
import net.sf.jsqlparser.expression.operators.relational.MemberOfExpression;
66+
import net.sf.jsqlparser.expression.operators.relational.MemberOfExpression;
67+
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
4668
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
4769
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
70+
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
4871
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
72+
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
73+
import net.sf.jsqlparser.expression.operators.relational.Plus;
74+
import net.sf.jsqlparser.expression.operators.relational.PriorTo;
75+
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
4976
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
5077
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
51-
import net.sf.jsqlparser.expression.operators.relational.*;
78+
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
79+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
80+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
5281
import net.sf.jsqlparser.schema.Column;
5382
import net.sf.jsqlparser.statement.select.AllColumns;
5483
import net.sf.jsqlparser.statement.select.AllTableColumns;

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
*/
1010
package net.sf.jsqlparser.statement.select;
1111

12-
import net.sf.jsqlparser.expression.*;
12+
import net.sf.jsqlparser.expression.Alias;
13+
import net.sf.jsqlparser.expression.Expression;
14+
import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
15+
import net.sf.jsqlparser.expression.OracleHint;
16+
import net.sf.jsqlparser.expression.PreferringClause;
17+
import net.sf.jsqlparser.expression.WindowDefinition;
1318
import net.sf.jsqlparser.schema.Table;
1419

1520
import java.util.ArrayList;

‎src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java‎

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,62 @@
1010
package net.sf.jsqlparser.util;
1111

1212
import net.sf.jsqlparser.JSQLParserException;
13-
import net.sf.jsqlparser.expression.*;
13+
import net.sf.jsqlparser.expression.AllValue;
14+
import net.sf.jsqlparser.expression.AnalyticExpression;
15+
import net.sf.jsqlparser.expression.AnyComparisonExpression;
16+
import net.sf.jsqlparser.expression.ArrayConstructor;
17+
import net.sf.jsqlparser.expression.ArrayExpression;
18+
import net.sf.jsqlparser.expression.BinaryExpression;
19+
import net.sf.jsqlparser.expression.CaseExpression;
20+
import net.sf.jsqlparser.expression.CastExpression;
21+
import net.sf.jsqlparser.expression.CollateExpression;
22+
import net.sf.jsqlparser.expression.ConnectByRootOperator;
23+
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
24+
import net.sf.jsqlparser.expression.DateValue;
25+
import net.sf.jsqlparser.expression.DoubleValue;
26+
import net.sf.jsqlparser.expression.Expression;
27+
import net.sf.jsqlparser.expression.ExpressionVisitor;
28+
import net.sf.jsqlparser.expression.ExtractExpression;
29+
import net.sf.jsqlparser.expression.Function;
30+
import net.sf.jsqlparser.expression.HexValue;
31+
import net.sf.jsqlparser.expression.HighExpression;
32+
import net.sf.jsqlparser.expression.IntervalExpression;
33+
import net.sf.jsqlparser.expression.Inverse;
34+
import net.sf.jsqlparser.expression.JdbcNamedParameter;
35+
import net.sf.jsqlparser.expression.JdbcParameter;
36+
import net.sf.jsqlparser.expression.JsonAggregateFunction;
37+
import net.sf.jsqlparser.expression.JsonExpression;
38+
import net.sf.jsqlparser.expression.JsonFunction;
39+
import net.sf.jsqlparser.expression.JsonFunctionExpression;
40+
import net.sf.jsqlparser.expression.KeepExpression;
41+
import net.sf.jsqlparser.expression.LambdaExpression;
42+
import net.sf.jsqlparser.expression.LongValue;
43+
import net.sf.jsqlparser.expression.LowExpression;
44+
import net.sf.jsqlparser.expression.MySQLGroupConcat;
45+
import net.sf.jsqlparser.expression.NextValExpression;
46+
import net.sf.jsqlparser.expression.NotExpression;
47+
import net.sf.jsqlparser.expression.NullValue;
48+
import net.sf.jsqlparser.expression.NumericBind;
49+
import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
50+
import net.sf.jsqlparser.expression.OracleHint;
51+
import net.sf.jsqlparser.expression.OracleNamedFunctionParameter;
52+
import net.sf.jsqlparser.expression.OverlapsCondition;
53+
import net.sf.jsqlparser.expression.RangeExpression;
54+
import net.sf.jsqlparser.expression.RowConstructor;
55+
import net.sf.jsqlparser.expression.RowGetExpression;
56+
import net.sf.jsqlparser.expression.SignedExpression;
57+
import net.sf.jsqlparser.expression.StringValue;
58+
import net.sf.jsqlparser.expression.StructType;
59+
import net.sf.jsqlparser.expression.TimeKeyExpression;
60+
import net.sf.jsqlparser.expression.TimeValue;
61+
import net.sf.jsqlparser.expression.TimestampValue;
62+
import net.sf.jsqlparser.expression.TimezoneExpression;
63+
import net.sf.jsqlparser.expression.TranscodingFunction;
64+
import net.sf.jsqlparser.expression.TrimFunction;
65+
import net.sf.jsqlparser.expression.UserVariable;
66+
import net.sf.jsqlparser.expression.VariableAssignment;
67+
import net.sf.jsqlparser.expression.WhenClause;
68+
import net.sf.jsqlparser.expression.XMLSerializeExpr;
1469
import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
1570
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
1671
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
@@ -26,7 +81,36 @@
2681
import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
2782
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
2883
import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
29-
import net.sf.jsqlparser.expression.operators.relational.*;
84+
import net.sf.jsqlparser.expression.operators.relational.Between;
85+
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
86+
import net.sf.jsqlparser.expression.operators.relational.Contains;
87+
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
88+
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
89+
import net.sf.jsqlparser.expression.operators.relational.ExcludesExpression;
90+
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
91+
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
92+
import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
93+
import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
94+
import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
95+
import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
96+
import net.sf.jsqlparser.expression.operators.relational.InExpression;
97+
import net.sf.jsqlparser.expression.operators.relational.IncludesExpression;
98+
import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
99+
import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
100+
import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
101+
import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
102+
import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
103+
import net.sf.jsqlparser.expression.operators.relational.Matches;
104+
import net.sf.jsqlparser.expression.operators.relational.MemberOfExpression;
105+
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
106+
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
107+
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
108+
import net.sf.jsqlparser.expression.operators.relational.Plus;
109+
import net.sf.jsqlparser.expression.operators.relational.PriorTo;
110+
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
111+
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
112+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
113+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
30114
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
31115
import net.sf.jsqlparser.schema.Column;
32116
import net.sf.jsqlparser.schema.Table;

‎src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java‎

Lines changed: 89 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,63 @@
99
*/
1010
package net.sf.jsqlparser.util.deparser;
1111

12-
import net.sf.jsqlparser.expression.*;
12+
import net.sf.jsqlparser.expression.AllValue;
13+
import net.sf.jsqlparser.expression.AnalyticExpression;
14+
import net.sf.jsqlparser.expression.AnalyticType;
15+
import net.sf.jsqlparser.expression.AnyComparisonExpression;
16+
import net.sf.jsqlparser.expression.ArrayConstructor;
17+
import net.sf.jsqlparser.expression.ArrayExpression;
18+
import net.sf.jsqlparser.expression.BinaryExpression;
19+
import net.sf.jsqlparser.expression.CaseExpression;
20+
import net.sf.jsqlparser.expression.CastExpression;
21+
import net.sf.jsqlparser.expression.CollateExpression;
22+
import net.sf.jsqlparser.expression.ConnectByRootOperator;
23+
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
24+
import net.sf.jsqlparser.expression.DateValue;
25+
import net.sf.jsqlparser.expression.DoubleValue;
26+
import net.sf.jsqlparser.expression.Expression;
27+
import net.sf.jsqlparser.expression.ExpressionVisitor;
28+
import net.sf.jsqlparser.expression.ExtractExpression;
29+
import net.sf.jsqlparser.expression.Function;
30+
import net.sf.jsqlparser.expression.HexValue;
31+
import net.sf.jsqlparser.expression.HighExpression;
32+
import net.sf.jsqlparser.expression.IntervalExpression;
33+
import net.sf.jsqlparser.expression.Inverse;
34+
import net.sf.jsqlparser.expression.JdbcNamedParameter;
35+
import net.sf.jsqlparser.expression.JdbcParameter;
36+
import net.sf.jsqlparser.expression.JsonAggregateFunction;
37+
import net.sf.jsqlparser.expression.JsonExpression;
38+
import net.sf.jsqlparser.expression.JsonFunction;
39+
import net.sf.jsqlparser.expression.KeepExpression;
40+
import net.sf.jsqlparser.expression.LambdaExpression;
41+
import net.sf.jsqlparser.expression.LongValue;
42+
import net.sf.jsqlparser.expression.LowExpression;
43+
import net.sf.jsqlparser.expression.MySQLGroupConcat;
44+
import net.sf.jsqlparser.expression.NextValExpression;
45+
import net.sf.jsqlparser.expression.NotExpression;
46+
import net.sf.jsqlparser.expression.NullValue;
47+
import net.sf.jsqlparser.expression.NumericBind;
48+
import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
49+
import net.sf.jsqlparser.expression.OracleHint;
50+
import net.sf.jsqlparser.expression.OracleNamedFunctionParameter;
51+
import net.sf.jsqlparser.expression.OverlapsCondition;
52+
import net.sf.jsqlparser.expression.RangeExpression;
53+
import net.sf.jsqlparser.expression.RowConstructor;
54+
import net.sf.jsqlparser.expression.RowGetExpression;
55+
import net.sf.jsqlparser.expression.SignedExpression;
56+
import net.sf.jsqlparser.expression.StringValue;
57+
import net.sf.jsqlparser.expression.StructType;
58+
import net.sf.jsqlparser.expression.TimeKeyExpression;
59+
import net.sf.jsqlparser.expression.TimeValue;
60+
import net.sf.jsqlparser.expression.TimestampValue;
61+
import net.sf.jsqlparser.expression.TimezoneExpression;
62+
import net.sf.jsqlparser.expression.TranscodingFunction;
63+
import net.sf.jsqlparser.expression.TrimFunction;
64+
import net.sf.jsqlparser.expression.UserVariable;
65+
import net.sf.jsqlparser.expression.VariableAssignment;
66+
import net.sf.jsqlparser.expression.WhenClause;
67+
import net.sf.jsqlparser.expression.WindowElement;
68+
import net.sf.jsqlparser.expression.XMLSerializeExpr;
1369
import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
1470
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
1571
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
@@ -25,7 +81,38 @@
2581
import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
2682
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
2783
import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
28-
import net.sf.jsqlparser.expression.operators.relational.*;
84+
import net.sf.jsqlparser.expression.operators.relational.Between;
85+
import net.sf.jsqlparser.expression.operators.relational.ContainedBy;
86+
import net.sf.jsqlparser.expression.operators.relational.Contains;
87+
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
88+
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
89+
import net.sf.jsqlparser.expression.operators.relational.ExcludesExpression;
90+
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
91+
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
92+
import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
93+
import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
94+
import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
95+
import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
96+
import net.sf.jsqlparser.expression.operators.relational.InExpression;
97+
import net.sf.jsqlparser.expression.operators.relational.IncludesExpression;
98+
import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
99+
import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
100+
import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
101+
import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
102+
import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
103+
import net.sf.jsqlparser.expression.operators.relational.Matches;
104+
import net.sf.jsqlparser.expression.operators.relational.MemberOfExpression;
105+
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
106+
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
107+
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
108+
import net.sf.jsqlparser.expression.operators.relational.OldOracleJoinBinaryExpression;
109+
import net.sf.jsqlparser.expression.operators.relational.Plus;
110+
import net.sf.jsqlparser.expression.operators.relational.PriorTo;
111+
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
112+
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
113+
import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
114+
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
115+
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
29116
import net.sf.jsqlparser.schema.Column;
30117
import net.sf.jsqlparser.schema.Table;
31118
import net.sf.jsqlparser.statement.create.table.ColDataType;

0 commit comments

Comments
 (0)