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/04 10:41:56 UTC
[1/2] groovy git commit: Trivial refactoring
Repository: groovy
Updated Branches:
refs/heads/master b41657822 -> 36e0e1644
Trivial refactoring
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/44034867
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/44034867
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/44034867
Branch: refs/heads/master
Commit: 44034867dbc3364a327410a9d562afe9d53cc8c3
Parents: b416578
Author: sunlan <su...@apache.org>
Authored: Mon Dec 4 17:10:13 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Mon Dec 4 17:10:13 2017 +0800
----------------------------------------------------------------------
src/main/org/codehaus/groovy/runtime/InvokerHelper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/44034867/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/InvokerHelper.java b/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
index 0e3b380..890abf2 100644
--- a/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
+++ b/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
@@ -398,8 +398,9 @@ public class InvokerHelper {
while (i < values.length - 1) {
if ((values[i] instanceof SpreadMap) && (values[i + 1] instanceof Map)) {
Map smap = (Map) values[i + 1];
- for (Object key : smap.keySet()) {
- answer.put(key, smap.get(key));
+ for (Object e : smap.entrySet()) {
+ Map.Entry entry = (Map.Entry) e;
+ answer.put(entry.getKey(), entry.getValue());
}
i += 2;
} else {
[2/2] groovy git commit: Add serialVersionUID
Posted by su...@apache.org.
Add serialVersionUID
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/36e0e164
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/36e0e164
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/36e0e164
Branch: refs/heads/master
Commit: 36e0e16446114f957056a56cc79b0361b8194f6e
Parents: 4403486
Author: sunlan <su...@apache.org>
Authored: Mon Dec 4 18:41:50 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Mon Dec 4 18:41:50 2017 +0800
----------------------------------------------------------------------
src/main/groovy/inspect/Inspector.java | 2 ++
src/main/groovy/lang/Reference.java | 1 +
src/main/groovy/util/ClosureComparator.java | 1 +
src/main/groovy/xml/QName.java | 1 +
src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java | 1 +
.../codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java | 1 +
src/main/org/codehaus/groovy/util/LockableObject.java | 1 +
7 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/36e0e164/src/main/groovy/inspect/Inspector.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/inspect/Inspector.java b/src/main/groovy/inspect/Inspector.java
index c33f5c6..f0c94a7 100644
--- a/src/main/groovy/inspect/Inspector.java
+++ b/src/main/groovy/inspect/Inspector.java
@@ -326,6 +326,8 @@ public class Inspector {
}
public static class MemberComparator implements Comparator<Object>, Serializable {
+ private static final long serialVersionUID = -7691851726606749541L;
+
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/36e0e164/src/main/groovy/lang/Reference.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/Reference.java b/src/main/groovy/lang/Reference.java
index 37f125d..c4bf21d 100644
--- a/src/main/groovy/lang/Reference.java
+++ b/src/main/groovy/lang/Reference.java
@@ -29,6 +29,7 @@ import java.io.Serializable;
*/
public class Reference<T> extends GroovyObjectSupport implements Serializable {
+ private static final long serialVersionUID = 4963704631487573488L;
private T value;
public Reference() {
http://git-wip-us.apache.org/repos/asf/groovy/blob/36e0e164/src/main/groovy/util/ClosureComparator.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/util/ClosureComparator.java b/src/main/groovy/util/ClosureComparator.java
index b068e0b..dc70ea6 100644
--- a/src/main/groovy/util/ClosureComparator.java
+++ b/src/main/groovy/util/ClosureComparator.java
@@ -31,6 +31,7 @@ import java.util.Comparator;
*/
public class ClosureComparator<T> implements Comparator<T>, Serializable {
+ private static final long serialVersionUID = -4593521535656429522L;
Closure closure;
public ClosureComparator(Closure closure) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/36e0e164/src/main/groovy/xml/QName.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/xml/QName.java b/src/main/groovy/xml/QName.java
index 249f68f..06a733d 100644
--- a/src/main/groovy/xml/QName.java
+++ b/src/main/groovy/xml/QName.java
@@ -30,6 +30,7 @@ import java.io.Serializable;
* namespaceURI is a URI reference identifying the namespace.
*/
public class QName implements Serializable {
+ private static final long serialVersionUID = -9029109610006696081L;
/** comment/shared empty string */
private static final String EMPTY_STRING = "";
http://git-wip-us.apache.org/repos/asf/groovy/blob/36e0e164/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java b/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
index 1823ce9..3f830fd 100644
--- a/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
+++ b/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
@@ -109,6 +109,7 @@ public abstract class GeneratedMetaMethod extends MetaMethod {
}
public static class DgmMethodRecord implements Serializable {
+ private static final long serialVersionUID = -5639988016452884450L;
public String className;
public String methodName;
public Class returnType;
http://git-wip-us.apache.org/repos/asf/groovy/blob/36e0e164/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
index 14aaa5f..68fe42d 100644
--- a/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
+++ b/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
@@ -139,6 +139,7 @@ import java.util.Set;
public class ConcurrentReaderHashMap
extends AbstractMap
implements Cloneable, Serializable {
+ private static final long serialVersionUID = -3225682440765612861L;
/*
http://git-wip-us.apache.org/repos/asf/groovy/blob/36e0e164/src/main/org/codehaus/groovy/util/LockableObject.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/util/LockableObject.java b/src/main/org/codehaus/groovy/util/LockableObject.java
index 5ba3a48..d107767 100644
--- a/src/main/org/codehaus/groovy/util/LockableObject.java
+++ b/src/main/org/codehaus/groovy/util/LockableObject.java
@@ -24,6 +24,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer;
* A bit simplified lock designed to be inherited by.
*/
public class LockableObject extends AbstractQueuedSynchronizer {
+ private static final long serialVersionUID = 2284470475073785118L;
transient Thread owner;
protected final boolean isHeldExclusively() {