Skip to content

Commit 666cac2

Browse files
cbockermanncbockermann
committed
Changed DeParsers to generic list types.
1 parent 0dd60b1 commit 666cac2

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ public void deParse(CreateTable createTable) {
2525
buffer.append("CREATE TABLE " + createTable.getTable().getWholeTableName());
2626
if (createTable.getColumnDefinitions() != null) {
2727
buffer.append(" { ");
28-
for (Iterator iter = createTable.getColumnDefinitions().iterator(); iter.hasNext();) {
28+
for (Iterator<ColumnDefinition> iter = createTable.getColumnDefinitions().iterator(); iter.hasNext();) {
2929
ColumnDefinition columnDefinition = (ColumnDefinition) iter.next();
3030
buffer.append(columnDefinition.getColumnName());
3131
buffer.append(" ");
3232
buffer.append(columnDefinition.getColDataType().getDataType());
3333
if (columnDefinition.getColDataType().getArgumentsStringList() != null) {
34-
for (Iterator iterator = columnDefinition.getColDataType().getArgumentsStringList().iterator(); iterator
34+
for (Iterator<String> iterator = columnDefinition.getColDataType().getArgumentsStringList().iterator(); iterator
3535
.hasNext();) {
3636
buffer.append(" ");
3737
buffer.append((String) iterator.next());
3838
}
3939
}
4040
if (columnDefinition.getColumnSpecStrings() != null) {
41-
for (Iterator iterator = columnDefinition.getColumnSpecStrings().iterator(); iterator.hasNext();) {
41+
for (Iterator<String> iterator = columnDefinition.getColumnSpecStrings().iterator(); iterator.hasNext();) {
4242
buffer.append(" ");
4343
buffer.append((String) iterator.next());
4444
}
@@ -49,12 +49,12 @@ public void deParse(CreateTable createTable) {
4949

5050
}
5151

52-
for (Iterator iter = createTable.getIndexes().iterator(); iter.hasNext();) {
52+
for (Iterator<Index> iter = createTable.getIndexes().iterator(); iter.hasNext();) {
5353
buffer.append(",\n");
5454
Index index = (Index) iter.next();
5555
buffer.append(index.getType() + " " + index.getName());
5656
buffer.append("(");
57-
for (Iterator iterator = index.getColumnsNames().iterator(); iterator.hasNext();) {
57+
for (Iterator<String> iterator = index.getColumnsNames().iterator(); iterator.hasNext();) {
5858
buffer.append((String) iterator.next());
5959
if (iterator.hasNext()) {
6060
buffer.append(", ");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public void visit(Function function) {
291291
public void visit(ExpressionList expressionList) {
292292
if (useBracketsInExprList)
293293
buffer.append("(");
294-
for (Iterator iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
294+
for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
295295
Expression expression = (Expression) iter.next();
296296
expression.accept(this);
297297
if (iter.hasNext())
@@ -328,9 +328,9 @@ public void visit(CaseExpression caseExpression) {
328328
switchExp.accept(this);
329329
}
330330

331-
List clauses = caseExpression.getWhenClauses();
332-
for (Iterator iter = clauses.iterator(); iter.hasNext();) {
333-
Expression exp = (Expression) iter.next();
331+
List<Expression> clauses = caseExpression.getWhenClauses();
332+
for (Iterator<Expression> iter = clauses.iterator(); iter.hasNext();) {
333+
Expression exp = iter.next();
334334
exp.accept(this);
335335
}
336336

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public void deParse(Insert insert) {
5454
buffer.append(insert.getTable().getWholeTableName());
5555
if (insert.getColumns() != null) {
5656
buffer.append("(");
57-
for (Iterator iter = insert.getColumns().iterator(); iter.hasNext();) {
58-
Column column = (Column) iter.next();
57+
for (Iterator<Column> iter = insert.getColumns().iterator(); iter.hasNext();) {
58+
Column column = iter.next();
5959
buffer.append(column.getColumnName());
6060
if (iter.hasNext()) {
6161
buffer.append(", ");
@@ -70,8 +70,8 @@ public void deParse(Insert insert) {
7070

7171
public void visit(ExpressionList expressionList) {
7272
buffer.append(" VALUES (");
73-
for (Iterator iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
74-
Expression expression = (Expression) iter.next();
73+
for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
74+
Expression expression = iter.next();
7575
expression.accept(expressionVisitor);
7676
if (iter.hasNext())
7777
buffer.append(", ");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public void deParse(Replace replace) {
8484

8585
public void visit(ExpressionList expressionList) {
8686
buffer.append(" VALUES (");
87-
for (Iterator iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
88-
Expression expression = (Expression) iter.next();
87+
for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
88+
Expression expression = iter.next();
8989
expression.accept(expressionVisitor);
9090
if (iter.hasNext())
9191
buffer.append(", ");

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public void visit(PlainSelect plainSelect) {
5757
buffer.append("DISTINCT ");
5858
if (plainSelect.getDistinct().getOnSelectItems() != null) {
5959
buffer.append("ON (");
60-
for (Iterator iter = plainSelect.getDistinct().getOnSelectItems().iterator(); iter.hasNext();) {
61-
SelectItem selectItem = (SelectItem) iter.next();
60+
for (Iterator<SelectItem> iter = plainSelect.getDistinct().getOnSelectItems().iterator(); iter.hasNext();) {
61+
SelectItem selectItem = iter.next();
6262
selectItem.accept(this);
6363
if (iter.hasNext()) {
6464
buffer.append(", ");
@@ -69,8 +69,8 @@ public void visit(PlainSelect plainSelect) {
6969

7070
}
7171

72-
for (Iterator iter = plainSelect.getSelectItems().iterator(); iter.hasNext();) {
73-
SelectItem selectItem = (SelectItem) iter.next();
72+
for (Iterator<SelectItem> iter = plainSelect.getSelectItems().iterator(); iter.hasNext();) {
73+
SelectItem selectItem = iter.next();
7474
selectItem.accept(this);
7575
if (iter.hasNext()) {
7676
buffer.append(", ");
@@ -85,8 +85,8 @@ public void visit(PlainSelect plainSelect) {
8585
}
8686

8787
if (plainSelect.getJoins() != null) {
88-
for (Iterator iter = plainSelect.getJoins().iterator(); iter.hasNext();) {
89-
Join join = (Join) iter.next();
88+
for (Iterator<Join> iter = plainSelect.getJoins().iterator(); iter.hasNext();) {
89+
Join join = iter.next();
9090
deparseJoin(join);
9191
}
9292
}
@@ -98,8 +98,8 @@ public void visit(PlainSelect plainSelect) {
9898

9999
if (plainSelect.getGroupByColumnReferences() != null) {
100100
buffer.append(" GROUP BY ");
101-
for (Iterator iter = plainSelect.getGroupByColumnReferences().iterator(); iter.hasNext();) {
102-
Expression columnReference = (Expression) iter.next();
101+
for (Iterator<Expression> iter = plainSelect.getGroupByColumnReferences().iterator(); iter.hasNext();) {
102+
Expression columnReference = iter.next();
103103
columnReference.accept(expressionVisitor);
104104
if (iter.hasNext()) {
105105
buffer.append(", ");
@@ -123,9 +123,9 @@ public void visit(PlainSelect plainSelect) {
123123
}
124124

125125
public void visit(Union union) {
126-
for (Iterator iter = union.getPlainSelects().iterator(); iter.hasNext();) {
126+
for (Iterator<PlainSelect> iter = union.getPlainSelects().iterator(); iter.hasNext();) {
127127
buffer.append("(");
128-
PlainSelect plainSelect = (PlainSelect) iter.next();
128+
PlainSelect plainSelect = iter.next();
129129
plainSelect.accept(this);
130130
buffer.append(")");
131131
if (iter.hasNext()) {
@@ -186,10 +186,10 @@ public void visit(Table tableName) {
186186
}
187187
}
188188

189-
public void deparseOrderBy(List orderByElements) {
189+
public void deparseOrderBy(List<OrderByElement> orderByElements) {
190190
buffer.append(" ORDER BY ");
191-
for (Iterator iter = orderByElements.iterator(); iter.hasNext();) {
192-
OrderByElement orderByElement = (OrderByElement) iter.next();
191+
for (Iterator<OrderByElement> iter = orderByElements.iterator(); iter.hasNext();) {
192+
OrderByElement orderByElement = iter.next();
193193
orderByElement.accept(this);
194194
if (iter.hasNext()) {
195195
buffer.append(", ");
@@ -276,8 +276,8 @@ else if (join.isInner())
276276
}
277277
if (join.getUsingColumns() != null) {
278278
buffer.append(" USING ( ");
279-
for (Iterator iterator = join.getUsingColumns().iterator(); iterator.hasNext();) {
280-
Column column = (Column) iterator.next();
279+
for (Iterator<Column> iterator = join.getUsingColumns().iterator(); iterator.hasNext();) {
280+
Column column = iterator.next();
281281
buffer.append(column.getWholeColumnName());
282282
if (iterator.hasNext()) {
283283
buffer.append(" ,");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public void visit(Select select) {
6565
selectDeParser.setExpressionVisitor(expressionDeParser);
6666
if (select.getWithItemsList() != null && !select.getWithItemsList().isEmpty()) {
6767
buffer.append("WITH ");
68-
for (Iterator iter = select.getWithItemsList().iterator(); iter.hasNext();) {
69-
WithItem withItem = (WithItem) iter.next();
68+
for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
69+
WithItem withItem = iter.next();
7070
buffer.append(withItem);
7171
if (iter.hasNext())
7272
buffer.append(",");

0 commit comments

Comments
 (0)