Skip to content

Commit c0b6675

Browse files
committed
Checkstyle updates
1 parent a364dae commit c0b6675

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,17 @@ private String calculateColumnList() {
6060
}
6161

6262
private String nameIncludingTableAndColumnAlias(SqlColumn<?> column) {
63-
return column.alias().map(a -> column.nameIncludingTableAlias(selectModel.tableAlias(column.table())) + " as " + a) //$NON-NLS-1$
64-
.orElse(column.nameIncludingTableAlias(selectModel.tableAlias(column.table())));
63+
StringBuilder buffer = new StringBuilder(calculateColumnNameAndTableAlias(column));
64+
column.alias().ifPresent(a -> {
65+
buffer.append(" as "); //$NON-NLS-1$
66+
buffer.append(a);
67+
});
68+
69+
return buffer.toString();
70+
}
71+
72+
private String calculateColumnNameAndTableAlias(SqlColumn<?> column) {
73+
return column.nameIncludingTableAlias(selectModel.tableAlias(column.table()));
6574
}
6675

6776
private Optional<String> calculateOrderByPhrase() {

src/main/java/org/mybatis/dynamic/sql/where/render/WhereRenderer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ private FragmentAndParameters render(SqlCriterion<?> criterion) {
4747
.render(criterion);
4848
}
4949

50-
public static WhereRenderer of(WhereModel model, RenderingStrategy renderingStrategy, Map<SqlTable, String> tableAliases) {
50+
public static WhereRenderer of(WhereModel model, RenderingStrategy renderingStrategy,
51+
Map<SqlTable, String> tableAliases) {
5152
return new WhereRenderer(model, renderingStrategy, tableAliases);
5253
}
5354
}

0 commit comments

Comments
 (0)