You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/04/19 08:39:54 UTC
[3/4] groovy git commit: Trivial refactoring: 'StringBuilder' can be
replaced with 'String'
Trivial refactoring: 'StringBuilder' can be replaced with 'String'
(cherry picked from commit 065a1ed)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a35c7cc8
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a35c7cc8
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a35c7cc8
Branch: refs/heads/GROOVY_2_6_X
Commit: a35c7cc817f4cad6fc2ab39ae1746092b49fea95
Parents: 510699a
Author: sunlan <su...@apache.org>
Authored: Thu Apr 19 16:13:38 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Apr 19 16:37:10 2018 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/lang/MetaMethod.java | 4 ++--
src/main/groovy/groovy/util/ObjectGraphBuilder.java | 8 ++++----
.../groovy/classgen/asm/indy/InvokeDynamicWriter.java | 11 +++++------
.../codehaus/groovy/reflection/ReflectionCache.java | 2 +-
.../codehaus/groovy/runtime/m12n/ExtensionModule.java | 9 ++++-----
.../codehaus/groovy/tools/javac/JavaStubGenerator.java | 8 +++-----
.../org/codehaus/groovy/transform/stc/Receiver.java | 11 +++++------
.../groovy/transform/stc/TypeCheckingContext.java | 11 +++++------
.../src/main/java/groovy/servlet/TemplateServlet.java | 13 ++++++-------
9 files changed, 35 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/groovy/groovy/lang/MetaMethod.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/MetaMethod.java b/src/main/groovy/groovy/lang/MetaMethod.java
index 10815ed..fcc001d 100644
--- a/src/main/groovy/groovy/lang/MetaMethod.java
+++ b/src/main/groovy/groovy/lang/MetaMethod.java
@@ -281,9 +281,9 @@ public abstract class MetaMethod extends ParameterTypes implements Cloneable {
String name = getName();
CachedClass declaringClass = getDeclaringClass();
if (Modifier.isPrivate(getModifiers()))
- mopName = new StringBuilder("this$").append(declaringClass.getSuperClassDistance()).append("$").append(name).toString();
+ mopName = "this$" + declaringClass.getSuperClassDistance() + "$" + name;
else
- mopName = new StringBuilder("super$").append(declaringClass.getSuperClassDistance()).append("$").append(name).toString();
+ mopName = "super$" + declaringClass.getSuperClassDistance() + "$" + name;
}
return mopName;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/groovy/groovy/util/ObjectGraphBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/ObjectGraphBuilder.java b/src/main/groovy/groovy/util/ObjectGraphBuilder.java
index ce031c7..6dc1660 100644
--- a/src/main/groovy/groovy/util/ObjectGraphBuilder.java
+++ b/src/main/groovy/groovy/util/ObjectGraphBuilder.java
@@ -850,10 +850,10 @@ public class ObjectGraphBuilder extends FactoryBuilderSupport {
}
public String toString() {
- return new StringBuilder().append("[parentName=").append(parentName)
- .append(", childName=").append(childName)
- .append(", refId=").append(refId)
- .append("]").toString();
+ return "[parentName=" + parentName +
+ ", childName=" + childName +
+ ", refId=" + refId +
+ "]";
}
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
index 4e677d9..1e53ec1 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
@@ -214,15 +214,14 @@ public class InvokeDynamicWriter extends InvocationWriter {
}
private void writeIndyCast(ClassNode sourceType, ClassNode targetType) {
- StringBuilder sig = new StringBuilder();
- sig.append('(');
- sig.append(getTypeDescription(sourceType));
- sig.append(')');
- sig.append(getTypeDescription(targetType));
+ String sig = "(" +
+ getTypeDescription(sourceType) +
+ ')' +
+ getTypeDescription(targetType);
controller.getMethodVisitor().visitInvokeDynamicInsn(
//TODO: maybe use a different bootstrap method since no arguments are needed here
- CAST.getCallSiteName(), sig.toString(), BSM, "()", 0);
+ CAST.getCallSiteName(), sig, BSM, "()", 0);
controller.getOperandStack().replace(targetType);
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java b/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
index efedc95..1ae2f27 100644
--- a/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
+++ b/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
@@ -31,7 +31,7 @@ public class ReflectionCache {
public static String getMOPMethodName(CachedClass declaringClass, String name, boolean useThis) {
TripleKeyHashMap.Entry mopNameEntry = mopNames.getOrPut(declaringClass, name, Boolean.valueOf(useThis));
if (mopNameEntry.value == null) {
- mopNameEntry.value = new StringBuilder().append(useThis ? "this$" : "super$").append(declaringClass.getSuperClassDistance()).append("$").append(name).toString();
+ mopNameEntry.value = (useThis ? "this$" : "super$") + declaringClass.getSuperClassDistance() + "$" + name;
}
return (String) mopNameEntry.value;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
index 3d14aa4..0c30a3b 100644
--- a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
+++ b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
@@ -52,10 +52,9 @@ public abstract class ExtensionModule {
@Override
public String toString() {
- final StringBuilder sb = new StringBuilder("ExtensionModule{");
- sb.append("name='").append(name).append('\'');
- sb.append(", version='").append(version).append('\'');
- sb.append('}');
- return sb.toString();
+ String sb = "ExtensionModule{" + "name='" + name + '\'' +
+ ", version='" + version + '\'' +
+ '}';
+ return sb;
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java b/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
index 56f6fbc..0add1d3 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
@@ -953,11 +953,9 @@ public class JavaStubGenerator {
}
for (String imp : imports) {
- String s = new StringBuilder()
- .append("import ")
- .append(imp)
- .append((imp.charAt(imp.length() - 1) == '.') ? "*;" : ";")
- .toString()
+ String s = ("import " +
+ imp +
+ ((imp.charAt(imp.length() - 1) == '.') ? "*;" : ";"))
.replace('$', '.');
out.println(s);
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/java/org/codehaus/groovy/transform/stc/Receiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/Receiver.java b/src/main/java/org/codehaus/groovy/transform/stc/Receiver.java
index 49b09d6..ad934ee 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/Receiver.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/Receiver.java
@@ -49,11 +49,10 @@ public class Receiver<T> {
@Override
public String toString() {
- final StringBuilder sb = new StringBuilder();
- sb.append("Receiver");
- sb.append("{type=").append(type);
- sb.append(", data=").append(data);
- sb.append('}');
- return sb.toString();
+ String sb = "Receiver" +
+ "{type=" + type +
+ ", data=" + data +
+ '}';
+ return sb;
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java b/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
index 4d0b097..057403f 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
@@ -372,12 +372,11 @@ public class TypeCheckingContext {
@Override
public String toString() {
- final StringBuilder sb = new StringBuilder();
- sb.append("EnclosingClosure");
- sb.append("{closureExpression=").append(closureExpression.getText());
- sb.append(", returnTypes=").append(returnTypes);
- sb.append('}');
- return sb.toString();
+ String sb = "EnclosingClosure" +
+ "{closureExpression=" + closureExpression.getText() +
+ ", returnTypes=" + returnTypes +
+ '}';
+ return sb;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy/blob/a35c7cc8/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
index 3f640de..d64378e 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
@@ -483,13 +483,12 @@ public class TemplateServlet extends AbstractHttpServlet {
makeMillis = System.currentTimeMillis() - makeMillis;
if (generateBy) {
- StringBuilder sb = new StringBuilder(100);
- sb.append("\n<!-- Generated by Groovy TemplateServlet [create/get=");
- sb.append(Long.toString(getMillis));
- sb.append(" ms, make=");
- sb.append(Long.toString(makeMillis));
- sb.append(" ms] -->\n");
- out.write(sb.toString());
+ String sb = "\n<!-- Generated by Groovy TemplateServlet [create/get=" +
+ Long.toString(getMillis) +
+ " ms, make=" +
+ Long.toString(makeMillis) +
+ " ms] -->\n";
+ out.write(sb);
}
//