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 2017/12/02 09:38:31 UTC
[1/2] groovy git commit: Minor refactoring
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X f2defdbcf -> bbf09ddc2
Minor refactoring
(cherry picked from commit 4aa686d)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a63b9d20
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a63b9d20
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a63b9d20
Branch: refs/heads/GROOVY_2_6_X
Commit: a63b9d20ec295a4adf713f524b672cfccb606ce7
Parents: f2defdb
Author: sunlan <su...@apache.org>
Authored: Sat Dec 2 16:55:56 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Dec 2 17:38:15 2017 +0800
----------------------------------------------------------------------
src/main/groovy/inspect/Inspector.java | 3 ++-
src/main/groovy/lang/MetaClassImpl.java | 3 +--
src/main/groovy/transform/builder/DefaultStrategy.java | 2 +-
src/main/groovy/ui/GroovySocketServer.java | 2 +-
src/main/groovy/util/ClosureComparator.java | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a63b9d20/src/main/groovy/inspect/Inspector.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/inspect/Inspector.java b/src/main/groovy/inspect/Inspector.java
index b93aa69..c33f5c6 100644
--- a/src/main/groovy/inspect/Inspector.java
+++ b/src/main/groovy/inspect/Inspector.java
@@ -27,6 +27,7 @@ import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.InvokerHelper;
import java.io.PrintStream;
+import java.io.Serializable;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -324,7 +325,7 @@ public class Inspector {
return memberInfo;
}
- public static class MemberComparator implements Comparator<Object> {
+ public static class MemberComparator implements Comparator<Object>, Serializable {
public int compare(Object a, Object b) {
String[] aStr = (String[]) a;
String[] bStr = (String[]) b;
http://git-wip-us.apache.org/repos/asf/groovy/blob/a63b9d20/src/main/groovy/lang/MetaClassImpl.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/MetaClassImpl.java b/src/main/groovy/lang/MetaClassImpl.java
index a604fd5..c453a3f 100644
--- a/src/main/groovy/lang/MetaClassImpl.java
+++ b/src/main/groovy/lang/MetaClassImpl.java
@@ -2006,8 +2006,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
// if it is not static and we do no static access
if (genericGetMethod != null && !(!genericGetMethod.isStatic() && isStatic)) {
method = genericGetMethod;
- if (method != null)
- return new GetMethodMetaProperty(name, method);
+ return new GetMethodMetaProperty(name, method);
}
//----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a63b9d20/src/main/groovy/transform/builder/DefaultStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/transform/builder/DefaultStrategy.java b/src/main/groovy/transform/builder/DefaultStrategy.java
index c1f1ca6..65d90e3 100644
--- a/src/main/groovy/transform/builder/DefaultStrategy.java
+++ b/src/main/groovy/transform/builder/DefaultStrategy.java
@@ -196,7 +196,7 @@ public class DefaultStrategy extends BuilderASTTransformation.AbstractBuilderStr
if (includes.size() == 1 && Undefined.isUndefined(includes.get(0))) includes = null;
ClassNode builder = createBuilder(anno, buildee);
createBuilderFactoryMethod(anno, buildee, builder);
- List<FieldNode> fields = getFields(transform, anno, buildee);
+// List<FieldNode> fields = getFields(transform, anno, buildee);
boolean allNames = transform.memberHasValue(anno, "allNames", true);
boolean allProperties = !transform.memberHasValue(anno, "allProperties", false);
List<PropertyInfo> props = getPropertyInfos(transform, anno, buildee, excludes, includes, allNames, allProperties);
http://git-wip-us.apache.org/repos/asf/groovy/blob/a63b9d20/src/main/groovy/ui/GroovySocketServer.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/ui/GroovySocketServer.java b/src/main/groovy/ui/GroovySocketServer.java
index e5460da..b0d27c5 100644
--- a/src/main/groovy/ui/GroovySocketServer.java
+++ b/src/main/groovy/ui/GroovySocketServer.java
@@ -170,7 +170,7 @@ public class GroovySocketServer implements Runnable {
}
}
- class GroovyClientConnection implements Runnable {
+ static class GroovyClientConnection implements Runnable {
private Script script;
private Socket socket;
private BufferedReader reader;
http://git-wip-us.apache.org/repos/asf/groovy/blob/a63b9d20/src/main/groovy/util/ClosureComparator.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/util/ClosureComparator.java b/src/main/groovy/util/ClosureComparator.java
index 24d03f3..269773c 100644
--- a/src/main/groovy/util/ClosureComparator.java
+++ b/src/main/groovy/util/ClosureComparator.java
@@ -21,6 +21,7 @@ package groovy.util;
import groovy.lang.Closure;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import java.io.Serializable;
import java.util.Comparator;
/**
@@ -28,7 +29,7 @@ import java.util.Comparator;
*
* @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
-public class ClosureComparator<T> implements Comparator<T> {
+public class ClosureComparator<T> implements Comparator<T>, Serializable {
Closure closure;
[2/2] groovy git commit: Trivial refactoring
Posted by su...@apache.org.
Trivial refactoring
(cherry picked from commit fc5a56f)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/bbf09ddc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/bbf09ddc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/bbf09ddc
Branch: refs/heads/GROOVY_2_6_X
Commit: bbf09ddc217c47b2afbb90d6ad1beb3bfc49f60b
Parents: a63b9d2
Author: sunlan <su...@apache.org>
Authored: Sat Dec 2 17:36:29 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Dec 2 17:38:22 2017 +0800
----------------------------------------------------------------------
src/main/groovy/util/ClosureComparator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/bbf09ddc/src/main/groovy/util/ClosureComparator.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/util/ClosureComparator.java b/src/main/groovy/util/ClosureComparator.java
index 269773c..b068e0b 100644
--- a/src/main/groovy/util/ClosureComparator.java
+++ b/src/main/groovy/util/ClosureComparator.java
@@ -38,7 +38,7 @@ public class ClosureComparator<T> implements Comparator<T>, Serializable {
}
public int compare(T object1, T object2) {
- Object value = closure.call(new Object[] {object1, object2});
+ Object value = closure.call(object1, object2);
return DefaultTypeTransformation.intUnbox(value);
}
}