Skip to content

Commit 9844f40

Browse files
committed
Polishing.
Reformat code. Add since tag. See #995 Original pull request: #1014.
1 parent 82c70ab commit 9844f40

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultSelectBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
class DefaultSelectBuilder implements SelectBuilder, SelectAndFrom, SelectFromAndJoin, SelectWhereAndOr {
3838

3939
private boolean distinct = false;
40-
private List<Expression> selectList = new ArrayList<>();
41-
private List<TableLike> from = new ArrayList<>();
40+
private final List<Expression> selectList = new ArrayList<>();
41+
private final List<TableLike> from = new ArrayList<>();
4242
private long limit = -1;
4343
private long offset = -1;
44-
private List<Join> joins = new ArrayList<>();
44+
private final List<Join> joins = new ArrayList<>();
4545
private @Nullable Condition where;
46-
private List<OrderByField> orderBy = new ArrayList<>();
46+
private final List<OrderByField> orderBy = new ArrayList<>();
4747
private @Nullable LockMode lockMode;
4848

4949
/*

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SelectBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,13 +503,13 @@ interface SelectOn {
503503
SelectOnConditionComparison on(Expression column);
504504

505505
/**
506-
* Declare a join condition in one step.
507-
*
508-
* Using conditions allows more flexibility in comparison to {@link #on(Expression)} which only allows for equality comparisons chained together with `AND`.
506+
* Declare a join {@link Condition condition} in one step. Using conditions allows more flexibility in comparison to
507+
* {@link #on(Expression)} which only allows for equality comparisons chained together with {@code AND}.
509508
*
510509
* @param condition must not be {@literal null}.
511510
* @return {@code this} builder.
512511
* @see Conditions
512+
* @since 2.3
513513
*/
514514
SelectFromAndJoinCondition on(Condition condition);
515515
}

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ void shouldRenderSimpleJoinWithAnd() {
156156
+ "AND employee.tenant = department.tenant");
157157
}
158158

159-
@Test // GH-995
160-
public void shouldRenderArbitraryJoinCondition() {
159+
@Test // #995
160+
void shouldRenderArbitraryJoinCondition() {
161161

162162
Table employee = SQL.table("employee");
163163
Table department = SQL.table("department");
@@ -166,11 +166,9 @@ public void shouldRenderArbitraryJoinCondition() {
166166
.select(employee.column("id"), department.column("name")) //
167167
.from(employee) //
168168
.join(department) //
169-
.on(
170-
Conditions.isEqual( employee.column("department_id"),department.column("id")) //
171-
.or( //
172-
Conditions.isNotEqual( employee.column("tenant"),department.column("tenant")) //
173-
)) //
169+
.on(Conditions.isEqual(employee.column("department_id"), department.column("id")) //
170+
.or(Conditions.isNotEqual(employee.column("tenant"), department.column("tenant")) //
171+
))
174172
.build();
175173

176174
assertThat(SqlRenderer.toString(select)).isEqualTo("SELECT employee.id, department.name FROM employee " //
@@ -424,16 +422,12 @@ void shouldRenderWithRenderContext() {
424422
"SELECT COUNT(\"my_table\".*) AS counter, \"my_table\".\"reserved_keyword\" FROM \"my_table\" JOIN \"join_table\" ON \"my_table\".source = \"join_table\".target");
425423
}
426424

427-
428425
@Test // GH-1034
429426
void simpleComparisonWithStringArguments() {
430427

431428
Table table_user = SQL.table("User");
432-
Select select = StatementBuilder
433-
.select(table_user.column("name"),table_user.column("age"))
434-
.from(table_user)
435-
.where(Comparison.create("age",">",20))
436-
.build();
429+
Select select = StatementBuilder.select(table_user.column("name"), table_user.column("age")).from(table_user)
430+
.where(Comparison.create("age", ">", 20)).build();
437431

438432
final String rendered = SqlRenderer.toString(select);
439433
assertThat(rendered).isEqualTo("SELECT User.name, User.age FROM User WHERE age > 20");
@@ -443,11 +437,8 @@ void simpleComparisonWithStringArguments() {
443437
void simpleComparison() {
444438

445439
Table table_user = SQL.table("User");
446-
Select select = StatementBuilder
447-
.select(table_user.column("name"),table_user.column("age"))
448-
.from(table_user)
449-
.where(Comparison.create(table_user.column("age"),">",SQL.literalOf(20)))
450-
.build();
440+
Select select = StatementBuilder.select(table_user.column("name"), table_user.column("age")).from(table_user)
441+
.where(Comparison.create(table_user.column("age"), ">", SQL.literalOf(20))).build();
451442

452443
final String rendered = SqlRenderer.toString(select);
453444
assertThat(rendered).isEqualTo("SELECT User.name, User.age FROM User WHERE User.age > 20");

0 commit comments

Comments
 (0)