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/05 05:37:23 UTC
groovy git commit: Make some static fields final
Repository: groovy
Updated Branches:
refs/heads/master 341f0ac19 -> 89227d726
Make some static fields final
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/89227d72
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/89227d72
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/89227d72
Branch: refs/heads/master
Commit: 89227d7267aba11b6280c15827a0c7b3bd836015
Parents: 341f0ac
Author: sunlan <su...@apache.org>
Authored: Tue Dec 5 13:37:17 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Dec 5 13:37:17 2017 +0800
----------------------------------------------------------------------
src/main/groovy/beans/BindableASTTransformation.java | 2 +-
src/main/groovy/beans/VetoableASTTransformation.java | 2 +-
.../groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java | 2 +-
src/main/org/codehaus/groovy/syntax/ASTHelper.java | 2 +-
.../src/main/java/groovy/json/internal/BaseJsonParser.java | 4 +++-
.../src/main/java/groovy/json/internal/MapItemValue.java | 4 +++-
6 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/89227d72/src/main/groovy/beans/BindableASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/beans/BindableASTTransformation.java b/src/main/groovy/beans/BindableASTTransformation.java
index f987295..f84327a 100644
--- a/src/main/groovy/beans/BindableASTTransformation.java
+++ b/src/main/groovy/beans/BindableASTTransformation.java
@@ -78,7 +78,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
@GroovyASTTransformation(phase= CompilePhase.CANONICALIZATION)
public class BindableASTTransformation implements ASTTransformation, Opcodes {
- protected static ClassNode boundClassNode = ClassHelper.make(Bindable.class);
+ protected static final ClassNode boundClassNode = ClassHelper.make(Bindable.class);
/**
* Convenience method to see if an annotated node is {@code @Bindable}.
http://git-wip-us.apache.org/repos/asf/groovy/blob/89227d72/src/main/groovy/beans/VetoableASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/beans/VetoableASTTransformation.java b/src/main/groovy/beans/VetoableASTTransformation.java
index d7353fd..17535ca 100644
--- a/src/main/groovy/beans/VetoableASTTransformation.java
+++ b/src/main/groovy/beans/VetoableASTTransformation.java
@@ -78,7 +78,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
@GroovyASTTransformation(phase = CompilePhase.CANONICALIZATION)
public class VetoableASTTransformation extends BindableASTTransformation {
- protected static ClassNode constrainedClassNode = ClassHelper.make(Vetoable.class);
+ protected static final ClassNode constrainedClassNode = ClassHelper.make(Vetoable.class);
/**
* Convenience method to see if an annotated node is {@code @Vetoable}.
http://git-wip-us.apache.org/repos/asf/groovy/blob/89227d72/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
index a85c7fd..640964f 100644
--- a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
@@ -106,7 +106,7 @@ public class BinaryExpressionMultiTypeDispatcher extends BinaryExpressionHelper
};
}
- public static Map<ClassNode,Integer> typeMap = new HashMap<ClassNode,Integer>(14);
+ public static final Map<ClassNode,Integer> typeMap = new HashMap<ClassNode,Integer>(14);
static {
typeMap.put(int_TYPE, 1); typeMap.put(long_TYPE, 2);
typeMap.put(double_TYPE, 3); typeMap.put(char_TYPE, 4);
http://git-wip-us.apache.org/repos/asf/groovy/blob/89227d72/src/main/org/codehaus/groovy/syntax/ASTHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/ASTHelper.java b/src/main/org/codehaus/groovy/syntax/ASTHelper.java
index be09c82..9929a64 100644
--- a/src/main/org/codehaus/groovy/syntax/ASTHelper.java
+++ b/src/main/org/codehaus/groovy/syntax/ASTHelper.java
@@ -52,7 +52,7 @@ public class ASTHelper {
private String packageName;
// TODO should this really be static???
- protected static Map resolutions = new HashMap(); // cleared on build(), to be safe
+ protected static final Map resolutions = new HashMap(); // cleared on build(), to be safe
public ASTHelper(SourceUnit controller, ClassLoader classLoader) {
this();
http://git-wip-us.apache.org/repos/asf/groovy/blob/89227d72/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
index 10facaf..da20ec0 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
@@ -70,7 +70,7 @@ public abstract class BaseJsonParser implements JsonParser {
protected static final int ESCAPE = '\\';
protected static final boolean internKeys = Boolean.parseBoolean(System.getProperty("groovy.json.internKeys", "false"));
- protected static ConcurrentHashMap<String, String> internedKeysCache;
+ protected static final ConcurrentHashMap<String, String> internedKeysCache;
private static final Charset UTF_8 = Charset.forName("UTF-8");
@@ -83,6 +83,8 @@ public abstract class BaseJsonParser implements JsonParser {
static {
if (internKeys) {
internedKeysCache = new ConcurrentHashMap<String, String>();
+ } else {
+ internedKeysCache = null;
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/89227d72/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
index 0047ae7..8658d07 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
@@ -37,11 +37,13 @@ public class MapItemValue implements Map.Entry<String, Value> {
private static final boolean internKeys = Boolean.parseBoolean(System.getProperty("groovy.json.implementation.internKeys", "false"));
- protected static ConcurrentHashMap<String, String> internedKeysCache;
+ protected static final ConcurrentHashMap<String, String> internedKeysCache;
static {
if (internKeys) {
internedKeysCache = new ConcurrentHashMap<String, String>();
+ } else {
+ internedKeysCache = null;
}
}