This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ea4e8af42a5863bf808b70f5998bc340388d53e4 Author: Daniel Sun <[email protected]> AuthorDate: Sat Mar 29 18:51:24 2025 +0900 Trivial refactoring: eliminate concatenation with empty string (cherry picked from commit 0b0672a30a8285e7be3a8fe66d5f122cabb18da3) --- src/main/java/groovy/lang/IntRange.java | 4 ++-- src/main/java/groovy/lang/NumberRange.java | 2 +- src/main/java/groovy/lang/ObjectRange.java | 4 ++-- src/main/java/groovy/util/MapEntry.java | 2 +- src/main/java/org/codehaus/groovy/control/GenericsVisitor.java | 2 +- .../java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/groovy/lang/IntRange.java b/src/main/java/groovy/lang/IntRange.java index b7fffea023..189786419b 100644 --- a/src/main/java/groovy/lang/IntRange.java +++ b/src/main/java/groovy/lang/IntRange.java @@ -414,9 +414,9 @@ public class IntRange extends AbstractList<Integer> implements Range<Integer>, S @Override public String toString() { if (inclusiveRight == null && inclusiveLeft == null) { - return reverse ? "" + to + ".." + from : "" + from + ".." + to; + return reverse ? to + ".." + from : from + ".." + to; } - return "" + from + (inclusiveLeft ? "" : "<") + ".." + (inclusiveRight ? "" : "<") + to; + return from + (inclusiveLeft ? "" : "<") + ".." + (inclusiveRight ? "" : "<") + to; } @Override diff --git a/src/main/java/groovy/lang/NumberRange.java b/src/main/java/groovy/lang/NumberRange.java index 8335023b9c..828c2974bf 100644 --- a/src/main/java/groovy/lang/NumberRange.java +++ b/src/main/java/groovy/lang/NumberRange.java @@ -554,7 +554,7 @@ public class NumberRange extends AbstractList<Comparable> implements Range<Compa private String getToString(String toText, String fromText) { String sepLeft = inclusiveLeft ? ".." : "<.."; String sep = inclusiveRight ? sepLeft : sepLeft + "<"; - String base = reverse ? "" + toText + sep + fromText : "" + fromText + sep + toText; + String base = reverse ? toText + sep + fromText : fromText + sep + toText; return Integer.valueOf(1).equals(stepSize) ? base : base + ".by(" + stepSize + ")"; } diff --git a/src/main/java/groovy/lang/ObjectRange.java b/src/main/java/groovy/lang/ObjectRange.java index 5ce35095f6..f6ec04d694 100644 --- a/src/main/java/groovy/lang/ObjectRange.java +++ b/src/main/java/groovy/lang/ObjectRange.java @@ -368,14 +368,14 @@ public class ObjectRange extends AbstractList<Comparable> implements Range<Compa @Override public String toString() { - return reverse ? "" + to + ".." + from : "" + from + ".." + to; + return reverse ? to + ".." + from : from + ".." + to; } @Override public String inspect() { final String toText = FormatHelper.inspect(to); final String fromText = FormatHelper.inspect(from); - return reverse ? "" + toText + ".." + fromText : "" + fromText + ".." + toText; + return reverse ? toText + ".." + fromText : fromText + ".." + toText; } /** diff --git a/src/main/java/groovy/util/MapEntry.java b/src/main/java/groovy/util/MapEntry.java index 995e2a8196..210980bfb7 100644 --- a/src/main/java/groovy/util/MapEntry.java +++ b/src/main/java/groovy/util/MapEntry.java @@ -54,7 +54,7 @@ public class MapEntry implements Map.Entry { @Override public String toString() { - return "" + key + ":" + value; + return key + ":" + value; } @Override diff --git a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java index d71f064779..ed508ff2c1 100644 --- a/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java +++ b/src/main/java/org/codehaus/groovy/control/GenericsVisitor.java @@ -217,6 +217,6 @@ public class GenericsVisitor extends ClassCodeVisitorSupport { } private static String plural(final String string, final int count) { - return "" + count + " " + (count == 1 ? string : string + "s"); + return count + " " + (count == 1 ? string : string + "s"); } } diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java index f519b3e87d..ea67d026f0 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java @@ -63,7 +63,7 @@ public class SimpleGroovyDoc implements GroovyDoc/*, GroovyTokenTypes*/ { @Override public String toString() { - return "" + getClass() + "(" + name + ")"; + return getClass() + "(" + name + ")"; } protected void setCommentText(String commentText) {
