From 66067a553e91b095cef4254ca880f6f8b6975e53 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 8 Nov 2021 11:31:10 +0100 Subject: [PATCH] Polishing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reformat code. Consistently use String.format(…) instead of string concatenation. See #1078 --- .../core/sql/render/SelectRenderContext.java | 11 ++++---- .../sql/render/SelectRendererUnitTests.java | 26 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectRenderContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectRenderContext.java index c78f37917..74592f391 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectRenderContext.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectRenderContext.java @@ -58,7 +58,7 @@ public interface SelectRenderContext { *

* Renders lock, limit and offset clause as appropriate. *

- * + * * @param hasOrderBy the actual value whether the {@link Select} statement has a {@code ORDER BY} clause. * @return render {@link Function} invoked after rendering {@code ORDER BY}. */ @@ -73,15 +73,16 @@ public interface SelectRenderContext { String lockPrefix = (lockMode == null) ? "" : " FOR UPDATE"; if (limit.isPresent() && offset.isPresent()) { - return lockPrefix - + String.format(" OFFSET %d ROWS FETCH FIRST %d ROWS ONLY", offset.getAsLong(), limit.getAsLong()); + return String.format("%s OFFSET %d ROWS FETCH FIRST %d ROWS ONLY", lockPrefix, offset.getAsLong(), + limit.getAsLong()); } if (limit.isPresent()) { - return lockPrefix + String.format(" FETCH FIRST %d ROWS ONLY", limit.getAsLong()); + return String.format("%s FETCH FIRST %d ROWS ONLY", lockPrefix, limit.getAsLong()); } if (offset.isPresent()) { - return lockPrefix + String.format(" OFFSET %d ROWS", offset.getAsLong()); + return String.format("%s OFFSET %d ROWS", lockPrefix, offset.getAsLong()); } + return lockPrefix; }; } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java index 7e0f22d4b..b8f649ab8 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java @@ -218,13 +218,13 @@ class SelectRendererUnitTests { .select(employee.column("id"), employee.column("department_Id"), employee.column("name")).from(employee) .build(); - final InlineQuery one = InlineQuery.create(innerSelect, "one"); + InlineQuery one = InlineQuery.create(innerSelect, "one"); Select select = Select.builder().select(one.column("id"), department.column("name")).from(department) // .join(one).on(one.column("department_id")).equals(department.column("id")) // .build(); - final String sql = SqlRenderer.toString(select); + String sql = SqlRenderer.toString(select); assertThat(sql).isEqualTo("SELECT one.id, department.name FROM department " // + "JOIN (SELECT employee.id, employee.department_Id, employee.name FROM employee) one " // @@ -243,14 +243,14 @@ class SelectRendererUnitTests { Select innerSelectTwo = Select.builder().select(department.column("id"), department.column("name")).from(department) .build(); - final InlineQuery one = InlineQuery.create(innerSelectOne, "one"); - final InlineQuery two = InlineQuery.create(innerSelectTwo, "two"); + InlineQuery one = InlineQuery.create(innerSelectOne, "one"); + InlineQuery two = InlineQuery.create(innerSelectTwo, "two"); Select select = Select.builder().select(one.column("id"), two.column("name")).from(one) // .join(two).on(two.column("department_id")).equals(one.column("id")) // .build(); - final String sql = SqlRenderer.toString(select); + String sql = SqlRenderer.toString(select); assertThat(sql).isEqualTo("SELECT one.id, two.name FROM (" // + "SELECT employee.id, employee.department_Id, employee.name FROM employee) one " // + "JOIN (SELECT department.id, department.name FROM department) two " // @@ -454,7 +454,7 @@ class SelectRendererUnitTests { Select select = StatementBuilder.select(table_user.column("name"), table_user.column("age")).from(table_user) .where(Comparison.create("age", ">", 20)).build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.name, User.age FROM User WHERE age > 20"); } @@ -465,7 +465,7 @@ class SelectRendererUnitTests { Select select = StatementBuilder.select(table_user.column("name"), table_user.column("age")).from(table_user) .where(Comparison.create(table_user.column("age"), ">", SQL.literalOf(20))).build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.name, User.age FROM User WHERE User.age > 20"); } @@ -476,7 +476,7 @@ class SelectRendererUnitTests { Select select = StatementBuilder.select(Expressions.cast(table_user.column("name"), "VARCHAR2")).from(table_user) .build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT CAST(User.name AS VARCHAR2) FROM User"); } @@ -486,7 +486,7 @@ class SelectRendererUnitTests { Table table_user = SQL.table("User"); Select select = StatementBuilder.select(table_user.column("name")).from(table_user).limitOffset(10, 5).build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.name FROM User OFFSET 5 ROWS FETCH FIRST 10 ROWS ONLY"); } @@ -498,7 +498,7 @@ class SelectRendererUnitTests { .limit(3) // .build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.name FROM User FETCH FIRST 3 ROWS ONLY"); } @@ -510,7 +510,7 @@ class SelectRendererUnitTests { .lock(LockMode.PESSIMISTIC_READ) // .build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.name FROM User FOR UPDATE"); } @@ -522,7 +522,7 @@ class SelectRendererUnitTests { .lock(LockMode.PESSIMISTIC_WRITE) // .build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.name FROM User FOR UPDATE OFFSET 3 ROWS"); } @@ -550,7 +550,7 @@ class SelectRendererUnitTests { .from(table) // .build(); - final String rendered = SqlRenderer.toString(select); + String rendered = SqlRenderer.toString(select); assertThat(rendered).isEqualTo("SELECT User.age > 18 FROM User"); }