Repository: groovy Updated Branches: refs/heads/GROOVY_2_4_X c4253d71a -> 7b655ebfe
Fix serializable class without 'serialVersionUID' Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7b655ebf Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7b655ebf Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7b655ebf Branch: refs/heads/GROOVY_2_4_X Commit: 7b655ebfe213c071c0547eeedce3808d59f5ac3c Parents: c4253d7 Author: sunlan <[email protected]> Authored: Tue Apr 3 14:05:26 2018 +0800 Committer: sunlan <[email protected]> Committed: Tue Apr 3 14:05:26 2018 +0800 ---------------------------------------------------------------------- src/main/groovy/lang/Closure.java | 4 ++++ src/main/groovy/lang/ClosureException.java | 1 + src/main/groovy/lang/DeprecationException.java | 2 ++ src/main/groovy/lang/GroovyRuntimeException.java | 1 + .../groovy/lang/IllegalPropertyAccessException.java | 4 +++- .../lang/IncorrectClosureArgumentsException.java | 1 + .../groovy/lang/MetaClassRegistryChangeEvent.java | 1 + src/main/groovy/lang/MissingClassException.java | 1 + src/main/groovy/lang/MissingFieldException.java | 1 + src/main/groovy/lang/MissingMethodException.java | 1 + src/main/groovy/lang/MissingPropertyException.java | 1 + src/main/groovy/lang/NonEmptySequence.java | 2 ++ src/main/groovy/lang/ReadOnlyPropertyException.java | 2 ++ src/main/groovy/lang/Sequence.java | 1 + .../groovy/lang/SpreadListEvaluatingException.java | 2 ++ src/main/groovy/lang/SpreadMap.java | 1 + .../groovy/lang/SpreadMapEvaluatingException.java | 2 ++ src/main/groovy/lang/StringWriterIOException.java | 2 ++ src/main/groovy/lang/TrampolineClosure.java | 1 + .../groovy/security/GroovyCodeSourcePermission.java | 2 ++ .../transform/stc/IncorrectTypeHintException.java | 2 ++ src/main/groovy/util/NodeList.java | 2 ++ src/main/groovy/util/ObjectGraphBuilder.java | 2 ++ src/main/groovy/util/ObservableList.java | 10 ++++++++++ src/main/groovy/util/ObservableMap.java | 9 +++++++++ src/main/groovy/util/ObservableSet.java | 8 ++++++++ src/main/groovy/util/ResourceException.java | 2 ++ src/main/groovy/util/ScriptException.java | 2 ++ src/main/org/codehaus/groovy/GroovyBugError.java | 3 ++- src/main/org/codehaus/groovy/GroovyException.java | 1 + .../codehaus/groovy/antlr/ASTParserException.java | 1 + .../codehaus/groovy/antlr/ASTRuntimeException.java | 1 + .../org/codehaus/groovy/antlr/GroovySourceAST.java | 1 + src/main/org/codehaus/groovy/antlr/LexerFrame.java | 5 +++++ .../groovy/ast/tools/WideningCategories.java | 5 ++++- .../groovy/classgen/ClassGeneratorException.java | 2 ++ .../groovy/control/CompilationFailedException.java | 1 + .../groovy/control/ConfigurationException.java | 5 +++-- .../control/MultipleCompilationErrorsException.java | 3 ++- .../builder/SourceAwareCustomizerFactory.java | 4 ++++ .../org/codehaus/groovy/reflection/CachedClass.java | 16 ++++++++++++++++ .../org/codehaus/groovy/reflection/ClassInfo.java | 2 ++ .../groovy/reflection/GroovyClassValuePreJava7.java | 4 +++- .../codehaus/groovy/runtime/ComposedClosure.java | 1 + .../org/codehaus/groovy/runtime/ConvertedMap.java | 2 ++ .../org/codehaus/groovy/runtime/CurriedClosure.java | 1 + .../org/codehaus/groovy/runtime/GStringImpl.java | 1 + .../groovy/runtime/GroovyCategorySupport.java | 2 ++ .../groovy/runtime/InvokerInvocationException.java | 2 ++ .../groovy/runtime/IteratorClosureAdapter.java | 1 + .../org/codehaus/groovy/runtime/MethodClosure.java | 1 + .../groovy/runtime/ProxyGeneratorAdapter.java | 1 + .../groovy/runtime/ResourceGroovyMethods.java | 2 ++ .../codehaus/groovy/runtime/ScriptReference.java | 1 + .../org/codehaus/groovy/runtime/WritableFile.java | 1 + .../codehaus/groovy/runtime/memoize/Memoize.java | 2 ++ .../runtime/metaclass/ConcurrentReaderHashMap.java | 4 +++- .../runtime/metaclass/MethodSelectionException.java | 1 + .../metaclass/MissingMethodExceptionNoStack.java | 2 ++ .../metaclass/MissingMethodExecutionFailed.java | 1 + .../metaclass/MissingPropertyExceptionNoStack.java | 2 ++ .../runtime/powerassert/PowerAssertionError.java | 2 ++ .../SourceTextNotAvailableException.java | 2 ++ .../runtime/typehandling/GroovyCastException.java | 2 ++ .../org/codehaus/groovy/syntax/ParserException.java | 2 ++ .../org/codehaus/groovy/syntax/ReadException.java | 1 + .../groovy/syntax/RuntimeParserException.java | 2 ++ .../org/codehaus/groovy/syntax/SyntaxException.java | 1 + .../org/codehaus/groovy/syntax/TokenException.java | 2 ++ .../groovy/syntax/TokenMismatchException.java | 1 + .../org/codehaus/groovy/tools/gse/StringSetMap.java | 4 +++- .../transformers/StaticCompilationTransformer.java | 5 ++++- .../stc/AbstractTypeCheckingExtension.java | 1 + .../stc/GroovyTypeCheckingExtensionSupport.java | 5 ++++- .../transform/stc/StaticTypeCheckingSupport.java | 10 ++++++++-- .../codehaus/groovy/util/AbstractConcurrentMap.java | 2 ++ .../groovy/util/AbstractConcurrentMapBase.java | 1 + .../org/codehaus/groovy/util/LazyReference.java | 1 + .../codehaus/groovy/util/ManagedConcurrentMap.java | 1 + 79 files changed, 184 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/Closure.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Closure.java b/src/main/groovy/lang/Closure.java index 8dfd391..e56da24 100644 --- a/src/main/groovy/lang/Closure.java +++ b/src/main/groovy/lang/Closure.java @@ -196,6 +196,8 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl public static final int DONE = 1, SKIP = 2; private static final Object[] EMPTY_OBJECT_ARRAY = {}; public static final Closure IDENTITY = new Closure<Object>(null) { + private static final long serialVersionUID = 730973623329943963L; + public Object doCall(Object args) { return args; } @@ -845,6 +847,8 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl * inner class instead of the outer! */ private class WritableClosure extends Closure implements Writable { + private static final long serialVersionUID = -5749205698681690370L; + public WritableClosure() { super(Closure.this); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/ClosureException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/ClosureException.java b/src/main/groovy/lang/ClosureException.java index 12986ad..7a55631 100644 --- a/src/main/groovy/lang/ClosureException.java +++ b/src/main/groovy/lang/ClosureException.java @@ -25,6 +25,7 @@ package groovy.lang; */ public class ClosureException extends RuntimeException { + private static final long serialVersionUID = -945565055750688719L; private final Closure closure; public ClosureException(Closure closure, Throwable cause) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/DeprecationException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/DeprecationException.java b/src/main/groovy/lang/DeprecationException.java index 36ad893..8e5d087 100644 --- a/src/main/groovy/lang/DeprecationException.java +++ b/src/main/groovy/lang/DeprecationException.java @@ -33,6 +33,8 @@ package groovy.lang; */ public class DeprecationException extends RuntimeException { + private static final long serialVersionUID = 8828016729085737697L; + public DeprecationException(String message) { super(message); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/GroovyRuntimeException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GroovyRuntimeException.java b/src/main/groovy/lang/GroovyRuntimeException.java index 33eb51c..00f8f96 100644 --- a/src/main/groovy/lang/GroovyRuntimeException.java +++ b/src/main/groovy/lang/GroovyRuntimeException.java @@ -28,6 +28,7 @@ import org.codehaus.groovy.ast.ModuleNode; */ public class GroovyRuntimeException extends RuntimeException { + private static final long serialVersionUID = 3699943230572902549L; private ModuleNode module; private ASTNode node; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/IllegalPropertyAccessException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/IllegalPropertyAccessException.java b/src/main/groovy/lang/IllegalPropertyAccessException.java index 8227e3f..b7971d9 100644 --- a/src/main/groovy/lang/IllegalPropertyAccessException.java +++ b/src/main/groovy/lang/IllegalPropertyAccessException.java @@ -28,7 +28,9 @@ import java.lang.reflect.Modifier; * @author <a href="mailto:[email protected]";>Jochen Theodorou</a> */ public class IllegalPropertyAccessException extends MissingPropertyException { - + + private static final long serialVersionUID = 8149534204771978786L; + private static String makeMessage(String propertyName, Class clazz, int modifiers, boolean isField) { String access = "private"; if (Modifier.isProtected(modifiers)) access = "protected"; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/IncorrectClosureArgumentsException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/IncorrectClosureArgumentsException.java b/src/main/groovy/lang/IncorrectClosureArgumentsException.java index f5b23f5..236f399 100644 --- a/src/main/groovy/lang/IncorrectClosureArgumentsException.java +++ b/src/main/groovy/lang/IncorrectClosureArgumentsException.java @@ -28,6 +28,7 @@ import org.codehaus.groovy.runtime.InvokerHelper; */ public class IncorrectClosureArgumentsException extends GroovyRuntimeException { + private static final long serialVersionUID = 4208144749858078754L; private final Closure closure; private final Object arguments; private final Class[] expected; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/MetaClassRegistryChangeEvent.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MetaClassRegistryChangeEvent.java b/src/main/groovy/lang/MetaClassRegistryChangeEvent.java index c882fda..484efa3 100644 --- a/src/main/groovy/lang/MetaClassRegistryChangeEvent.java +++ b/src/main/groovy/lang/MetaClassRegistryChangeEvent.java @@ -26,6 +26,7 @@ import java.util.EventObject; * @author <a href="mailto:[email protected]";>Jochen Theodorou</a> */ public class MetaClassRegistryChangeEvent extends EventObject { + private static final long serialVersionUID = 1647849176793457976L; private final Class clazz; private final Object instance; private final MetaClass metaClass; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/MissingClassException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MissingClassException.java b/src/main/groovy/lang/MissingClassException.java index ad8e5f5..b3579a6 100644 --- a/src/main/groovy/lang/MissingClassException.java +++ b/src/main/groovy/lang/MissingClassException.java @@ -31,6 +31,7 @@ import org.codehaus.groovy.ast.ClassNode; */ public class MissingClassException extends GroovyRuntimeException { + private static final long serialVersionUID = -4059735896182191589L; private final String type; public MissingClassException(String type, ASTNode node, String message) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/MissingFieldException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MissingFieldException.java b/src/main/groovy/lang/MissingFieldException.java index 3c17d39..4a222f5 100644 --- a/src/main/groovy/lang/MissingFieldException.java +++ b/src/main/groovy/lang/MissingFieldException.java @@ -29,6 +29,7 @@ package groovy.lang; */ public class MissingFieldException extends GroovyRuntimeException { + private static final long serialVersionUID = -9209464582858098430L; private final String field; private final Class type; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/MissingMethodException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MissingMethodException.java b/src/main/groovy/lang/MissingMethodException.java index f8cad0d..ca5daa1 100644 --- a/src/main/groovy/lang/MissingMethodException.java +++ b/src/main/groovy/lang/MissingMethodException.java @@ -32,6 +32,7 @@ import org.codehaus.groovy.runtime.MethodRankHelper; public class MissingMethodException extends GroovyRuntimeException { private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; + private static final long serialVersionUID = -2423785115382704124L; private final String method; private final Class type; private final boolean isStatic; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/MissingPropertyException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/MissingPropertyException.java b/src/main/groovy/lang/MissingPropertyException.java index 270f039..552031a 100644 --- a/src/main/groovy/lang/MissingPropertyException.java +++ b/src/main/groovy/lang/MissingPropertyException.java @@ -32,6 +32,7 @@ import org.codehaus.groovy.runtime.MethodRankHelper; public class MissingPropertyException extends GroovyRuntimeException { public static final Object MPE = new Object(); + private static final long serialVersionUID = -5493778577329511881L; private final String property; private final Class type; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/NonEmptySequence.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/NonEmptySequence.java b/src/main/groovy/lang/NonEmptySequence.java index f069b7a..acb193b 100644 --- a/src/main/groovy/lang/NonEmptySequence.java +++ b/src/main/groovy/lang/NonEmptySequence.java @@ -29,6 +29,8 @@ import java.util.List; */ public class NonEmptySequence extends Sequence { + private static final long serialVersionUID = 1614604919062836998L; + public NonEmptySequence() { super(null); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/ReadOnlyPropertyException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/ReadOnlyPropertyException.java b/src/main/groovy/lang/ReadOnlyPropertyException.java index 342a182..77231d2 100644 --- a/src/main/groovy/lang/ReadOnlyPropertyException.java +++ b/src/main/groovy/lang/ReadOnlyPropertyException.java @@ -26,6 +26,8 @@ package groovy.lang; */ public class ReadOnlyPropertyException extends MissingPropertyException { + private static final long serialVersionUID = -1800912081930896077L; + public ReadOnlyPropertyException(final String property, final Class type) { super("Cannot set readonly property: " + property + " for class: " + type.getName(), property, type); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/Sequence.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/Sequence.java b/src/main/groovy/lang/Sequence.java index b0678f8..f22972c 100644 --- a/src/main/groovy/lang/Sequence.java +++ b/src/main/groovy/lang/Sequence.java @@ -35,6 +35,7 @@ import java.util.List; */ public class Sequence extends ArrayList implements GroovyObject { + private static final long serialVersionUID = 7498505573299850715L; private MetaClass metaClass = InvokerHelper.getMetaClass(getClass()); private Class type; private int hashCode; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/SpreadListEvaluatingException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/SpreadListEvaluatingException.java b/src/main/groovy/lang/SpreadListEvaluatingException.java index b6de965..f3360d3 100644 --- a/src/main/groovy/lang/SpreadListEvaluatingException.java +++ b/src/main/groovy/lang/SpreadListEvaluatingException.java @@ -19,6 +19,8 @@ package groovy.lang; public class SpreadListEvaluatingException extends GroovyRuntimeException { + private static final long serialVersionUID = 4565947835333349093L; + public SpreadListEvaluatingException(String message) { super(message); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/SpreadMap.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/SpreadMap.java b/src/main/groovy/lang/SpreadMap.java index 0fc6542..b9d742b 100644 --- a/src/main/groovy/lang/SpreadMap.java +++ b/src/main/groovy/lang/SpreadMap.java @@ -32,6 +32,7 @@ import java.util.Map; * @author Tim Tiemens */ public class SpreadMap extends HashMap { + private static final long serialVersionUID = 2870520857928038334L; private int hashCode; public SpreadMap(Object[] values) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/SpreadMapEvaluatingException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/SpreadMapEvaluatingException.java b/src/main/groovy/lang/SpreadMapEvaluatingException.java index 408a223..ee9dd21 100644 --- a/src/main/groovy/lang/SpreadMapEvaluatingException.java +++ b/src/main/groovy/lang/SpreadMapEvaluatingException.java @@ -19,6 +19,8 @@ package groovy.lang; public class SpreadMapEvaluatingException extends GroovyRuntimeException { + private static final long serialVersionUID = 4347220269418595368L; + public SpreadMapEvaluatingException(String message) { super(message); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/StringWriterIOException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/StringWriterIOException.java b/src/main/groovy/lang/StringWriterIOException.java index 0372399..9fef866 100644 --- a/src/main/groovy/lang/StringWriterIOException.java +++ b/src/main/groovy/lang/StringWriterIOException.java @@ -27,6 +27,8 @@ import java.io.IOException; */ public class StringWriterIOException extends RuntimeException { + private static final long serialVersionUID = -504499949457372681L; + public StringWriterIOException(IOException e) { super(e); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/lang/TrampolineClosure.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/TrampolineClosure.java b/src/main/groovy/lang/TrampolineClosure.java index ed68f00..71f31c8 100644 --- a/src/main/groovy/lang/TrampolineClosure.java +++ b/src/main/groovy/lang/TrampolineClosure.java @@ -30,6 +30,7 @@ package groovy.lang; */ final class TrampolineClosure<V> extends Closure<V> { + private static final long serialVersionUID = -4096349147398489925L; private final Closure<V> original; TrampolineClosure(final Closure<V> original) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/security/GroovyCodeSourcePermission.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/security/GroovyCodeSourcePermission.java b/src/main/groovy/security/GroovyCodeSourcePermission.java index e723e0b..49032cd 100644 --- a/src/main/groovy/security/GroovyCodeSourcePermission.java +++ b/src/main/groovy/security/GroovyCodeSourcePermission.java @@ -30,6 +30,8 @@ import java.security.BasicPermission; */ public final class GroovyCodeSourcePermission extends BasicPermission { + private static final long serialVersionUID = 8014290770546281019L; + public GroovyCodeSourcePermission(String name) { super(name); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/transform/stc/IncorrectTypeHintException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/transform/stc/IncorrectTypeHintException.java b/src/main/groovy/transform/stc/IncorrectTypeHintException.java index aed167a..622acfd 100644 --- a/src/main/groovy/transform/stc/IncorrectTypeHintException.java +++ b/src/main/groovy/transform/stc/IncorrectTypeHintException.java @@ -22,6 +22,8 @@ import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.syntax.SyntaxException; public class IncorrectTypeHintException extends SyntaxException { + private static final long serialVersionUID = 4481159236968540419L; + public IncorrectTypeHintException(final MethodNode mn, final Throwable e, int line, int column) { super("Incorrect type hint in @ClosureParams in class "+mn.getDeclaringClass().getName()+" method "+mn.getTypeDescriptor()+" : "+e.getMessage(), e, line, column); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/NodeList.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/NodeList.java b/src/main/groovy/util/NodeList.java index e54009c..2822d9d 100644 --- a/src/main/groovy/util/NodeList.java +++ b/src/main/groovy/util/NodeList.java @@ -38,6 +38,8 @@ import java.util.List; * @author Paul King */ public class NodeList extends ArrayList { + private static final long serialVersionUID = 5454686773425258279L; + static { // wrap the standard MetaClass with the delegate setMetaClass(NodeList.class, GroovySystem.getMetaClassRegistry().getMetaClass(NodeList.class)); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/ObjectGraphBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObjectGraphBuilder.java b/src/main/groovy/util/ObjectGraphBuilder.java index 1f4fc15..a197156 100644 --- a/src/main/groovy/util/ObjectGraphBuilder.java +++ b/src/main/groovy/util/ObjectGraphBuilder.java @@ -78,6 +78,8 @@ public class ObjectGraphBuilder extends FactoryBuilderSupport { referenceResolver = new DefaultReferenceResolver(); addPostNodeCompletionDelegate(new Closure(this, this) { + private static final long serialVersionUID = 7282290918368141309L; + public void doCall(ObjectGraphBuilder builder, Object parent, Object node) { if (parent == null) { builder.resolveLazyReferences(); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/ObservableList.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObservableList.java b/src/main/groovy/util/ObservableList.java index af6dd24..8e31362 100644 --- a/src/main/groovy/util/ObservableList.java +++ b/src/main/groovy/util/ObservableList.java @@ -479,6 +479,7 @@ public class ObservableList implements List { public abstract static class ElementEvent extends PropertyChangeEvent { + private static final long serialVersionUID = -218253929030274352L; private final ChangeType type; private final int index; @@ -506,24 +507,31 @@ public class ObservableList implements List { } public static class ElementAddedEvent extends ElementEvent { + private static final long serialVersionUID = -6594847306176480596L; + public ElementAddedEvent(Object source, Object newValue, int index) { super(source, null, newValue, index, ChangeType.ADDED); } } public static class ElementUpdatedEvent extends ElementEvent { + private static final long serialVersionUID = 1116018076124047485L; + public ElementUpdatedEvent(Object source, Object oldValue, Object newValue, int index) { super(source, oldValue, newValue, index, ChangeType.UPDATED); } } public static class ElementRemovedEvent extends ElementEvent { + private static final long serialVersionUID = 9017470261231004168L; + public ElementRemovedEvent(Object source, Object value, int index) { super(source, value, null, index, ChangeType.REMOVED); } } public static class ElementClearedEvent extends ElementEvent { + private static final long serialVersionUID = -2754983590419383972L; private List values = new ArrayList(); public ElementClearedEvent(Object source, List values) { @@ -539,6 +547,7 @@ public class ObservableList implements List { } public static class MultiElementAddedEvent extends ElementEvent { + private static final long serialVersionUID = 443060557109693114L; private List values = new ArrayList(); public MultiElementAddedEvent(Object source, int index, List values) { @@ -554,6 +563,7 @@ public class ObservableList implements List { } public static class MultiElementRemovedEvent extends ElementEvent { + private static final long serialVersionUID = 2590238951081945868L; private List values = new ArrayList(); public MultiElementRemovedEvent(Object source, List values) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/ObservableMap.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObservableMap.java b/src/main/groovy/util/ObservableMap.java index e1d6321..73bafa2 100644 --- a/src/main/groovy/util/ObservableMap.java +++ b/src/main/groovy/util/ObservableMap.java @@ -332,6 +332,7 @@ public class ObservableMap implements Map { } public abstract static class PropertyEvent extends PropertyChangeEvent { + private static final long serialVersionUID = -8328412226044328674L; private ChangeType type; public PropertyEvent(Object source, String propertyName, Object oldValue, Object newValue, ChangeType type) { @@ -353,24 +354,31 @@ public class ObservableMap implements Map { } public static class PropertyAddedEvent extends PropertyEvent { + private static final long serialVersionUID = -5761685843732329868L; + public PropertyAddedEvent(Object source, String propertyName, Object newValue) { super(source, propertyName, null, newValue, ChangeType.ADDED); } } public static class PropertyUpdatedEvent extends PropertyEvent { + private static final long serialVersionUID = -1104637722950032690L; + public PropertyUpdatedEvent(Object source, String propertyName, Object oldValue, Object newValue) { super(source, propertyName, oldValue, newValue, ChangeType.UPDATED); } } public static class PropertyRemovedEvent extends PropertyEvent { + private static final long serialVersionUID = 1882656655856158470L; + public PropertyRemovedEvent(Object source, String propertyName, Object oldValue) { super(source, propertyName, oldValue, null, ChangeType.REMOVED); } } public static class PropertyClearedEvent extends PropertyEvent { + private static final long serialVersionUID = -1472110679547513634L; private Map values = new HashMap(); public PropertyClearedEvent(Object source, Map values) { @@ -388,6 +396,7 @@ public class ObservableMap implements Map { public static class MultiPropertyEvent extends PropertyEvent { public static final String MULTI_PROPERTY = "groovy_util_ObservableMap_MultiPropertyEvent_MULTI"; private static final PropertyEvent[] EMPTY_PROPERTY_EVENTS = new PropertyEvent[0]; + private static final long serialVersionUID = 3925136810810084267L; private PropertyEvent[] events = EMPTY_PROPERTY_EVENTS; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/ObservableSet.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ObservableSet.java b/src/main/groovy/util/ObservableSet.java index 4c79a36..31ede71 100644 --- a/src/main/groovy/util/ObservableSet.java +++ b/src/main/groovy/util/ObservableSet.java @@ -348,6 +348,7 @@ public class ObservableSet<E> implements Set<E> { } public abstract static class ElementEvent extends PropertyChangeEvent { + private static final long serialVersionUID = -7140793925623806823L; private final ChangeType type; public ElementEvent(Object source, Object oldValue, Object newValue, ChangeType type) { @@ -369,18 +370,23 @@ public class ObservableSet<E> implements Set<E> { } public static class ElementAddedEvent extends ElementEvent { + private static final long serialVersionUID = 4678444473287170956L; + public ElementAddedEvent(Object source, Object newValue) { super(source, null, newValue, ChangeType.ADDED); } } public static class ElementRemovedEvent extends ElementEvent { + private static final long serialVersionUID = 5934658331755545227L; + public ElementRemovedEvent(Object source, Object value) { super(source, value, null, ChangeType.REMOVED); } } public static class ElementClearedEvent extends ElementEvent { + private static final long serialVersionUID = 6075523774365623231L; private List values = new ArrayList(); public ElementClearedEvent(Object source, List values) { @@ -396,6 +402,7 @@ public class ObservableSet<E> implements Set<E> { } public static class MultiElementAddedEvent extends ElementEvent { + private static final long serialVersionUID = 575204921472897312L; private List values = new ArrayList(); public MultiElementAddedEvent(Object source, List values) { @@ -411,6 +418,7 @@ public class ObservableSet<E> implements Set<E> { } public static class MultiElementRemovedEvent extends ElementEvent { + private static final long serialVersionUID = 8894701122065438905L; private List values = new ArrayList(); public MultiElementRemovedEvent(Object source, List values) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/ResourceException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ResourceException.java b/src/main/groovy/util/ResourceException.java index 8b31d7e..0f57b53 100644 --- a/src/main/groovy/util/ResourceException.java +++ b/src/main/groovy/util/ResourceException.java @@ -23,6 +23,8 @@ package groovy.util; */ public class ResourceException extends Exception { + private static final long serialVersionUID = -4640685456255837192L; + /** * */ http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/groovy/util/ScriptException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ScriptException.java b/src/main/groovy/util/ScriptException.java index 85ce60f..491b94a 100644 --- a/src/main/groovy/util/ScriptException.java +++ b/src/main/groovy/util/ScriptException.java @@ -23,6 +23,8 @@ package groovy.util; */ public class ScriptException extends Exception { + private static final long serialVersionUID = 3447547760007143671L; + /** * */ http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/GroovyBugError.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/GroovyBugError.java b/src/main/org/codehaus/groovy/GroovyBugError.java index 30ed7de..89d855d 100644 --- a/src/main/org/codehaus/groovy/GroovyBugError.java +++ b/src/main/org/codehaus/groovy/GroovyBugError.java @@ -26,7 +26,8 @@ package org.codehaus.groovy; * @author Jochen Theodorou */ public class GroovyBugError extends AssertionError { - + + private static final long serialVersionUID = 7170193853899664927L; // message string private String message; // optional exception http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/GroovyException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/GroovyException.java b/src/main/org/codehaus/groovy/GroovyException.java index 582da48..61826f5 100644 --- a/src/main/org/codehaus/groovy/GroovyException.java +++ b/src/main/org/codehaus/groovy/GroovyException.java @@ -19,6 +19,7 @@ package org.codehaus.groovy; public class GroovyException extends Exception implements GroovyExceptionInterface { + private static final long serialVersionUID = -61298636122042408L; private boolean fatal = true; public GroovyException() { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/antlr/ASTParserException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/ASTParserException.java b/src/main/org/codehaus/groovy/antlr/ASTParserException.java index 204674b..372b04d 100644 --- a/src/main/org/codehaus/groovy/antlr/ASTParserException.java +++ b/src/main/org/codehaus/groovy/antlr/ASTParserException.java @@ -26,6 +26,7 @@ import org.codehaus.groovy.syntax.ParserException; * */ public class ASTParserException extends ParserException { + private static final long serialVersionUID = 2537232761345194260L; private final AST ast; public ASTParserException(ASTRuntimeException e) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java b/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java index aec85d4..032c24d 100644 --- a/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java +++ b/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java @@ -24,6 +24,7 @@ import antlr.collections.AST; * @author <a href="mailto:[email protected]";>James Strachan</a> */ public class ASTRuntimeException extends RuntimeException { + private static final long serialVersionUID = 3980229202392379560L; private final AST ast; public ASTRuntimeException(AST ast, String message) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java b/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java index d256e73..fc62836 100644 --- a/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java +++ b/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java @@ -33,6 +33,7 @@ import java.util.List; * @author Jeremy Rayner <[email protected]> */ public class GroovySourceAST extends CommonAST implements Comparable, SourceInfo { + private static final long serialVersionUID = 2019901428136117486L; private int line; private int col; private int lineLast; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/antlr/LexerFrame.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/LexerFrame.java b/src/main/org/codehaus/groovy/antlr/LexerFrame.java index 6811b21..b01e72e 100644 --- a/src/main/org/codehaus/groovy/antlr/LexerFrame.java +++ b/src/main/org/codehaus/groovy/antlr/LexerFrame.java @@ -43,6 +43,7 @@ import java.util.Hashtable; * @author Santhosh Kumar T */ public class LexerFrame extends JFrame implements ActionListener{ + private static final long serialVersionUID = -8997987607217627488L; JSplitPane jSplitPane1 = new JSplitPane(); JScrollPane jScrollPane1 = new JScrollPane(); JScrollPane jScrollPane2 = new JScrollPane(); @@ -103,6 +104,8 @@ public class LexerFrame extends JFrame implements ActionListener{ } private Action loadFileAction = new AbstractAction("Open File..."){ + private static final long serialVersionUID = 4541927184172762704L; + public void actionPerformed(ActionEvent ae){ JFileChooser jfc = new JFileChooser(); int response = jfc.showOpenDialog(LexerFrame.this); @@ -204,6 +207,8 @@ public class LexerFrame extends JFrame implements ActionListener{ class HScrollableTextPane extends JTextPane{ + private static final long serialVersionUID = 3170809157581763848L; + public boolean getScrollableTracksViewportWidth(){ return(getSize().width<getParent().getSize().width); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java b/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java index 55bfb00..5cdfc79 100644 --- a/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java +++ b/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java @@ -75,7 +75,10 @@ public class WideningCategories { private static final List<ClassNode> EMPTY_CLASSNODE_LIST = Collections.emptyList(); - private static final Map<ClassNode, Integer> NUMBER_TYPES_PRECEDENCE = Collections.unmodifiableMap(new HashMap<ClassNode, Integer>() {{ + private static final Map<ClassNode, Integer> NUMBER_TYPES_PRECEDENCE = Collections.unmodifiableMap(new HashMap<ClassNode, Integer>() { + private static final long serialVersionUID = -5178744121420941913L; + + { put(ClassHelper.double_TYPE, 0); put(ClassHelper.float_TYPE, 1); put(ClassHelper.long_TYPE, 2); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java b/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java index bce3448..5c404ec 100644 --- a/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java +++ b/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java @@ -25,6 +25,8 @@ package org.codehaus.groovy.classgen; */ public class ClassGeneratorException extends RuntimeException { + private static final long serialVersionUID = 440899360174632769L; + public ClassGeneratorException(String message) { super(message); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/control/CompilationFailedException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/CompilationFailedException.java b/src/main/org/codehaus/groovy/control/CompilationFailedException.java index 741b647..2930b8c 100644 --- a/src/main/org/codehaus/groovy/control/CompilationFailedException.java +++ b/src/main/org/codehaus/groovy/control/CompilationFailedException.java @@ -29,6 +29,7 @@ import groovy.lang.GroovyRuntimeException; public class CompilationFailedException extends GroovyRuntimeException { + private static final long serialVersionUID = 4500269747315896966L; protected int phase; // The phase in which the failures occurred protected ProcessingUnit unit; // The *Unit object this exception wraps http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/control/ConfigurationException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/ConfigurationException.java b/src/main/org/codehaus/groovy/control/ConfigurationException.java index 3d0658a..9e226ad 100644 --- a/src/main/org/codehaus/groovy/control/ConfigurationException.java +++ b/src/main/org/codehaus/groovy/control/ConfigurationException.java @@ -31,8 +31,9 @@ import org.codehaus.groovy.GroovyExceptionInterface; public class ConfigurationException extends RuntimeException implements GroovyExceptionInterface { - - //--------------------------------------------------------------------------- + private static final long serialVersionUID = -630757959041134069L; + + //--------------------------------------------------------------------------- // CONSTRUCTION AND SUCH protected Exception cause; // The phase in which the failures occurred http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java b/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java index 0d7dc3c..251a39f 100644 --- a/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java +++ b/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java @@ -26,7 +26,8 @@ import java.io.StringWriter; */ public class MultipleCompilationErrorsException extends CompilationFailedException { - + + private static final long serialVersionUID = 2948487149304811836L; protected ErrorCollector collector; public MultipleCompilationErrorsException(ErrorCollector ec) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java index d0fc541..1edf636 100644 --- a/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java +++ b/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java @@ -115,6 +115,8 @@ public class SourceAwareCustomizerFactory extends AbstractFactory implements Pos Closure<Boolean> extensionValidator = data.extensionValidator; if (extensionValidator==null && !extensions.isEmpty()) { extensionValidator = new Closure<Boolean>(sourceAwareCustomizer) { + private static final long serialVersionUID = 925642730835101872L; + @Override @SuppressWarnings("unchecked") public Boolean call(final Object arguments) { @@ -131,6 +133,8 @@ public class SourceAwareCustomizerFactory extends AbstractFactory implements Pos Closure<Boolean> basenameValidator = data.basenameValidator; if (basenameValidator==null && !basenames.isEmpty()) { basenameValidator = new Closure<Boolean>(sourceAwareCustomizer) { + private static final long serialVersionUID = 7714937867958607043L; + @Override @SuppressWarnings("unchecked") public Boolean call(final Object arguments) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/reflection/CachedClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/CachedClass.java b/src/main/org/codehaus/groovy/reflection/CachedClass.java index d391fac..3a4918f 100644 --- a/src/main/org/codehaus/groovy/reflection/CachedClass.java +++ b/src/main/org/codehaus/groovy/reflection/CachedClass.java @@ -60,6 +60,8 @@ public class CachedClass { private static ReferenceBundle softBundle = ReferenceBundle.getSoftBundle(); private final LazyReference<CachedField[]> fields = new LazyReference<CachedField[]>(softBundle) { + private static final long serialVersionUID = 5450437842165410025L; + public CachedField[] initValue() { final Field[] declaredFields = (Field[]) AccessController.doPrivileged(new PrivilegedAction<Field[]>() { @@ -77,6 +79,8 @@ public class CachedClass { }; private LazyReference<CachedConstructor[]> constructors = new LazyReference<CachedConstructor[]>(softBundle) { + private static final long serialVersionUID = -5834446523983631635L; + public CachedConstructor[] initValue() { final Constructor[] declaredConstructors = (Constructor[]) AccessController.doPrivileged(new PrivilegedAction/*<Constructor[]>*/() { @@ -113,6 +117,8 @@ public class CachedClass { } private final LazyReference<CachedMethod[]> methods = new LazyReference<CachedMethod[]>(softBundle) { + private static final long serialVersionUID = 6347586066597418308L; + public CachedMethod[] initValue() { final Method[] declaredMethods = (Method[]) AccessController.doPrivileged(new PrivilegedAction/*<Method[]>*/() { @@ -163,6 +169,8 @@ public class CachedClass { }; private LazyReference<CachedClass> cachedSuperClass = new LazyReference<CachedClass>(softBundle) { + private static final long serialVersionUID = -4663740963306806058L; + public CachedClass initValue() { if (!isArray) return ReflectionCache.getCachedClass(getTheClass().getSuperclass()); @@ -175,6 +183,8 @@ public class CachedClass { }; private final LazyReference<CallSiteClassLoader> callSiteClassLoader = new LazyReference<CallSiteClassLoader>(softBundle) { + private static final long serialVersionUID = 4410385968428074090L; + public CallSiteClassLoader initValue() { return AccessController.doPrivileged(new PrivilegedAction<CallSiteClassLoader>() { @@ -186,6 +196,8 @@ public class CachedClass { }; private final LazyReference<LinkedList<ClassInfo>> hierarchy = new LazyReference<LinkedList<ClassInfo>>(softBundle) { + private static final long serialVersionUID = 7166687623678851596L; + public LinkedList<ClassInfo> initValue() { Set<ClassInfo> res = new LinkedHashSet<ClassInfo> (); @@ -213,6 +225,8 @@ public class CachedClass { public static final CachedClass[] EMPTY_ARRAY = new CachedClass[0]; private final LazyReference<Set<CachedClass>> declaredInterfaces = new LazyReference<Set<CachedClass>> (softBundle) { + private static final long serialVersionUID = 2139190436931329873L; + public Set<CachedClass> initValue() { Set<CachedClass> res = new HashSet<CachedClass> (0); @@ -225,6 +239,8 @@ public class CachedClass { }; private final LazyReference<Set<CachedClass>> interfaces = new LazyReference<Set<CachedClass>> (softBundle) { + private static final long serialVersionUID = 4060471819464086940L; + public Set<CachedClass> initValue() { Set<CachedClass> res = new HashSet<CachedClass> (0); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/reflection/ClassInfo.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/ClassInfo.java b/src/main/org/codehaus/groovy/reflection/ClassInfo.java index f413233..1f153ef 100644 --- a/src/main/org/codehaus/groovy/reflection/ClassInfo.java +++ b/src/main/org/codehaus/groovy/reflection/ClassInfo.java @@ -441,6 +441,7 @@ public class ClassInfo implements Finalizable { } private static class LazyCachedClassRef extends LazyReference<CachedClass> { + private static final long serialVersionUID = -1400274148849287400L; private final ClassInfo info; LazyCachedClassRef(ReferenceBundle bundle, ClassInfo info) { @@ -454,6 +455,7 @@ public class ClassInfo implements Finalizable { } private static class LazyClassLoaderRef extends LazyReference<ClassLoaderForClassArtifacts> { + private static final long serialVersionUID = 1639196133085420609L; private final ClassInfo info; LazyClassLoaderRef(ReferenceBundle bundle, ClassInfo info) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java b/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java index 56ad0c1..02f893c 100644 --- a/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java +++ b/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java @@ -54,7 +54,9 @@ class GroovyClassValuePreJava7<T> implements GroovyClassValue<T> { private class GroovyClassValuePreJava7Segment extends ManagedConcurrentMap.Segment<Class<?>,T> { - GroovyClassValuePreJava7Segment(ReferenceBundle bundle, int initialCapacity) { + private static final long serialVersionUID = 1289753977947029168L; + + GroovyClassValuePreJava7Segment(ReferenceBundle bundle, int initialCapacity) { super(bundle, initialCapacity); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/ComposedClosure.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ComposedClosure.java b/src/main/org/codehaus/groovy/runtime/ComposedClosure.java index 948ce09..91057b5 100644 --- a/src/main/org/codehaus/groovy/runtime/ComposedClosure.java +++ b/src/main/org/codehaus/groovy/runtime/ComposedClosure.java @@ -59,6 +59,7 @@ import java.util.List; */ public final class ComposedClosure<V> extends Closure<V> { + private static final long serialVersionUID = 1290542293376731831L; private Closure first; private Closure<V> second; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/ConvertedMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ConvertedMap.java b/src/main/org/codehaus/groovy/runtime/ConvertedMap.java index 393d55e..9bc71fa 100644 --- a/src/main/org/codehaus/groovy/runtime/ConvertedMap.java +++ b/src/main/org/codehaus/groovy/runtime/ConvertedMap.java @@ -31,6 +31,8 @@ import java.util.Map; */ public class ConvertedMap extends ConversionHandler { + private static final long serialVersionUID = -8131432558241254137L; + /** * to create a ConvertedMap object. * http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/CurriedClosure.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/CurriedClosure.java b/src/main/org/codehaus/groovy/runtime/CurriedClosure.java index cabe230..1db1037 100644 --- a/src/main/org/codehaus/groovy/runtime/CurriedClosure.java +++ b/src/main/org/codehaus/groovy/runtime/CurriedClosure.java @@ -46,6 +46,7 @@ import groovy.lang.Closure; */ public final class CurriedClosure<V> extends Closure<V> { + private static final long serialVersionUID = -1018388175778192754L; private final Object[] curriedParams; private final int minParamsExpected; private int index; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/GStringImpl.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/GStringImpl.java b/src/main/org/codehaus/groovy/runtime/GStringImpl.java index 071e26c..3e020ec 100644 --- a/src/main/org/codehaus/groovy/runtime/GStringImpl.java +++ b/src/main/org/codehaus/groovy/runtime/GStringImpl.java @@ -29,6 +29,7 @@ import groovy.lang.GString; * @see groovy.lang.GString */ public class GStringImpl extends GString { + private static final long serialVersionUID = -6400178815578597715L; private String[] strings; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java b/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java index 4c64b05..06e687e 100644 --- a/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java +++ b/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java @@ -47,6 +47,7 @@ public class GroovyCategorySupport { private static int categoriesInUse = 0; public static class CategoryMethodList extends ArrayList<CategoryMethod> { + private static final long serialVersionUID = 1569020062006842141L; public final int level; final CategoryMethodList previous; final AtomicInteger usage; @@ -72,6 +73,7 @@ public class GroovyCategorySupport { public static class ThreadCategoryInfo extends HashMap<String, CategoryMethodList>{ private static final Object LOCK = new Object(); + private static final long serialVersionUID = 2609120843123833410L; int level; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java b/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java index 2f03126..da85b6b 100644 --- a/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java +++ b/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java @@ -29,6 +29,8 @@ import java.lang.reflect.InvocationTargetException; */ public class InvokerInvocationException extends GroovyRuntimeException { + private static final long serialVersionUID = 5870532233180451709L; + public InvokerInvocationException(InvocationTargetException e) { super(e.getTargetException()); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java b/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java index 24d74f6..7f098d7 100644 --- a/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java +++ b/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java @@ -32,6 +32,7 @@ import java.util.List; */ public class IteratorClosureAdapter<T> extends Closure { + private static final long serialVersionUID = -3193812539363103534L; private final List<T> list = new ArrayList<T>(); private MetaClass metaClass = InvokerHelper.getMetaClass(getClass()); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/MethodClosure.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/MethodClosure.java b/src/main/org/codehaus/groovy/runtime/MethodClosure.java index cacdca8..f2e361b 100644 --- a/src/main/org/codehaus/groovy/runtime/MethodClosure.java +++ b/src/main/org/codehaus/groovy/runtime/MethodClosure.java @@ -33,6 +33,7 @@ import java.util.List; */ public class MethodClosure extends Closure { + private static final long serialVersionUID = 5316055624606528584L; public static boolean ALLOW_RESOLVE = false; private static final Class[] EMPTY_CLASS_ARRAY = new Class[0]; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java index 9b7deb9..d886b92 100644 --- a/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java +++ b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java @@ -929,6 +929,7 @@ public class ProxyGeneratorAdapter extends ClassVisitor implements Opcodes { } private static class ReturnValueWrappingClosure<V> extends Closure<V>{ + private static final long serialVersionUID = 1313135457715304501L; private final V value; public ReturnValueWrappingClosure(V returnValue) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java index 039dc62..cbaa4b4 100644 --- a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java @@ -138,6 +138,8 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport { final long[] size = {0L}; eachFileRecurse(self, FileType.FILES, new Closure<Void>(null) { + private static final long serialVersionUID = 7688764529326404277L; + public void doCall(Object[] args) { size[0] += ((File) args[0]).length(); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/ScriptReference.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ScriptReference.java b/src/main/org/codehaus/groovy/runtime/ScriptReference.java index 2faa4d1..8ebf0d8 100644 --- a/src/main/org/codehaus/groovy/runtime/ScriptReference.java +++ b/src/main/org/codehaus/groovy/runtime/ScriptReference.java @@ -28,6 +28,7 @@ import groovy.lang.Script; */ public class ScriptReference extends Reference { + private static final long serialVersionUID = -2914281513576690336L; private Script script; private String variable; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/WritableFile.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/WritableFile.java b/src/main/org/codehaus/groovy/runtime/WritableFile.java index ec2f481..21a9e40 100644 --- a/src/main/org/codehaus/groovy/runtime/WritableFile.java +++ b/src/main/org/codehaus/groovy/runtime/WritableFile.java @@ -32,6 +32,7 @@ import java.io.Writer; * */ public class WritableFile extends File implements Writable { + private static final long serialVersionUID = 1661640530283827325L; private final String encoding; public WritableFile(final File delegate) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java b/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java index c4dd3d9..d99ab2e 100644 --- a/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java +++ b/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java @@ -116,6 +116,7 @@ public abstract class Memoize { } private static class MemoizeFunction<V> extends Closure<V> { + private static final long serialVersionUID = -2780003153676993093L; final MemoizeCache<Object, Object> cache; final Closure<V> closure; @@ -144,6 +145,7 @@ public abstract class Memoize { } private static class SoftReferenceMemoizeFunction<V> extends MemoizeFunction<V> { + private static final long serialVersionUID = -1338206227167457991L; final ProtectionStorage lruProtectionStorage; final ReferenceQueue queue; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/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 68fe42d..2d501b3 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java @@ -166,7 +166,9 @@ public class ConcurrentReaderHashMap */ /** A Serializable class for barrier lock **/ - protected static class BarrierLock implements java.io.Serializable { } + protected static class BarrierLock implements java.io.Serializable { + private static final long serialVersionUID = -5403150101810674636L; + } /** * Lock used only for its memory effects. http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java b/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java index a9f5538..4f0cc4c 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java @@ -37,6 +37,7 @@ import java.lang.reflect.Modifier; */ public class MethodSelectionException extends GroovyRuntimeException { + private static final long serialVersionUID = 6260193948973669540L; private final String methodName; private final FastArray methods; private final Class[] arguments; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java b/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java index 28437d2..80836c7 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java @@ -22,6 +22,8 @@ import groovy.lang.MissingMethodException; public class MissingMethodExceptionNoStack extends MissingMethodException { + private static final long serialVersionUID = 7075950754138801519L; + public MissingMethodExceptionNoStack(String method, Class type, Object[] arguments) { this(method,type,arguments,false); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java b/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java index c785b9f..557176d 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java @@ -24,6 +24,7 @@ package org.codehaus.groovy.runtime.metaclass; * invokeMethod for GroovyObject implementing classes. */ public class MissingMethodExecutionFailed extends MissingMethodExceptionNoStack { + private static final long serialVersionUID = -6551412223364004284L; private Throwable cause; public MissingMethodExecutionFailed(String method, Class type, Object[] arguments, boolean isStatic, Throwable cause) { super(method, type, arguments, isStatic); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java b/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java index 0b2c33f..a177eab 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java @@ -22,6 +22,8 @@ import groovy.lang.MissingPropertyException; public class MissingPropertyExceptionNoStack extends MissingPropertyException { + private static final long serialVersionUID = -7734212543734003079L; + public MissingPropertyExceptionNoStack(String propertyName, Class theClass) { super(propertyName, theClass); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java b/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java index d6ef9de..b79f0d7 100644 --- a/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java +++ b/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java @@ -24,6 +24,8 @@ package org.codehaus.groovy.runtime.powerassert; * @author Peter Niederwieser */ public class PowerAssertionError extends java.lang.AssertionError { + private static final long serialVersionUID = 186840762256433109L; + public PowerAssertionError(String msg) { super(msg); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java b/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java index 431dd08..b7a6bd8 100644 --- a/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java +++ b/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java @@ -27,6 +27,8 @@ import org.codehaus.groovy.control.SourceUnit; * @author Peter Niederwieser */ public class SourceTextNotAvailableException extends RuntimeException { + private static final long serialVersionUID = -3815868502019514479L; + // only accepts AssertStatementS so that better error messages can be produced public SourceTextNotAvailableException(AssertStatement stat, SourceUnit unit, String msg) { super(String.format("%s for %s at (%d,%d)-(%d,%d) in %s", http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java b/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java index e2fc66a..f9cace8 100644 --- a/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java +++ b/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java @@ -20,6 +20,8 @@ package org.codehaus.groovy.runtime.typehandling; public class GroovyCastException extends ClassCastException { + private static final long serialVersionUID = 6859089155641797356L; + /** * @param objectToCast object we tried to cast * @param classToCastTo class we tried to cast to http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/syntax/ParserException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/ParserException.java b/src/main/org/codehaus/groovy/syntax/ParserException.java index 2215429..beedb1c 100644 --- a/src/main/org/codehaus/groovy/syntax/ParserException.java +++ b/src/main/org/codehaus/groovy/syntax/ParserException.java @@ -19,6 +19,8 @@ package org.codehaus.groovy.syntax; public class ParserException extends TokenException { + private static final long serialVersionUID = -3772086239731735693L; + public ParserException(String message, Token token) { super(message, token); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/syntax/ReadException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/ReadException.java b/src/main/org/codehaus/groovy/syntax/ReadException.java index 6885c24..af70dd0 100644 --- a/src/main/org/codehaus/groovy/syntax/ReadException.java +++ b/src/main/org/codehaus/groovy/syntax/ReadException.java @@ -27,6 +27,7 @@ import java.io.IOException; */ public class ReadException extends GroovyException { + private static final long serialVersionUID = -6171846198126205359L; private final IOException cause; public ReadException(IOException cause) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java b/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java index c47bc26..ce804e1 100644 --- a/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java +++ b/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java @@ -29,6 +29,8 @@ import org.codehaus.groovy.ast.ASTNode; */ public class RuntimeParserException extends GroovyRuntimeException { + private static final long serialVersionUID = -6612860527133856587L; + public RuntimeParserException(String message, ASTNode node) { super(message + "\n", node); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/syntax/SyntaxException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/SyntaxException.java b/src/main/org/codehaus/groovy/syntax/SyntaxException.java index 0348e8c..aa71f89 100644 --- a/src/main/org/codehaus/groovy/syntax/SyntaxException.java +++ b/src/main/org/codehaus/groovy/syntax/SyntaxException.java @@ -26,6 +26,7 @@ import org.codehaus.groovy.GroovyException; */ public class SyntaxException extends GroovyException { + private static final long serialVersionUID = 5547021570604495375L; /** Line upon which the error occurred. */ private final int startLine; private final int endLine; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/syntax/TokenException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/TokenException.java b/src/main/org/codehaus/groovy/syntax/TokenException.java index 5c9f275..fea3ec2 100644 --- a/src/main/org/codehaus/groovy/syntax/TokenException.java +++ b/src/main/org/codehaus/groovy/syntax/TokenException.java @@ -19,6 +19,8 @@ package org.codehaus.groovy.syntax; public class TokenException extends SyntaxException { + private static final long serialVersionUID = 6850594285972085144L; + public TokenException(String message, Token token) { super( (token == null) http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java b/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java index 32c90a5..3f799fa 100644 --- a/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java +++ b/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java @@ -19,6 +19,7 @@ package org.codehaus.groovy.syntax; public class TokenMismatchException extends TokenException { + private static final long serialVersionUID = -6321206176010272124L; private final Token unexpectedToken; private final int expectedType; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java b/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java index 74f9fff..4d5117d 100644 --- a/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java +++ b/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java @@ -24,7 +24,9 @@ import java.util.Set; import java.util.TreeSet; public class StringSetMap extends LinkedHashMap<String,Set<String>> { - + + private static final long serialVersionUID = 4230491822783819152L; + public StringSetMap() { super(); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java index 90c956c..fbb3fe3 100644 --- a/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java +++ b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java @@ -56,7 +56,10 @@ import java.util.Map; public class StaticCompilationTransformer extends ClassCodeExpressionTransformer { protected static final ClassNode BYTECODE_ADAPTER_CLASS = ClassHelper.make(ScriptBytecodeAdapter.class); - protected static final Map<Integer, MethodNode> BYTECODE_BINARY_ADAPTERS = Collections.unmodifiableMap(new HashMap<Integer, MethodNode>() {{ + protected static final Map<Integer, MethodNode> BYTECODE_BINARY_ADAPTERS = Collections.unmodifiableMap(new HashMap<Integer, MethodNode>() { + private static final long serialVersionUID = -9117028399464862605L; + + { put(Types.COMPARE_EQUAL, BYTECODE_ADAPTER_CLASS.getMethods("compareEqual").get(0)); put(Types.COMPARE_GREATER_THAN, BYTECODE_ADAPTER_CLASS.getMethods("compareGreaterThan").get(0)); put(Types.COMPARE_GREATER_THAN_EQUAL, BYTECODE_ADAPTER_CLASS.getMethods("compareGreaterThanEqual").get(0)); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java index 8e2fad7..d6cae87 100644 --- a/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java +++ b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java @@ -436,6 +436,7 @@ public class AbstractTypeCheckingExtension extends TypeCheckingExtension { } private static class TypeCheckingScope extends LinkedHashMap<String, Object> { + private static final long serialVersionUID = 7607331333917615144L; private final AbstractTypeCheckingExtension.TypeCheckingScope parent; private TypeCheckingScope(final AbstractTypeCheckingExtension.TypeCheckingScope parentScope) { http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java b/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java index 52ccdf1..6254b0a 100644 --- a/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java +++ b/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java @@ -65,7 +65,10 @@ public class GroovyTypeCheckingExtensionSupport extends AbstractTypeCheckingExte // method name to DSL name private static final Map<String, String> METHOD_ALIASES = Collections.unmodifiableMap( - new HashMap<String, String>() {{ + new HashMap<String, String>() { + private static final long serialVersionUID = 8938707932245818749L; + + { put("onMethodSelection", "onMethodSelection"); put("afterMethodCall", "afterMethodCall"); put("beforeMethodCall", "beforeMethodCall"); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java index 26cec8d..48b61e1 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -160,7 +160,10 @@ public abstract class StaticTypeCheckingSupport { protected static final ClassNode ArrayList_TYPE = makeWithoutCaching(ArrayList.class); protected static final ExtensionMethodCache EXTENSION_METHOD_CACHE = new ExtensionMethodCache(); protected static final Map<ClassNode, Integer> NUMBER_TYPES = Collections.unmodifiableMap( - new HashMap<ClassNode, Integer>() {{ + new HashMap<ClassNode, Integer>() { + private static final long serialVersionUID = 8841951852732042766L; + + { put(byte_TYPE, 0); put(Byte_TYPE, 0); put(short_TYPE, 1); @@ -176,7 +179,10 @@ public abstract class StaticTypeCheckingSupport { }}); protected static final Map<String, Integer> NUMBER_OPS = Collections.unmodifiableMap( - new HashMap<String, Integer>() {{ + new HashMap<String, Integer>() { + private static final long serialVersionUID = 6951856193525808411L; + + { put("plus", PLUS); put("minus", MINUS); put("multiply", MULTIPLY); http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java b/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java index d60396b..349c930 100644 --- a/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java +++ b/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java @@ -50,6 +50,8 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB public abstract static class Segment<K,V> extends AbstractConcurrentMapBase.Segment { + private static final long serialVersionUID = 5192533863182570468L; + protected Segment(int initialCapacity) { super(initialCapacity); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java b/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java index b21c0af..2cfc82a 100644 --- a/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java +++ b/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java @@ -154,6 +154,7 @@ public abstract class AbstractConcurrentMapBase { } public static class Segment extends LockableObject { + private static final long serialVersionUID = -1071886855389945760L; volatile int count; int threshold; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/util/LazyReference.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/LazyReference.java b/src/main/org/codehaus/groovy/util/LazyReference.java index fc34803..54e0ab2 100644 --- a/src/main/org/codehaus/groovy/util/LazyReference.java +++ b/src/main/org/codehaus/groovy/util/LazyReference.java @@ -24,6 +24,7 @@ package org.codehaus.groovy.util; public abstract class LazyReference<T> extends LockableObject { private static final ManagedReference INIT = new ManagedReference(ReferenceType.HARD,null,null){}; private static final ManagedReference NULL_REFERENCE = new ManagedReference(ReferenceType.HARD,null,null){}; + private static final long serialVersionUID = 3160238516132794621L; private ManagedReference<T> reference = INIT; private final ReferenceBundle bundle; http://git-wip-us.apache.org/repos/asf/groovy/blob/7b655ebf/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java b/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java index db44a00..2e49096 100644 --- a/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java +++ b/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java @@ -33,6 +33,7 @@ public class ManagedConcurrentMap<K,V> extends AbstractConcurrentMap<K,V> { } public static class Segment<K,V> extends AbstractConcurrentMap.Segment<K,V>{ + private static final long serialVersionUID = -2157582627873688747L; protected final ReferenceBundle bundle; public Segment(ReferenceBundle bundle, int cap) { super(cap);
