From 66d1e54179abe4b0f74ad8185b752a1aaea6c2a0 Mon Sep 17 00:00:00 2001 From: Diego Krupitza Date: Thu, 17 Feb 2022 16:03:17 +0100 Subject: [PATCH] Remove unnecessary `toString()` call. There were few explicit `toString()` calls that are not needed, since `toString()` will be called by default. Original pull request #1172 --- .../org/springframework/data/relational/core/query/Update.java | 2 +- .../data/relational/core/sql/AsteriskFromTable.java | 2 +- .../org/springframework/data/relational/core/sql/Between.java | 2 +- .../java/org/springframework/data/relational/core/sql/Like.java | 2 +- .../springframework/data/relational/core/sql/OrderByField.java | 2 +- .../data/relational/core/sql/SimpleCondition.java | 2 +- .../org/springframework/data/relational/core/sql/Where.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Update.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Update.java index 9b15dd9f..e5b76b7c 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Update.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Update.java @@ -122,6 +122,6 @@ public class Update { String.format("%s = %s", column.toSql(IdentifierProcessing.NONE), o instanceof Number ? o : "'" + o + "'")); }); - return "SET " + joiner.toString(); + return "SET " + joiner; } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/AsteriskFromTable.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/AsteriskFromTable.java index 2b2bf95a..885d2377 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/AsteriskFromTable.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/AsteriskFromTable.java @@ -58,6 +58,6 @@ public class AsteriskFromTable extends AbstractSegment implements Expression { return ((Aliased) table).getAlias() + ".*"; } - return table.toString() + ".*"; + return table + ".*"; } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Between.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Between.java index 9f855ad7..b5ff7190 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Between.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Between.java @@ -92,6 +92,6 @@ public class Between extends AbstractSegment implements Condition { @Override public String toString() { - return column.toString() + " BETWEEN " + begin.toString() + " AND " + end.toString(); + return column + " BETWEEN " + begin + " AND " + end; } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Like.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Like.java index cb6910b1..e8c28da6 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Like.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Like.java @@ -80,6 +80,6 @@ public class Like extends AbstractSegment implements Condition { @Override public String toString() { - return left.toString() + " LIKE " + right.toString(); + return left + " LIKE " + right; } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/OrderByField.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/OrderByField.java index 4552be9a..9017d4b1 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/OrderByField.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/OrderByField.java @@ -111,6 +111,6 @@ public class OrderByField extends AbstractSegment { @Override public String toString() { - return direction != null ? expression.toString() + " " + direction : expression.toString(); + return direction != null ? expression + " " + direction : expression.toString(); } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java index f6074b24..799fcbea 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java @@ -71,6 +71,6 @@ public class SimpleCondition extends AbstractSegment implements Condition { @Override public String toString() { - return expression.toString() + " " + comparator + " " + predicate; + return expression + " " + comparator + " " + predicate; } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Where.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Where.java index 1c1d93b3..de8cd50d 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Where.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Where.java @@ -34,6 +34,6 @@ public class Where extends AbstractSegment { @Override public String toString() { - return "WHERE " + condition.toString(); + return "WHERE " + condition; } }