[2/5] groovy git commit: Trivial refactoring: avoid redundant array creation

2018-02-19 Thread sunlan 
Trivial refactoring: avoid redundant array creation

(cherry picked from commit 87ff616)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/87d84ac8
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/87d84ac8
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/87d84ac8

Branch: refs/heads/GROOVY_2_5_X
Commit: 87d84ac88627151cb141677ad202ae3660ecbcc5
Parents: 2b507b2
Author: danielsun1106 
Authored: Tue Feb 20 03:06:25 2018 +0800
Committer: danielsun1106 
Committed: Tue Feb 20 03:43:29 2018 +0800

--
 .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java| 8 
 .../org/codehaus/groovy/runtime/SocketGroovyMethods.java | 4 ++--
 .../groovy/runtime/metaclass/MetaClassRegistryImpl.java  | 2 +-
 src/main/java/org/codehaus/groovy/tools/GroovyStarter.java   | 2 +-
 .../org/codehaus/groovy/tools/javac/JavacJavaCompiler.java   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/87d84ac8/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git 
a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 6ce432c..ef517b4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -5852,7 +5852,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 // internal helper method
 protected static  T 
callClosureForMapEntry(@ClosureParams(value=FromString.class, 
options={"K,V","Map.Entry"}) Closure closure, Map.Entry entry) {
 if (closure.getMaximumNumberOfParameters() == 2) {
-return closure.call(new Object[]{entry.getKey(), 
entry.getValue()});
+return closure.call(entry.getKey(), entry.getValue());
 }
 return closure.call(entry);
 }
@@ -5860,7 +5860,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 // internal helper method
 protected static  T 
callClosureForLine(@ClosureParams(value=FromString.class, 
options={"String","String,Integer"}) Closure closure, String line, int 
counter) {
 if (closure.getMaximumNumberOfParameters() == 2) {
-return closure.call(new Object[]{line, counter});
+return closure.call(line, counter);
 }
 return closure.call(line);
 }
@@ -5868,10 +5868,10 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 // internal helper method
 protected static  T 
callClosureForMapEntryAndCounter(@ClosureParams(value=FromString.class, 
options={"K,V,Integer", "K,V","Map.Entry"}) Closure closure, 
Map.Entry entry, int counter) {
 if (closure.getMaximumNumberOfParameters() == 3) {
-return closure.call(new Object[]{entry.getKey(), entry.getValue(), 
counter});
+return closure.call(entry.getKey(), entry.getValue(), counter);
 }
 if (closure.getMaximumNumberOfParameters() == 2) {
-return closure.call(new Object[]{entry, counter});
+return closure.call(entry, counter);
 }
 return closure.call(entry);
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/87d84ac8/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
--
diff --git a/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
index 6582485..ded99e5 100644
--- a/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
@@ -62,7 +62,7 @@ public class SocketGroovyMethods extends 
DefaultGroovyMethodsSupport {
 InputStream input = socket.getInputStream();
 OutputStream output = socket.getOutputStream();
 try {
-T result = closure.call(new Object[]{input, output});
+T result = closure.call(input, output);
 
 InputStream temp1 = input;
 input = null;
@@ -95,7 +95,7 @@ public class SocketGroovyMethods extends 
DefaultGroovyMethodsSupport {
 ObjectOutputStream oos = new ObjectOutputStream(output);
 ObjectInputStream ois = new ObjectInputStream(input);
 try {
-T result = closure.call(new Object[]{ois, oos});
+T result = closure.call(ois, oos);
 
 InputStream temp1 = ois;
 ois = null;

http://git-wip-us.apache.org/repos/asf/groovy/blob/87d84ac8/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.jav

[2/5] groovy git commit: Trivial refactoring: avoid redundant array creation

2018-02-19 Thread sunlan 
Trivial refactoring: avoid redundant array creation

(cherry picked from commit 87ff616)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c3f34f6d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c3f34f6d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c3f34f6d

Branch: refs/heads/GROOVY_2_6_X
Commit: c3f34f6d1773388d137c22947028c6850a01d11e
Parents: d46ba2d
Author: danielsun1106 
Authored: Tue Feb 20 03:06:25 2018 +0800
Committer: danielsun1106 
Committed: Tue Feb 20 03:42:21 2018 +0800

--
 .../org/codehaus/groovy/runtime/DefaultGroovyMethods.java| 8 
 .../org/codehaus/groovy/runtime/SocketGroovyMethods.java | 4 ++--
 .../groovy/runtime/metaclass/MetaClassRegistryImpl.java  | 2 +-
 src/main/java/org/codehaus/groovy/tools/GroovyStarter.java   | 2 +-
 .../org/codehaus/groovy/tools/javac/JavacJavaCompiler.java   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/c3f34f6d/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git 
a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index e5025df..8b591f7 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -5854,7 +5854,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 // internal helper method
 protected static  T 
callClosureForMapEntry(@ClosureParams(value=FromString.class, 
options={"K,V","Map.Entry"}) Closure closure, Map.Entry entry) {
 if (closure.getMaximumNumberOfParameters() == 2) {
-return closure.call(new Object[]{entry.getKey(), 
entry.getValue()});
+return closure.call(entry.getKey(), entry.getValue());
 }
 return closure.call(entry);
 }
@@ -5862,7 +5862,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 // internal helper method
 protected static  T 
callClosureForLine(@ClosureParams(value=FromString.class, 
options={"String","String,Integer"}) Closure closure, String line, int 
counter) {
 if (closure.getMaximumNumberOfParameters() == 2) {
-return closure.call(new Object[]{line, counter});
+return closure.call(line, counter);
 }
 return closure.call(line);
 }
@@ -5870,10 +5870,10 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 // internal helper method
 protected static  T 
callClosureForMapEntryAndCounter(@ClosureParams(value=FromString.class, 
options={"K,V,Integer", "K,V","Map.Entry"}) Closure closure, 
Map.Entry entry, int counter) {
 if (closure.getMaximumNumberOfParameters() == 3) {
-return closure.call(new Object[]{entry.getKey(), entry.getValue(), 
counter});
+return closure.call(entry.getKey(), entry.getValue(), counter);
 }
 if (closure.getMaximumNumberOfParameters() == 2) {
-return closure.call(new Object[]{entry, counter});
+return closure.call(entry, counter);
 }
 return closure.call(entry);
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/c3f34f6d/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
--
diff --git a/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
index 6582485..ded99e5 100644
--- a/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/SocketGroovyMethods.java
@@ -62,7 +62,7 @@ public class SocketGroovyMethods extends 
DefaultGroovyMethodsSupport {
 InputStream input = socket.getInputStream();
 OutputStream output = socket.getOutputStream();
 try {
-T result = closure.call(new Object[]{input, output});
+T result = closure.call(input, output);
 
 InputStream temp1 = input;
 input = null;
@@ -95,7 +95,7 @@ public class SocketGroovyMethods extends 
DefaultGroovyMethodsSupport {
 ObjectOutputStream oos = new ObjectOutputStream(output);
 ObjectInputStream ois = new ObjectInputStream(input);
 try {
-T result = closure.call(new Object[]{ois, oos});
+T result = closure.call(ois, oos);
 
 InputStream temp1 = ois;
 ois = null;

http://git-wip-us.apache.org/repos/asf/groovy/blob/c3f34f6d/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.jav