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/08/26 15:55:52 UTC
[1/3] groovy git commit: Trivial refactoring: avoid redundant String
operation
Repository: groovy
Updated Branches:
refs/heads/master 688b3dc3b -> dabbb0c18
Trivial refactoring: avoid redundant String operation
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a1c35844
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a1c35844
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a1c35844
Branch: refs/heads/master
Commit: a1c35844cd96e5bfacb8116165213bbec9f6ec74
Parents: 688b3dc
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 23:47:11 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 23:48:31 2018 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/inspect/Inspector.java | 2 +-
src/main/groovy/groovy/util/logging/Commons.java | 2 +-
src/main/groovy/groovy/util/logging/Log4j.java | 2 +-
src/main/groovy/groovy/util/logging/Log4j2.java | 2 +-
src/main/groovy/groovy/util/logging/Slf4j.java | 2 +-
src/main/java/org/apache/groovy/util/SystemUtil.java | 2 +-
src/main/java/org/codehaus/groovy/control/SourceUnit.java | 2 +-
.../java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java | 2 +-
src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java | 2 +-
src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java | 2 +-
src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/groovy/groovy/inspect/Inspector.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/inspect/Inspector.java b/src/main/groovy/groovy/inspect/Inspector.java
index 6fff2a1..175920a 100644
--- a/src/main/groovy/groovy/inspect/Inspector.java
+++ b/src/main/groovy/groovy/inspect/Inspector.java
@@ -303,7 +303,7 @@ public class Inspector {
for (String s : metaMethod) {
out.print(s + " ");
}
- out.println("");
+ out.println();
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/groovy/groovy/util/logging/Commons.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/logging/Commons.java b/src/main/groovy/groovy/util/logging/Commons.java
index aa456d2..c833c00 100644
--- a/src/main/groovy/groovy/util/logging/Commons.java
+++ b/src/main/groovy/groovy/util/logging/Commons.java
@@ -95,7 +95,7 @@ public @interface Commons {
public Expression wrapLoggingMethodCall(Expression logVariable, String methodName, Expression originalExpression) {
MethodCallExpression condition = new MethodCallExpression(
logVariable,
- "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1, methodName.length()) + "Enabled",
+ "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1) + "Enabled",
ArgumentListExpression.EMPTY_ARGUMENTS);
condition.setImplicitThis(false);
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/groovy/groovy/util/logging/Log4j.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/logging/Log4j.java b/src/main/groovy/groovy/util/logging/Log4j.java
index 2dfdf7f..e976673 100644
--- a/src/main/groovy/groovy/util/logging/Log4j.java
+++ b/src/main/groovy/groovy/util/logging/Log4j.java
@@ -105,7 +105,7 @@ public @interface Log4j {
// log4j api is inconsistent, so trace requires special handling
condition = new MethodCallExpression(
logVariable,
- "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1, methodName.length()) + "Enabled",
+ "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1) + "Enabled",
ArgumentListExpression.EMPTY_ARGUMENTS);
}
condition.setImplicitThis(false);
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/groovy/groovy/util/logging/Log4j2.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/logging/Log4j2.java b/src/main/groovy/groovy/util/logging/Log4j2.java
index 7aca5a5..7dd1d72 100644
--- a/src/main/groovy/groovy/util/logging/Log4j2.java
+++ b/src/main/groovy/groovy/util/logging/Log4j2.java
@@ -92,7 +92,7 @@ public @interface Log4j2 {
public Expression wrapLoggingMethodCall(Expression logVariable, String methodName, Expression originalExpression) {
MethodCallExpression condition = new MethodCallExpression(
logVariable,
- "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1, methodName.length()) + "Enabled",
+ "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1) + "Enabled",
ArgumentListExpression.EMPTY_ARGUMENTS);
condition.setImplicitThis(false);
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/groovy/groovy/util/logging/Slf4j.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/logging/Slf4j.java b/src/main/groovy/groovy/util/logging/Slf4j.java
index 0e866e4..c5fb392 100644
--- a/src/main/groovy/groovy/util/logging/Slf4j.java
+++ b/src/main/groovy/groovy/util/logging/Slf4j.java
@@ -94,7 +94,7 @@ public @interface Slf4j {
public Expression wrapLoggingMethodCall(Expression logVariable, String methodName, Expression originalExpression) {
MethodCallExpression condition = new MethodCallExpression(
logVariable,
- "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1, methodName.length()) + "Enabled",
+ "is" + methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1) + "Enabled",
ArgumentListExpression.EMPTY_ARGUMENTS);
condition.setImplicitThis(false);
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/java/org/apache/groovy/util/SystemUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/groovy/util/SystemUtil.java b/src/main/java/org/apache/groovy/util/SystemUtil.java
index 66dc01e..5eb398e 100644
--- a/src/main/java/org/apache/groovy/util/SystemUtil.java
+++ b/src/main/java/org/apache/groovy/util/SystemUtil.java
@@ -38,7 +38,7 @@ public class SystemUtil {
value = Boolean.TRUE.toString();
} else {
name = nameValue.substring(0, i);
- value = nameValue.substring(i + 1, nameValue.length());
+ value = nameValue.substring(i + 1);
}
name = name.trim();
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/java/org/codehaus/groovy/control/SourceUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/SourceUnit.java b/src/main/java/org/codehaus/groovy/control/SourceUnit.java
index 8f3ce5e..291debf 100644
--- a/src/main/java/org/codehaus/groovy/control/SourceUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/SourceUnit.java
@@ -293,7 +293,7 @@ public class SourceUnit extends ProcessingUnit {
int start = column - 30 - 1;
int end = (column + 10 > text.length() ? text.length() : column + 10 - 1);
sample = " " + text.substring(start, end) + Utilities.eol() + " " +
- marker.substring(start, marker.length());
+ marker.substring(start);
} else {
sample = " " + text + Utilities.eol() + " " + marker;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
index 3c709d5..cd88448 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
@@ -530,7 +530,7 @@ public class ProxyGeneratorAdapter extends ClassVisitor implements Opcodes {
}
int index = name.lastIndexOf('.');
if (index == -1) return name + pxyCounter.incrementAndGet() + "_groovyProxy";
- return name.substring(index + 1, name.length()) + pxyCounter.incrementAndGet() + "_groovyProxy";
+ return name.substring(index + 1) + pxyCounter.incrementAndGet() + "_groovyProxy";
}
private static boolean isImplemented(Class clazz, String name, String desc) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
index 0105284..5bdcbe0 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
@@ -78,7 +78,7 @@ public class StringBufferWriter extends Writer {
* @param length Number of characters to write
*/
public void write(String text, int offset, int length) {
- buffer.append(text.substring(offset, offset + length));
+ buffer.append(text, offset, offset + length);
}
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index 35d9ab6..3f55c58 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -717,7 +717,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport {
// output differs from input; we write to our local buffer
if (sb == null) {
sb = new StringBuilder((int) (1.1 * len));
- sb.append(orig.substring(0, i));
+ sb.append(orig, 0, i);
}
sb.append(replacement);
} else if (sb != null) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a1c35844/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java b/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
index dcd1aa6..a95258c 100644
--- a/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
@@ -168,7 +168,7 @@ public class LoaderConfiguration {
requireProperty = propertyIndexStart == i2;
}
if (propertyIndexStart == -1) break;
- result.append(str.substring(propertyIndexEnd, propertyIndexStart));
+ result.append(str, propertyIndexEnd, propertyIndexStart);
propertyIndexEnd = str.indexOf("}", propertyIndexStart);
if (propertyIndexEnd == -1) break;
[3/3] groovy git commit: Trivial refactoring: 'continue' is
unnecessary as the last statement in a loop
Posted by su...@apache.org.
Trivial refactoring: 'continue' is unnecessary as the last statement in a loop
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/dabbb0c1
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/dabbb0c1
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/dabbb0c1
Branch: refs/heads/master
Commit: dabbb0c1886048f0fd8c8619a7a01a24b32ba4c2
Parents: 255b94d
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 23:55:14 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 23:55:14 2018 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/util/ConfigObject.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/dabbb0c1/src/main/groovy/groovy/util/ConfigObject.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/ConfigObject.java b/src/main/groovy/groovy/util/ConfigObject.java
index f17c36f..d584204 100644
--- a/src/main/groovy/groovy/util/ConfigObject.java
+++ b/src/main/groovy/groovy/util/ConfigObject.java
@@ -184,7 +184,6 @@ public class ConfigObject extends GroovyObjectSupport implements Writable, Map,
if (configEntry == null) {
config.put(key, value);
- continue;
} else {
if (configEntry instanceof Map && !((Map) configEntry).isEmpty() && value instanceof Map) {
// recur
[2/3] groovy git commit: Trivial refactoring: Move condition to loop
Posted by su...@apache.org.
Trivial refactoring: Move condition to loop
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/255b94d9
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/255b94d9
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/255b94d9
Branch: refs/heads/master
Commit: 255b94d9aed81e76c1270df5db871c5bd22586be
Parents: a1c3584
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 23:51:05 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 23:51:05 2018 +0800
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/255b94d9/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java b/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java
index b7fa503..4c7230e 100644
--- a/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java
@@ -110,10 +110,9 @@ public class OptimizerVisitor extends ClassCodeExpressionTransformer {
return;
}
String name;
- while (true) {
+ do {
name = "$const$" + index++;
- if (currentClass.getDeclaredField(name) == null) break;
- }
+ } while (currentClass.getDeclaredField(name) != null);
field = new FieldNode(name,
Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_FINAL,
constantExpression.getType(),