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/03 00:00:32 UTC
[1/2] groovy git commit: Unnecessary zero length array usage
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 91cb078f0 -> a6bb76fc8
Unnecessary zero length array usage
(cherry picked from commit c0b5ea2)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d60587a2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d60587a2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d60587a2
Branch: refs/heads/GROOVY_2_6_X
Commit: d60587a2024d9ab3a4508ea8ee9cd1623053d117
Parents: 91cb078
Author: sunlan <su...@apache.org>
Authored: Tue Apr 3 07:50:33 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Apr 3 08:00:06 2018 +0800
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/reflection/CachedClass.java | 2 +-
src/main/java/org/codehaus/groovy/tools/DgmConverter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/d60587a2/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
index c5f9c11..80bc040 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
@@ -151,7 +151,7 @@ public class CachedClass {
else
methods.add(cachedMethod);
}
- CachedMethod [] resMethods = methods.toArray(new CachedMethod[0]);
+ CachedMethod [] resMethods = methods.toArray(CachedMethod.EMPTY_ARRAY);
Arrays.sort(resMethods);
final CachedClass superClass = getCachedSuperClass();
http://git-wip-us.apache.org/repos/asf/groovy/blob/d60587a2/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/tools/DgmConverter.java b/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
index 98d5cf9..b8adfd3 100644
--- a/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
+++ b/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
@@ -50,7 +50,7 @@ public class DgmConverter implements Opcodes {
for (Class aClass : DefaultGroovyMethods.DGM_LIKE_CLASSES) {
Collections.addAll(cachedMethodsList, ReflectionCache.getCachedClass(aClass).getMethods());
}
- final CachedMethod[] cachedMethods = cachedMethodsList.toArray(new CachedMethod[0]);
+ final CachedMethod[] cachedMethods = cachedMethodsList.toArray(CachedMethod.EMPTY_ARRAY);
List<GeneratedMetaMethod.DgmMethodRecord> records = new ArrayList<GeneratedMetaMethod.DgmMethodRecord>();
[2/2] groovy git commit: Trivial refactoring: avoid calling `toArray`
with pre-sized array parameter
Posted by su...@apache.org.
Trivial refactoring: avoid calling `toArray` with pre-sized array parameter
(cherry picked from commit d524b2f)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a6bb76fc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a6bb76fc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a6bb76fc
Branch: refs/heads/GROOVY_2_6_X
Commit: a6bb76fc8208072d07c5bb00a8cea5d84f380a61
Parents: d60587a
Author: sunlan <su...@apache.org>
Authored: Tue Apr 3 07:57:23 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Apr 3 08:00:13 2018 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/lang/MetaMethod.java | 1 +
.../java/org/codehaus/groovy/reflection/CachedClass.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a6bb76fc/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 c58d6b7..10815ed 100644
--- a/src/main/groovy/groovy/lang/MetaMethod.java
+++ b/src/main/groovy/groovy/lang/MetaMethod.java
@@ -34,6 +34,7 @@ import java.lang.reflect.Modifier;
* @author Alex Tkachman
*/
public abstract class MetaMethod extends ParameterTypes implements Cloneable {
+ public static final MetaMethod[] EMPTY_ARRAY = new MetaMethod[0];
private String signature;
private String mopName;
http://git-wip-us.apache.org/repos/asf/groovy/blob/a6bb76fc/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
index 80bc040..9204be2 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
@@ -217,7 +217,7 @@ public class CachedClass {
}
};
- static final MetaMethod[] EMPTY = new MetaMethod[0];
+ static final MetaMethod[] EMPTY = MetaMethod.EMPTY_ARRAY;
int hashCode;
@@ -401,7 +401,7 @@ public class CachedClass {
addSubclassExpandos(arr, mc);
}
- return arr.toArray(new MetaMethod[arr.size()]);
+ return arr.toArray(MetaMethod.EMPTY_ARRAY);
}
private void addSubclassExpandos(List<MetaMethod> arr, MetaClass mc) {
@@ -453,7 +453,7 @@ public class CachedClass {
private void updateSetNewMopMethods(List<MetaMethod> arr) {
if (arr != null) {
- final MetaMethod[] metaMethods = arr.toArray(new MetaMethod[arr.size()]);
+ final MetaMethod[] metaMethods = arr.toArray(MetaMethod.EMPTY_ARRAY);
classInfo.dgmMetaMethods = metaMethods;
classInfo.newMetaMethods = metaMethods;
}
@@ -501,7 +501,7 @@ public class CachedClass {
List<MetaMethod> res = new ArrayList<MetaMethod>();
res.addAll(Arrays.asList(classInfo.newMetaMethods));
res.addAll(arr);
- classInfo.newMetaMethods = res.toArray(new MetaMethod[res.size()]);
+ classInfo.newMetaMethods = res.toArray(MetaMethod.EMPTY_ARRAY);
Class theClass = classInfo.getCachedClass().getTheClass();
if (theClass==Closure.class || theClass==Class.class) {
ClosureMetaClass.resetCachedMetaClasses();