Skip to content

Commit db49b43

Browse files
wumpzwumpz
committed
some housekeeping: replace string concats
1 parent 5dabda1 commit db49b43

File tree

6 files changed

+210
-210
lines changed

6 files changed

+210
-210
lines changed

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

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
package net.sf.jsqlparser.util.deparser;
2-
3-
import java.util.Iterator;
4-
5-
import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
6-
import net.sf.jsqlparser.statement.create.table.CreateTable;
7-
import net.sf.jsqlparser.statement.create.table.Index;
8-
9-
/**
10-
* A class to de-parse (that is, tranform from JSqlParser hierarchy into a
11-
* string) a {@link net.sf.jsqlparser.statement.create.table.CreateTable}
12-
*/
13-
public class CreateTableDeParser {
14-
15-
protected StringBuilder buffer;
16-
17-
/**
18-
* @param buffer the buffer that will be filled with the select
19-
*/
20-
public CreateTableDeParser(StringBuilder buffer) {
21-
this.buffer = buffer;
22-
}
23-
24-
public void deParse(CreateTable createTable) {
25-
buffer.append("CREATE TABLE " + createTable.getTable().getWholeTableName());
26-
if (createTable.getColumnDefinitions() != null) {
27-
buffer.append(" (");
28-
for (Iterator<ColumnDefinition> iter = createTable.getColumnDefinitions().iterator(); iter.hasNext();) {
29-
ColumnDefinition columnDefinition = (ColumnDefinition) iter.next();
30-
buffer.append(columnDefinition.getColumnName());
31-
buffer.append(" ");
32-
buffer.append(columnDefinition.getColDataType().toString());
33-
if (columnDefinition.getColumnSpecStrings() != null) {
34-
for (Iterator<String> iterator = columnDefinition.getColumnSpecStrings().iterator(); iterator.hasNext();) {
35-
buffer.append(" ");
36-
buffer.append((String) iterator.next());
37-
}
38-
}
39-
40-
if (iter.hasNext()) {
41-
buffer.append(" , ");
42-
}
43-
44-
}
45-
46-
if (createTable.getIndexes() != null) {
47-
for (Iterator<Index> iter = createTable.getIndexes().iterator(); iter.hasNext();) {
48-
buffer.append(",");
49-
Index index = (Index) iter.next();
50-
buffer.append(index.getType() + " " + index.getName());
51-
buffer.append("(");
52-
for (Iterator<String> iterator = index.getColumnsNames().iterator(); iterator.hasNext();) {
53-
buffer.append((String) iterator.next());
54-
if (iterator.hasNext()) {
55-
buffer.append(", ");
56-
}
57-
}
58-
buffer.append(")");
59-
60-
if (iter.hasNext()) {
61-
buffer.append(",");
62-
}
63-
}
64-
}
65-
66-
buffer.append(" )");
67-
}
68-
}
69-
70-
public StringBuilder getBuffer() {
71-
return buffer;
72-
}
73-
74-
public void setBuffer(StringBuilder buffer) {
75-
this.buffer = buffer;
76-
}
77-
}
1+
package net.sf.jsqlparser.util.deparser;
2+
3+
import java.util.Iterator;
4+
5+
import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
6+
import net.sf.jsqlparser.statement.create.table.CreateTable;
7+
import net.sf.jsqlparser.statement.create.table.Index;
8+
9+
/**
10+
* A class to de-parse (that is, tranform from JSqlParser hierarchy into a
11+
* string) a {@link net.sf.jsqlparser.statement.create.table.CreateTable}
12+
*/
13+
public class CreateTableDeParser {
14+
15+
protected StringBuilder buffer;
16+
17+
/**
18+
* @param buffer the buffer that will be filled with the select
19+
*/
20+
public CreateTableDeParser(StringBuilder buffer) {
21+
this.buffer = buffer;
22+
}
23+
24+
public void deParse(CreateTable createTable) {
25+
buffer.append("CREATE TABLE ").append(createTable.getTable().getWholeTableName());
26+
if (createTable.getColumnDefinitions() != null) {
27+
buffer.append(" (");
28+
for (Iterator<ColumnDefinition> iter = createTable.getColumnDefinitions().iterator(); iter.hasNext();) {
29+
ColumnDefinition columnDefinition = (ColumnDefinition) iter.next();
30+
buffer.append(columnDefinition.getColumnName());
31+
buffer.append(" ");
32+
buffer.append(columnDefinition.getColDataType().toString());
33+
if (columnDefinition.getColumnSpecStrings() != null) {
34+
for (Iterator<String> iterator = columnDefinition.getColumnSpecStrings().iterator(); iterator.hasNext();) {
35+
buffer.append(" ");
36+
buffer.append((String) iterator.next());
37+
}
38+
}
39+
40+
if (iter.hasNext()) {
41+
buffer.append(" , ");
42+
}
43+
44+
}
45+
46+
if (createTable.getIndexes() != null) {
47+
for (Iterator<Index> iter = createTable.getIndexes().iterator(); iter.hasNext();) {
48+
buffer.append(",");
49+
Index index = (Index) iter.next();
50+
buffer.append(index.getType()).append(" ").append(index.getName());
51+
buffer.append("(");
52+
for (Iterator<String> iterator = index.getColumnsNames().iterator(); iterator.hasNext();) {
53+
buffer.append((String) iterator.next());
54+
if (iterator.hasNext()) {
55+
buffer.append(", ");
56+
}
57+
}
58+
buffer.append(")");
59+
60+
if (iter.hasNext()) {
61+
buffer.append(",");
62+
}
63+
}
64+
}
65+
66+
buffer.append(" )");
67+
}
68+
}
69+
70+
public StringBuilder getBuffer() {
71+
return buffer;
72+
}
73+
74+
public void setBuffer(StringBuilder buffer) {
75+
this.buffer = buffer;
76+
}
77+
}

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

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
package net.sf.jsqlparser.util.deparser;
2-
3-
import net.sf.jsqlparser.expression.ExpressionVisitor;
4-
import net.sf.jsqlparser.statement.delete.Delete;
5-
6-
/**
7-
* A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
8-
* {@link net.sf.jsqlparser.statement.delete.Delete}
9-
*/
10-
public class DeleteDeParser {
11-
protected StringBuilder buffer;
12-
protected ExpressionVisitor expressionVisitor;
13-
14-
public DeleteDeParser() {
15-
}
16-
17-
/**
18-
* @param expressionVisitor
19-
* a {@link ExpressionVisitor} to de-parse expressions. It has to share the same<br>
20-
* StringBuilder (buffer parameter) as this object in order to work
21-
* @param buffer
22-
* the buffer that will be filled with the select
23-
*/
24-
public DeleteDeParser(ExpressionVisitor expressionVisitor, StringBuilder buffer) {
25-
this.buffer = buffer;
26-
this.expressionVisitor = expressionVisitor;
27-
}
28-
29-
public StringBuilder getBuffer() {
30-
return buffer;
31-
}
32-
33-
public void setBuffer(StringBuilder buffer) {
34-
this.buffer = buffer;
35-
}
36-
37-
public void deParse(Delete delete) {
38-
buffer.append("DELETE FROM " + delete.getTable().getWholeTableName());
39-
if (delete.getWhere() != null) {
40-
buffer.append(" WHERE ");
41-
delete.getWhere().accept(expressionVisitor);
42-
}
43-
44-
}
45-
46-
public ExpressionVisitor getExpressionVisitor() {
47-
return expressionVisitor;
48-
}
49-
50-
public void setExpressionVisitor(ExpressionVisitor visitor) {
51-
expressionVisitor = visitor;
52-
}
53-
54-
}
1+
package net.sf.jsqlparser.util.deparser;
2+
3+
import net.sf.jsqlparser.expression.ExpressionVisitor;
4+
import net.sf.jsqlparser.statement.delete.Delete;
5+
6+
/**
7+
* A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
8+
* {@link net.sf.jsqlparser.statement.delete.Delete}
9+
*/
10+
public class DeleteDeParser {
11+
protected StringBuilder buffer;
12+
protected ExpressionVisitor expressionVisitor;
13+
14+
public DeleteDeParser() {
15+
}
16+
17+
/**
18+
* @param expressionVisitor
19+
* a {@link ExpressionVisitor} to de-parse expressions. It has to share the same<br>
20+
* StringBuilder (buffer parameter) as this object in order to work
21+
* @param buffer
22+
* the buffer that will be filled with the select
23+
*/
24+
public DeleteDeParser(ExpressionVisitor expressionVisitor, StringBuilder buffer) {
25+
this.buffer = buffer;
26+
this.expressionVisitor = expressionVisitor;
27+
}
28+
29+
public StringBuilder getBuffer() {
30+
return buffer;
31+
}
32+
33+
public void setBuffer(StringBuilder buffer) {
34+
this.buffer = buffer;
35+
}
36+
37+
public void deParse(Delete delete) {
38+
buffer.append("DELETE FROM ").append(delete.getTable().getWholeTableName());
39+
if (delete.getWhere() != null) {
40+
buffer.append(" WHERE ");
41+
delete.getWhere().accept(expressionVisitor);
42+
}
43+
44+
}
45+
46+
public ExpressionVisitor getExpressionVisitor() {
47+
return expressionVisitor;
48+
}
49+
50+
public void setExpressionVisitor(ExpressionVisitor visitor) {
51+
expressionVisitor = visitor;
52+
}
53+
54+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public void visit(Parenthesis parenthesis) {
264264

265265
@Override
266266
public void visit(StringValue stringValue) {
267-
buffer.append("'" + stringValue.getValue() + "'");
267+
buffer.append("'").append(stringValue.getValue()).append("'");
268268

269269
}
270270

@@ -298,7 +298,7 @@ public void visit(Column tableColumn) {
298298
tableName = tableColumn.getTable().getWholeTableName();
299299
}
300300
if (tableName != null) {
301-
buffer.append(tableName + ".");
301+
buffer.append(tableName).append(".");
302302
}
303303

304304
buffer.append(tableColumn.getColumnName());
@@ -361,17 +361,17 @@ public void setSelectVisitor(SelectVisitor visitor) {
361361

362362
@Override
363363
public void visit(DateValue dateValue) {
364-
buffer.append("{d '" + dateValue.getValue().toString() + "'}");
364+
buffer.append("{d '").append(dateValue.getValue().toString()).append("'}");
365365
}
366366

367367
@Override
368368
public void visit(TimestampValue timestampValue) {
369-
buffer.append("{ts '" + timestampValue.getValue().toString() + "'}");
369+
buffer.append("{ts '").append(timestampValue.getValue().toString()).append("'}");
370370
}
371371

372372
@Override
373373
public void visit(TimeValue timeValue) {
374-
buffer.append("{t '" + timeValue.getValue().toString() + "'}");
374+
buffer.append("{t '").append(timeValue.getValue().toString()).append("'}");
375375
}
376376

377377
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void setBuffer(StringBuilder buffer) {
4949
}
5050

5151
public void deParse(Replace replace) {
52-
buffer.append("REPLACE " + replace.getTable().getWholeTableName());
52+
buffer.append("REPLACE ").append(replace.getTable().getWholeTableName());
5353
if (replace.getItemsList() != null) {
5454
if (replace.getColumns() != null) {
5555
buffer.append(" (");
@@ -69,7 +69,7 @@ public void deParse(Replace replace) {
6969
buffer.append(" SET ");
7070
for (int i = 0; i < replace.getColumns().size(); i++) {
7171
Column column = (Column) replace.getColumns().get(i);
72-
buffer.append(column.getWholeColumnName() + "=");
72+
buffer.append(column.getWholeColumnName()).append("=");
7373

7474
Expression expression = (Expression) replace.getExpressions().get(i);
7575
expression.accept(expressionVisitor);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,14 @@ public void visit(AllColumns allColumns) {
141141

142142
@Override
143143
public void visit(AllTableColumns allTableColumns) {
144-
buffer.append(allTableColumns.getTable().getWholeTableName() + ".*");
144+
buffer.append(allTableColumns.getTable().getWholeTableName()).append(".*");
145145
}
146146

147147
@Override
148148
public void visit(SelectExpressionItem selectExpressionItem) {
149149
selectExpressionItem.getExpression().accept(expressionVisitor);
150150
if (selectExpressionItem.getAlias() != null) {
151-
buffer.append(" AS " + selectExpressionItem.getAlias());
151+
buffer.append(" AS ").append(selectExpressionItem.getAlias());
152152
}
153153

154154
}
@@ -169,7 +169,7 @@ public void visit(Table tableName) {
169169
buffer.append(tableName.getWholeTableName());
170170
String alias = tableName.getAlias();
171171
if (alias != null && !alias.isEmpty()) {
172-
buffer.append(" AS " + alias);
172+
buffer.append(" AS ").append(alias);
173173
}
174174
}
175175

@@ -197,7 +197,7 @@ public void deparseLimit(Limit limit) {
197197
if (limit.isOffsetJdbcParameter()) {
198198
buffer.append(" OFFSET ?");
199199
} else if (limit.getOffset() != 0) {
200-
buffer.append(" OFFSET " + limit.getOffset());
200+
buffer.append(" OFFSET ").append(limit.getOffset());
201201
}
202202

203203
}

0 commit comments

Comments
 (0)