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/26 01:17:12 UTC
[1/3] groovy git commit: Use static `valueOf` instead
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 319deda42 -> 0e507c9d3
Use static `valueOf` instead
(cherry picked from commit a32df10)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c5256e83
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c5256e83
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c5256e83
Branch: refs/heads/GROOVY_2_6_X
Commit: c5256e83347b94f7beb7757558e659e9cdbc7bfe
Parents: 319deda
Author: sunlan <su...@apache.org>
Authored: Tue Dec 26 08:01:59 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Dec 26 09:16:57 2017 +0800
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/syntax/Numbers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c5256e83/src/main/java/org/codehaus/groovy/syntax/Numbers.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/syntax/Numbers.java b/src/main/java/org/codehaus/groovy/syntax/Numbers.java
index e7a2386..a978701 100644
--- a/src/main/java/org/codehaus/groovy/syntax/Numbers.java
+++ b/src/main/java/org/codehaus/groovy/syntax/Numbers.java
@@ -250,7 +250,7 @@ public class Numbers
}
else if( value.compareTo(MAX_LONG) <= 0 && value.compareTo(MIN_LONG) >= 0 )
{
- return new Long(value.longValue());
+ return Long.valueOf(value.longValue());
}
return value;
}
[3/3] groovy git commit: Avoid using the equals and hashCode methods
of URL
Posted by su...@apache.org.
Avoid using the equals and hashCode methods of URL
Because the equals and hashCode methods of URL are blocking
(cherry picked from commit 6781fc5)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0e507c9d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0e507c9d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0e507c9d
Branch: refs/heads/GROOVY_2_6_X
Commit: 0e507c9d3f3d40bd58204c19c08c2c383aba5963
Parents: e6bccaf
Author: sunlan <su...@apache.org>
Authored: Tue Dec 26 08:30:53 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Dec 26 09:17:06 2017 +0800
----------------------------------------------------------------------
.../transform/ASTTransformationVisitor.java | 24 +++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/0e507c9d/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
index 2fbf6cd..77bc3cc 100644
--- a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
@@ -38,6 +38,7 @@ import org.codehaus.groovy.control.messages.WarningMessage;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -230,23 +231,30 @@ public final class ASTTransformationVisitor extends ClassCodeVisitorSupport {
continue;
}
Set<String> disabledGlobalTransforms = compilationUnit.getConfiguration().getDisabledGlobalASTTransformations();
- if (disabledGlobalTransforms==null) disabledGlobalTransforms=Collections.emptySet();
+ if (disabledGlobalTransforms == null) disabledGlobalTransforms = Collections.emptySet();
while (className != null) {
if (!className.startsWith("#") && className.length() > 0) {
if (!disabledGlobalTransforms.contains(className)) {
if (transformNames.containsKey(className)) {
- if (!service.equals(transformNames.get(className))) {
+ try {
+ if (!service.toURI().equals(transformNames.get(className).toURI())) {
+ compilationUnit.getErrorCollector().addWarning(
+ WarningMessage.POSSIBLE_ERRORS,
+ "The global transform for class " + className + " is defined in both "
+ + transformNames.get(className).toExternalForm()
+ + " and "
+ + service.toExternalForm()
+ + " - the former definition will be used and the latter ignored.",
+ null,
+ null);
+ }
+ } catch (URISyntaxException e) {
compilationUnit.getErrorCollector().addWarning(
WarningMessage.POSSIBLE_ERRORS,
- "The global transform for class " + className + " is defined in both "
- + transformNames.get(className).toExternalForm()
- + " and "
- + service.toExternalForm()
- + " - the former definition will be used and the latter ignored.",
+ "Failed to parse URL as URI because of exception " + e.toString(),
null,
null);
}
-
} else {
transformNames.put(className, service);
}
[2/3] groovy git commit: Use entrySet to iterate map entries
Posted by su...@apache.org.
Use entrySet to iterate map entries
(cherry picked from commit 12997ac)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e6bccafb
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e6bccafb
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e6bccafb
Branch: refs/heads/GROOVY_2_6_X
Commit: e6bccafbcbca6ec73eb24bdfa2d85f0b0c329c2a
Parents: c5256e8
Author: sunlan <su...@apache.org>
Authored: Tue Dec 26 08:09:08 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Dec 26 09:17:01 2017 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/lang/SpreadMap.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6bccafb/src/main/groovy/groovy/lang/SpreadMap.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/SpreadMap.java b/src/main/groovy/groovy/lang/SpreadMap.java
index 7ba9e4f..0fc6542 100644
--- a/src/main/groovy/groovy/lang/SpreadMap.java
+++ b/src/main/groovy/groovy/lang/SpreadMap.java
@@ -68,6 +68,7 @@ public class SpreadMap extends HashMap {
+ t + ") cannot be put in this spreadMap.");
}
+ @Override
public boolean equals(Object that) {
if (that instanceof SpreadMap) {
return equals((SpreadMap) that);
@@ -79,8 +80,10 @@ public class SpreadMap extends HashMap {
if (that == null) return false;
if (size() == that.size()) {
- for (Object key : keySet()) {
- if (!DefaultTypeTransformation.compareEqual(get(key), that.get(key))) {
+ for (Object e : entrySet()) {
+ Map.Entry entry = (Map.Entry) e;
+ Object key = entry.getKey();
+ if (!DefaultTypeTransformation.compareEqual(entry.getValue(), that.get(key))) {
return false;
}
}
@@ -89,6 +92,7 @@ public class SpreadMap extends HashMap {
return false;
}
+ @Override
public int hashCode() {
if (hashCode == 0) {
for (Object key : keySet()) {