Skip to content

Commit 681cac9

Browse files
feat: Visitors return Objects
BREAKING CHANGE: New signatures for all Visitor interfaces Signed-off-by: Andreas Reichel <[email protected]>
1 parent 5c360a2 commit 681cac9

36 files changed

+1645
-961
lines changed

src/main/java/net/sf/jsqlparser/expression/Expression.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414

1515
public interface Expression extends ASTNodeAccess, Model {
1616

17-
void accept(ExpressionVisitor expressionVisitor);
17+
void accept(ExpressionVisitor<?> expressionVisitor);
1818

1919
}

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

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -58,199 +58,199 @@
5858
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
5959
import net.sf.jsqlparser.statement.select.Select;
6060

61-
public interface ExpressionVisitor {
61+
public interface ExpressionVisitor<T> {
6262

63-
void visit(BitwiseRightShift aThis);
63+
T visit(BitwiseRightShift aThis);
6464

65-
void visit(BitwiseLeftShift aThis);
65+
T visit(BitwiseLeftShift aThis);
6666

67-
void visit(NullValue nullValue);
67+
T visit(NullValue nullValue);
6868

69-
void visit(Function function);
69+
T visit(Function function);
7070

71-
void visit(SignedExpression signedExpression);
71+
T visit(SignedExpression signedExpression);
7272

73-
void visit(JdbcParameter jdbcParameter);
73+
T visit(JdbcParameter jdbcParameter);
7474

75-
void visit(JdbcNamedParameter jdbcNamedParameter);
75+
T visit(JdbcNamedParameter jdbcNamedParameter);
7676

77-
void visit(DoubleValue doubleValue);
77+
T visit(DoubleValue doubleValue);
7878

79-
void visit(LongValue longValue);
79+
T visit(LongValue longValue);
8080

81-
void visit(HexValue hexValue);
81+
T visit(HexValue hexValue);
8282

83-
void visit(DateValue dateValue);
83+
T visit(DateValue dateValue);
8484

85-
void visit(TimeValue timeValue);
85+
T visit(TimeValue timeValue);
8686

87-
void visit(TimestampValue timestampValue);
87+
T visit(TimestampValue timestampValue);
8888

89-
void visit(StringValue stringValue);
89+
T visit(StringValue stringValue);
9090

91-
void visit(Addition addition);
91+
T visit(Addition addition);
9292

93-
void visit(Division division);
93+
T visit(Division division);
9494

95-
void visit(IntegerDivision division);
95+
T visit(IntegerDivision division);
9696

97-
void visit(Multiplication multiplication);
97+
T visit(Multiplication multiplication);
9898

99-
void visit(Subtraction subtraction);
99+
T visit(Subtraction subtraction);
100100

101-
void visit(AndExpression andExpression);
101+
T visit(AndExpression andExpression);
102102

103-
void visit(OrExpression orExpression);
103+
T visit(OrExpression orExpression);
104104

105-
void visit(XorExpression orExpression);
105+
T visit(XorExpression orExpression);
106106

107-
void visit(Between between);
107+
T visit(Between between);
108108

109-
void visit(OverlapsCondition overlapsCondition);
109+
T visit(OverlapsCondition overlapsCondition);
110110

111-
void visit(EqualsTo equalsTo);
111+
T visit(EqualsTo equalsTo);
112112

113-
void visit(GreaterThan greaterThan);
113+
T visit(GreaterThan greaterThan);
114114

115-
void visit(GreaterThanEquals greaterThanEquals);
115+
T visit(GreaterThanEquals greaterThanEquals);
116116

117-
void visit(InExpression inExpression);
117+
T visit(InExpression inExpression);
118118

119-
void visit(IncludesExpression includesExpression);
119+
T visit(IncludesExpression includesExpression);
120120

121-
void visit(ExcludesExpression excludesExpression);
121+
T visit(ExcludesExpression excludesExpression);
122122

123-
void visit(FullTextSearch fullTextSearch);
123+
T visit(FullTextSearch fullTextSearch);
124124

125-
void visit(IsNullExpression isNullExpression);
125+
T visit(IsNullExpression isNullExpression);
126126

127-
void visit(IsBooleanExpression isBooleanExpression);
127+
T visit(IsBooleanExpression isBooleanExpression);
128128

129-
void visit(LikeExpression likeExpression);
129+
T visit(LikeExpression likeExpression);
130130

131-
void visit(MinorThan minorThan);
131+
T visit(MinorThan minorThan);
132132

133-
void visit(MinorThanEquals minorThanEquals);
133+
T visit(MinorThanEquals minorThanEquals);
134134

135-
void visit(NotEqualsTo notEqualsTo);
135+
T visit(NotEqualsTo notEqualsTo);
136136

137-
void visit(DoubleAnd doubleAnd);
137+
T visit(DoubleAnd doubleAnd);
138138

139-
void visit(Contains contains);
139+
T visit(Contains contains);
140140

141-
void visit(ContainedBy containedBy);
141+
T visit(ContainedBy containedBy);
142142

143-
void visit(ParenthesedSelect selectBody);
143+
T visit(ParenthesedSelect selectBody);
144144

145-
void visit(Column tableColumn);
145+
T visit(Column tableColumn);
146146

147-
void visit(CaseExpression caseExpression);
147+
T visit(CaseExpression caseExpression);
148148

149-
void visit(WhenClause whenClause);
149+
T visit(WhenClause whenClause);
150150

151-
void visit(ExistsExpression existsExpression);
151+
T visit(ExistsExpression existsExpression);
152152

153-
void visit(MemberOfExpression memberOfExpression);
153+
T visit(MemberOfExpression memberOfExpression);
154154

155-
void visit(AnyComparisonExpression anyComparisonExpression);
155+
T visit(AnyComparisonExpression anyComparisonExpression);
156156

157-
void visit(Concat concat);
157+
T visit(Concat concat);
158158

159-
void visit(Matches matches);
159+
T visit(Matches matches);
160160

161-
void visit(BitwiseAnd bitwiseAnd);
161+
T visit(BitwiseAnd bitwiseAnd);
162162

163-
void visit(BitwiseOr bitwiseOr);
163+
T visit(BitwiseOr bitwiseOr);
164164

165-
void visit(BitwiseXor bitwiseXor);
165+
T visit(BitwiseXor bitwiseXor);
166166

167-
void visit(CastExpression cast);
167+
T visit(CastExpression cast);
168168

169-
void visit(Modulo modulo);
169+
T visit(Modulo modulo);
170170

171-
void visit(AnalyticExpression aexpr);
171+
T visit(AnalyticExpression aexpr);
172172

173-
void visit(ExtractExpression eexpr);
173+
T visit(ExtractExpression eexpr);
174174

175-
void visit(IntervalExpression iexpr);
175+
T visit(IntervalExpression iexpr);
176176

177-
void visit(OracleHierarchicalExpression oexpr);
177+
T visit(OracleHierarchicalExpression oexpr);
178178

179-
void visit(RegExpMatchOperator rexpr);
179+
T visit(RegExpMatchOperator rexpr);
180180

181-
void visit(JsonExpression jsonExpr);
181+
T visit(JsonExpression jsonExpr);
182182

183-
void visit(JsonOperator jsonExpr);
183+
T visit(JsonOperator jsonExpr);
184184

185-
void visit(UserVariable var);
185+
T visit(UserVariable var);
186186

187-
void visit(NumericBind bind);
187+
T visit(NumericBind bind);
188188

189-
void visit(KeepExpression aexpr);
189+
T visit(KeepExpression aexpr);
190190

191-
void visit(MySQLGroupConcat groupConcat);
191+
T visit(MySQLGroupConcat groupConcat);
192192

193-
void visit(ExpressionList<?> expressionList);
193+
T visit(ExpressionList<?> expressionList);
194194

195-
void visit(RowConstructor<?> rowConstructor);
195+
T visit(RowConstructor<?> rowConstructor);
196196

197-
void visit(RowGetExpression rowGetExpression);
197+
T visit(RowGetExpression rowGetExpression);
198198

199-
void visit(OracleHint hint);
199+
T visit(OracleHint hint);
200200

201-
void visit(TimeKeyExpression timeKeyExpression);
201+
T visit(TimeKeyExpression timeKeyExpression);
202202

203-
void visit(DateTimeLiteralExpression literal);
203+
T visit(DateTimeLiteralExpression literal);
204204

205-
void visit(NotExpression aThis);
205+
T visit(NotExpression aThis);
206206

207-
void visit(NextValExpression aThis);
207+
T visit(NextValExpression aThis);
208208

209-
void visit(CollateExpression aThis);
209+
T visit(CollateExpression aThis);
210210

211-
void visit(SimilarToExpression aThis);
211+
T visit(SimilarToExpression aThis);
212212

213-
void visit(ArrayExpression aThis);
213+
T visit(ArrayExpression aThis);
214214

215-
void visit(ArrayConstructor aThis);
215+
T visit(ArrayConstructor aThis);
216216

217-
void visit(VariableAssignment aThis);
217+
T visit(VariableAssignment aThis);
218218

219-
void visit(XMLSerializeExpr aThis);
219+
T visit(XMLSerializeExpr aThis);
220220

221-
void visit(TimezoneExpression aThis);
221+
T visit(TimezoneExpression aThis);
222222

223-
void visit(JsonAggregateFunction aThis);
223+
T visit(JsonAggregateFunction aThis);
224224

225-
void visit(JsonFunction aThis);
225+
T visit(JsonFunction aThis);
226226

227-
void visit(ConnectByRootOperator aThis);
227+
T visit(ConnectByRootOperator aThis);
228228

229-
void visit(OracleNamedFunctionParameter aThis);
229+
T visit(OracleNamedFunctionParameter aThis);
230230

231-
void visit(AllColumns allColumns);
231+
T visit(AllColumns allColumns);
232232

233-
void visit(AllTableColumns allTableColumns);
233+
T visit(AllTableColumns allTableColumns);
234234

235-
void visit(AllValue allValue);
235+
T visit(AllValue allValue);
236236

237-
void visit(IsDistinctExpression isDistinctExpression);
237+
T visit(IsDistinctExpression isDistinctExpression);
238238

239-
void visit(GeometryDistance geometryDistance);
239+
T visit(GeometryDistance geometryDistance);
240240

241-
void visit(Select selectBody);
241+
T visit(Select selectBody);
242242

243-
void visit(TranscodingFunction transcodingFunction);
243+
T visit(TranscodingFunction transcodingFunction);
244244

245-
void visit(TrimFunction trimFunction);
245+
T visit(TrimFunction trimFunction);
246246

247-
void visit(RangeExpression rangeExpression);
247+
T visit(RangeExpression rangeExpression);
248248

249-
void visit(TSQLLeftJoin tsqlLeftJoin);
249+
T visit(TSQLLeftJoin tsqlLeftJoin);
250250

251-
void visit(TSQLRightJoin tsqlRightJoin);
251+
T visit(TSQLRightJoin tsqlRightJoin);
252252

253-
void visit(StructType structType);
253+
T visit(StructType structType);
254254

255-
void visit(LambdaExpression lambdaExpression);
255+
T visit(LambdaExpression lambdaExpression);
256256
}

0 commit comments

Comments
 (0)