Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X e324a0ac4 -> 44e70cad3
Revert "Add the missing `serialVersionUID`" This reverts commit 0b5b808 Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/44e70cad Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/44e70cad Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/44e70cad Branch: refs/heads/GROOVY_2_6_X Commit: 44e70cad3cf4ea6f1181f6c78241bd1511fbf03d Parents: e324a0a Author: sunlan <[email protected]> Authored: Tue Apr 3 13:37:12 2018 +0800 Committer: sunlan <[email protected]> Committed: Tue Apr 3 13:37:12 2018 +0800 ---------------------------------------------------------------------- src/main/groovy/groovy/cli/TypedOption.java | 2 -- src/main/groovy/groovy/lang/Closure.java | 4 ---- src/main/groovy/groovy/lang/ClosureException.java | 1 - .../groovy/groovy/lang/DeprecationException.java | 2 -- .../groovy/groovy/lang/GroovyRuntimeException.java | 1 - .../groovy/lang/IllegalPropertyAccessException.java | 4 +--- .../lang/IncorrectClosureArgumentsException.java | 1 - .../groovy/lang/MetaClassRegistryChangeEvent.java | 1 - .../groovy/groovy/lang/MissingClassException.java | 1 - .../groovy/groovy/lang/MissingFieldException.java | 1 - .../groovy/groovy/lang/MissingMethodException.java | 1 - .../groovy/lang/MissingPropertyException.java | 1 - .../groovy/lang/ReadOnlyPropertyException.java | 2 -- .../groovy/lang/SpreadListEvaluatingException.java | 2 -- src/main/groovy/groovy/lang/SpreadMap.java | 1 - .../groovy/lang/SpreadMapEvaluatingException.java | 2 -- .../groovy/groovy/lang/StringWriterIOException.java | 2 -- src/main/groovy/groovy/lang/TrampolineClosure.java | 1 - .../groovy/security/GroovyCodeSourcePermission.java | 2 -- .../transform/stc/IncorrectTypeHintException.java | 2 -- src/main/groovy/groovy/util/NodeList.java | 2 -- src/main/groovy/groovy/util/ObjectGraphBuilder.java | 2 -- src/main/groovy/groovy/util/ResourceException.java | 2 -- src/main/groovy/groovy/util/ScriptException.java | 2 -- .../java/org/codehaus/groovy/GroovyBugError.java | 3 +-- .../java/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 - .../java/org/codehaus/groovy/antlr/LexerFrame.java | 4 ---- .../groovy/ast/tools/WideningCategories.java | 5 +---- .../groovy/classgen/ClassGeneratorException.java | 2 -- .../groovy/classgen/FinalVariableAnalyzer.java | 2 -- .../groovy/control/CompilationFailedException.java | 1 - .../groovy/control/ConfigurationException.java | 5 ++--- .../control/MultipleCompilationErrorsException.java | 3 +-- .../builder/SourceAwareCustomizerFactory.java | 4 ---- .../reflection/CacheAccessControlException.java | 2 -- .../org/codehaus/groovy/reflection/CachedClass.java | 16 ---------------- .../org/codehaus/groovy/reflection/ClassInfo.java | 2 -- .../groovy/reflection/GroovyClassValuePreJava7.java | 4 +--- .../org/codehaus/groovy/runtime/ConvertedMap.java | 2 -- .../org/codehaus/groovy/runtime/CurriedClosure.java | 1 - .../groovy/runtime/GroovyCategorySupport.java | 2 -- .../groovy/runtime/InvokerInvocationException.java | 2 -- .../groovy/runtime/IteratorClosureAdapter.java | 1 - .../groovy/runtime/ResourceGroovyMethods.java | 2 -- .../org/codehaus/groovy/runtime/WritableFile.java | 1 - .../runtime/memoize/UnlimitedConcurrentCache.java | 1 - .../runtime/metaclass/ConcurrentReaderHashMap.java | 4 +--- .../runtime/metaclass/MethodSelectionException.java | 1 - .../metaclass/MissingMethodExceptionNoStack.java | 2 -- .../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/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 - 70 files changed, 13 insertions(+), 151 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/groovy/groovy/cli/TypedOption.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/cli/TypedOption.java b/src/main/groovy/groovy/cli/TypedOption.java index 3ac915c..e669324 100644 --- a/src/main/groovy/groovy/cli/TypedOption.java +++ b/src/main/groovy/groovy/cli/TypedOption.java @@ -21,8 +21,6 @@ package groovy.cli; import java.util.HashMap; public class TypedOption<T> extends HashMap<String, T> { - private static final long serialVersionUID = 8931624081859777854L; - public T defaultValue() { return (T) super.get("defaultValue"); } http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/groovy/groovy/lang/Closure.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/Closure.java b/src/main/groovy/groovy/lang/Closure.java index 9446186..11e2611 100644 --- a/src/main/groovy/groovy/lang/Closure.java +++ b/src/main/groovy/groovy/lang/Closure.java @@ -197,8 +197,6 @@ 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; } @@ -848,8 +846,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/ClosureException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/ClosureException.java b/src/main/groovy/groovy/lang/ClosureException.java index 7a55631..12986ad 100644 --- a/src/main/groovy/groovy/lang/ClosureException.java +++ b/src/main/groovy/groovy/lang/ClosureException.java @@ -25,7 +25,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/DeprecationException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/DeprecationException.java b/src/main/groovy/groovy/lang/DeprecationException.java index 8e5d087..36ad893 100644 --- a/src/main/groovy/groovy/lang/DeprecationException.java +++ b/src/main/groovy/groovy/lang/DeprecationException.java @@ -33,8 +33,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/GroovyRuntimeException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/GroovyRuntimeException.java b/src/main/groovy/groovy/lang/GroovyRuntimeException.java index 00f8f96..33eb51c 100644 --- a/src/main/groovy/groovy/lang/GroovyRuntimeException.java +++ b/src/main/groovy/groovy/lang/GroovyRuntimeException.java @@ -28,7 +28,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/IllegalPropertyAccessException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/IllegalPropertyAccessException.java b/src/main/groovy/groovy/lang/IllegalPropertyAccessException.java index b7971d9..8227e3f 100644 --- a/src/main/groovy/groovy/lang/IllegalPropertyAccessException.java +++ b/src/main/groovy/groovy/lang/IllegalPropertyAccessException.java @@ -28,9 +28,7 @@ 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/44e70cad/src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java b/src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java index 236f399..f5b23f5 100644 --- a/src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java +++ b/src/main/groovy/groovy/lang/IncorrectClosureArgumentsException.java @@ -28,7 +28,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java b/src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java index 484efa3..c882fda 100644 --- a/src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java +++ b/src/main/groovy/groovy/lang/MetaClassRegistryChangeEvent.java @@ -26,7 +26,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/MissingClassException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/MissingClassException.java b/src/main/groovy/groovy/lang/MissingClassException.java index b3579a6..ad8e5f5 100644 --- a/src/main/groovy/groovy/lang/MissingClassException.java +++ b/src/main/groovy/groovy/lang/MissingClassException.java @@ -31,7 +31,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/MissingFieldException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/MissingFieldException.java b/src/main/groovy/groovy/lang/MissingFieldException.java index 4a222f5..3c17d39 100644 --- a/src/main/groovy/groovy/lang/MissingFieldException.java +++ b/src/main/groovy/groovy/lang/MissingFieldException.java @@ -29,7 +29,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/MissingMethodException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/MissingMethodException.java b/src/main/groovy/groovy/lang/MissingMethodException.java index b463c34..ae2eea1 100644 --- a/src/main/groovy/groovy/lang/MissingMethodException.java +++ b/src/main/groovy/groovy/lang/MissingMethodException.java @@ -30,7 +30,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/MissingPropertyException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/MissingPropertyException.java b/src/main/groovy/groovy/lang/MissingPropertyException.java index 552031a..270f039 100644 --- a/src/main/groovy/groovy/lang/MissingPropertyException.java +++ b/src/main/groovy/groovy/lang/MissingPropertyException.java @@ -32,7 +32,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/ReadOnlyPropertyException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/ReadOnlyPropertyException.java b/src/main/groovy/groovy/lang/ReadOnlyPropertyException.java index 77231d2..342a182 100644 --- a/src/main/groovy/groovy/lang/ReadOnlyPropertyException.java +++ b/src/main/groovy/groovy/lang/ReadOnlyPropertyException.java @@ -26,8 +26,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/SpreadListEvaluatingException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/SpreadListEvaluatingException.java b/src/main/groovy/groovy/lang/SpreadListEvaluatingException.java index f3360d3..b6de965 100644 --- a/src/main/groovy/groovy/lang/SpreadListEvaluatingException.java +++ b/src/main/groovy/groovy/lang/SpreadListEvaluatingException.java @@ -19,8 +19,6 @@ 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/44e70cad/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 b9d742b..0fc6542 100644 --- a/src/main/groovy/groovy/lang/SpreadMap.java +++ b/src/main/groovy/groovy/lang/SpreadMap.java @@ -32,7 +32,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java b/src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java index ee9dd21..408a223 100644 --- a/src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java +++ b/src/main/groovy/groovy/lang/SpreadMapEvaluatingException.java @@ -19,8 +19,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/StringWriterIOException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/StringWriterIOException.java b/src/main/groovy/groovy/lang/StringWriterIOException.java index 9fef866..0372399 100644 --- a/src/main/groovy/groovy/lang/StringWriterIOException.java +++ b/src/main/groovy/groovy/lang/StringWriterIOException.java @@ -27,8 +27,6 @@ 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/44e70cad/src/main/groovy/groovy/lang/TrampolineClosure.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/TrampolineClosure.java b/src/main/groovy/groovy/lang/TrampolineClosure.java index 71f31c8..ed68f00 100644 --- a/src/main/groovy/groovy/lang/TrampolineClosure.java +++ b/src/main/groovy/groovy/lang/TrampolineClosure.java @@ -30,7 +30,6 @@ 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/44e70cad/src/main/groovy/groovy/security/GroovyCodeSourcePermission.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/security/GroovyCodeSourcePermission.java b/src/main/groovy/groovy/security/GroovyCodeSourcePermission.java index 49032cd..e723e0b 100644 --- a/src/main/groovy/groovy/security/GroovyCodeSourcePermission.java +++ b/src/main/groovy/groovy/security/GroovyCodeSourcePermission.java @@ -30,8 +30,6 @@ 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/44e70cad/src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java b/src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java index 622acfd..aed167a 100644 --- a/src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java +++ b/src/main/groovy/groovy/transform/stc/IncorrectTypeHintException.java @@ -22,8 +22,6 @@ 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/44e70cad/src/main/groovy/groovy/util/NodeList.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/util/NodeList.java b/src/main/groovy/groovy/util/NodeList.java index 2822d9d..e54009c 100644 --- a/src/main/groovy/groovy/util/NodeList.java +++ b/src/main/groovy/groovy/util/NodeList.java @@ -38,8 +38,6 @@ 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/44e70cad/src/main/groovy/groovy/util/ObjectGraphBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/util/ObjectGraphBuilder.java b/src/main/groovy/groovy/util/ObjectGraphBuilder.java index ce031c7..1004369 100644 --- a/src/main/groovy/groovy/util/ObjectGraphBuilder.java +++ b/src/main/groovy/groovy/util/ObjectGraphBuilder.java @@ -78,8 +78,6 @@ 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/44e70cad/src/main/groovy/groovy/util/ResourceException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/util/ResourceException.java b/src/main/groovy/groovy/util/ResourceException.java index 0f57b53..8b31d7e 100644 --- a/src/main/groovy/groovy/util/ResourceException.java +++ b/src/main/groovy/groovy/util/ResourceException.java @@ -23,8 +23,6 @@ package groovy.util; */ public class ResourceException extends Exception { - private static final long serialVersionUID = -4640685456255837192L; - /** * */ http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/groovy/groovy/util/ScriptException.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/util/ScriptException.java b/src/main/groovy/groovy/util/ScriptException.java index 491b94a..85ce60f 100644 --- a/src/main/groovy/groovy/util/ScriptException.java +++ b/src/main/groovy/groovy/util/ScriptException.java @@ -23,8 +23,6 @@ package groovy.util; */ public class ScriptException extends Exception { - private static final long serialVersionUID = 3447547760007143671L; - /** * */ http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/GroovyBugError.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/GroovyBugError.java b/src/main/java/org/codehaus/groovy/GroovyBugError.java index 89d855d..30ed7de 100644 --- a/src/main/java/org/codehaus/groovy/GroovyBugError.java +++ b/src/main/java/org/codehaus/groovy/GroovyBugError.java @@ -26,8 +26,7 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/GroovyException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/GroovyException.java b/src/main/java/org/codehaus/groovy/GroovyException.java index 61826f5..582da48 100644 --- a/src/main/java/org/codehaus/groovy/GroovyException.java +++ b/src/main/java/org/codehaus/groovy/GroovyException.java @@ -19,7 +19,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java b/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java index 372b04d..204674b 100644 --- a/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java +++ b/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java @@ -26,7 +26,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java b/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java index 032c24d..aec85d4 100644 --- a/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java +++ b/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java @@ -24,7 +24,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java b/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java index fc62836..d256e73 100644 --- a/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java +++ b/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java @@ -33,7 +33,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java b/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java index 94dd173..ecc8098 100644 --- a/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java +++ b/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java @@ -134,8 +134,6 @@ public class LexerFrame extends JFrame implements ActionListener { } private final Action loadFileAction = new AbstractAction("Open File...") { - private static final long serialVersionUID = 4541927184172762704L; - public void actionPerformed(ActionEvent ae) { final JFileChooser jfc = new JFileChooser(); final int response = jfc.showOpenDialog(LexerFrame.this); @@ -266,8 +264,6 @@ public class LexerFrame extends JFrame implements ActionListener { } private static class HScrollableTextPane extends JTextPane { - private static final long serialVersionUID = -8582328309470654441L; - @Override public boolean getScrollableTracksViewportWidth() { return (getSize().width < getParent().getSize().width); http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/ast/tools/WideningCategories.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/ast/tools/WideningCategories.java b/src/main/java/org/codehaus/groovy/ast/tools/WideningCategories.java index 3f6efbb..57a3e15 100644 --- a/src/main/java/org/codehaus/groovy/ast/tools/WideningCategories.java +++ b/src/main/java/org/codehaus/groovy/ast/tools/WideningCategories.java @@ -75,10 +75,7 @@ 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 long serialVersionUID = -5178744121420941913L; - - { + private static final Map<ClassNode, Integer> NUMBER_TYPES_PRECEDENCE = Collections.unmodifiableMap(new HashMap<ClassNode, Integer>() {{ 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/44e70cad/src/main/java/org/codehaus/groovy/classgen/ClassGeneratorException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/ClassGeneratorException.java b/src/main/java/org/codehaus/groovy/classgen/ClassGeneratorException.java index 5c404ec..bce3448 100644 --- a/src/main/java/org/codehaus/groovy/classgen/ClassGeneratorException.java +++ b/src/main/java/org/codehaus/groovy/classgen/ClassGeneratorException.java @@ -25,8 +25,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java b/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java index 34c652a..924a76e 100644 --- a/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java +++ b/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java @@ -395,8 +395,6 @@ public class FinalVariableAnalyzer extends ClassCodeVisitorSupport { } private static class StateMap extends HashMap<Variable, VariableState> { - private static final long serialVersionUID = -5881634573411342092L; - @Override public VariableState get(final Object key) { return super.get(getTarget((Variable) key)); http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/control/CompilationFailedException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/CompilationFailedException.java b/src/main/java/org/codehaus/groovy/control/CompilationFailedException.java index 2930b8c..741b647 100644 --- a/src/main/java/org/codehaus/groovy/control/CompilationFailedException.java +++ b/src/main/java/org/codehaus/groovy/control/CompilationFailedException.java @@ -29,7 +29,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/control/ConfigurationException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/ConfigurationException.java b/src/main/java/org/codehaus/groovy/control/ConfigurationException.java index 9e226ad..3d0658a 100644 --- a/src/main/java/org/codehaus/groovy/control/ConfigurationException.java +++ b/src/main/java/org/codehaus/groovy/control/ConfigurationException.java @@ -31,9 +31,8 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java b/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java index 5e0a6e7..e53762e 100644 --- a/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java +++ b/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java @@ -28,8 +28,7 @@ import java.io.Writer; */ 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/44e70cad/src/main/java/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java b/src/main/java/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java index 1edf636..d0fc541 100644 --- a/src/main/java/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java +++ b/src/main/java/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java @@ -115,8 +115,6 @@ 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) { @@ -133,8 +131,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/reflection/CacheAccessControlException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/reflection/CacheAccessControlException.java b/src/main/java/org/codehaus/groovy/reflection/CacheAccessControlException.java index 8dfa960..c538813 100644 --- a/src/main/java/org/codehaus/groovy/reflection/CacheAccessControlException.java +++ b/src/main/java/org/codehaus/groovy/reflection/CacheAccessControlException.java @@ -21,8 +21,6 @@ package org.codehaus.groovy.reflection; import groovy.lang.GroovyRuntimeException; public class CacheAccessControlException extends GroovyRuntimeException { - private static final long serialVersionUID = -5315107566539656474L; - public CacheAccessControlException(String message, Throwable cause) { super(message, cause); } http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/reflection/CachedClass.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java index 9204be2..e1a55d7 100644 --- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java +++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java @@ -60,8 +60,6 @@ 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[]>() { @@ -79,8 +77,6 @@ public class CachedClass { }; private final 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[]>*/() { @@ -117,8 +113,6 @@ 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[]>*/() { @@ -169,8 +163,6 @@ public class CachedClass { }; private final LazyReference<CachedClass> cachedSuperClass = new LazyReference<CachedClass>(softBundle) { - private static final long serialVersionUID = -4663740963306806058L; - public CachedClass initValue() { if (!isArray) return ReflectionCache.getCachedClass(getTheClass().getSuperclass()); @@ -183,8 +175,6 @@ 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>() { @@ -196,8 +186,6 @@ 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> (); @@ -225,8 +213,6 @@ 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); @@ -239,8 +225,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java b/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java index 1067e4b..c7abeff 100644 --- a/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java +++ b/src/main/java/org/codehaus/groovy/reflection/ClassInfo.java @@ -441,7 +441,6 @@ 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) { @@ -455,7 +454,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java b/src/main/java/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java index 02f893c..56ad0c1 100644 --- a/src/main/java/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java +++ b/src/main/java/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java @@ -54,9 +54,7 @@ class GroovyClassValuePreJava7<T> implements GroovyClassValue<T> { private class GroovyClassValuePreJava7Segment extends ManagedConcurrentMap.Segment<Class<?>,T> { - private static final long serialVersionUID = 1289753977947029168L; - - GroovyClassValuePreJava7Segment(ReferenceBundle bundle, int initialCapacity) { + GroovyClassValuePreJava7Segment(ReferenceBundle bundle, int initialCapacity) { super(bundle, initialCapacity); } http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/runtime/ConvertedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/ConvertedMap.java b/src/main/java/org/codehaus/groovy/runtime/ConvertedMap.java index 9bc71fa..393d55e 100644 --- a/src/main/java/org/codehaus/groovy/runtime/ConvertedMap.java +++ b/src/main/java/org/codehaus/groovy/runtime/ConvertedMap.java @@ -31,8 +31,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/CurriedClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/CurriedClosure.java b/src/main/java/org/codehaus/groovy/runtime/CurriedClosure.java index 1db1037..cabe230 100644 --- a/src/main/java/org/codehaus/groovy/runtime/CurriedClosure.java +++ b/src/main/java/org/codehaus/groovy/runtime/CurriedClosure.java @@ -46,7 +46,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/GroovyCategorySupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/GroovyCategorySupport.java b/src/main/java/org/codehaus/groovy/runtime/GroovyCategorySupport.java index 05ce6b0..19f53d2 100644 --- a/src/main/java/org/codehaus/groovy/runtime/GroovyCategorySupport.java +++ b/src/main/java/org/codehaus/groovy/runtime/GroovyCategorySupport.java @@ -47,7 +47,6 @@ 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; @@ -73,7 +72,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/InvokerInvocationException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/InvokerInvocationException.java b/src/main/java/org/codehaus/groovy/runtime/InvokerInvocationException.java index da85b6b..2f03126 100644 --- a/src/main/java/org/codehaus/groovy/runtime/InvokerInvocationException.java +++ b/src/main/java/org/codehaus/groovy/runtime/InvokerInvocationException.java @@ -29,8 +29,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java b/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java index 7f098d7..24d74f6 100644 --- a/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java +++ b/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java @@ -32,7 +32,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java index a47adab..4d3eeb6 100644 --- a/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/runtime/ResourceGroovyMethods.java @@ -142,8 +142,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/WritableFile.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/WritableFile.java b/src/main/java/org/codehaus/groovy/runtime/WritableFile.java index 21a9e40..ec2f481 100644 --- a/src/main/java/org/codehaus/groovy/runtime/WritableFile.java +++ b/src/main/java/org/codehaus/groovy/runtime/WritableFile.java @@ -32,7 +32,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java index 00d8326..04bce56 100644 --- a/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java +++ b/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java @@ -32,7 +32,6 @@ import java.util.concurrent.ConcurrentHashMap; */ @ThreadSafe public final class UnlimitedConcurrentCache<K, V> implements EvictableCache<K, V>, Serializable { - private static final long serialVersionUID = -2062728248439701004L; private final ConcurrentHashMap<K, V> map; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java index 2d501b3..68fe42d 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java @@ -166,9 +166,7 @@ public class ConcurrentReaderHashMap */ /** A Serializable class for barrier lock **/ - protected static class BarrierLock implements java.io.Serializable { - private static final long serialVersionUID = -5403150101810674636L; - } + protected static class BarrierLock implements java.io.Serializable { } /** * Lock used only for its memory effects. http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java index 4f0cc4c..a9f5538 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java @@ -37,7 +37,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java index 80836c7..28437d2 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java @@ -22,8 +22,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java index a177eab..0b2c33f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java @@ -22,8 +22,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java b/src/main/java/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java index b79f0d7..d6ef9de 100644 --- a/src/main/java/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java +++ b/src/main/java/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java @@ -24,8 +24,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java b/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java index b7a6bd8..431dd08 100644 --- a/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java +++ b/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java @@ -27,8 +27,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java index f9cace8..e2fc66a 100644 --- a/src/main/java/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java +++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java @@ -20,8 +20,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/syntax/ParserException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/syntax/ParserException.java b/src/main/java/org/codehaus/groovy/syntax/ParserException.java index beedb1c..2215429 100644 --- a/src/main/java/org/codehaus/groovy/syntax/ParserException.java +++ b/src/main/java/org/codehaus/groovy/syntax/ParserException.java @@ -19,8 +19,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/syntax/ReadException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/syntax/ReadException.java b/src/main/java/org/codehaus/groovy/syntax/ReadException.java index af70dd0..6885c24 100644 --- a/src/main/java/org/codehaus/groovy/syntax/ReadException.java +++ b/src/main/java/org/codehaus/groovy/syntax/ReadException.java @@ -27,7 +27,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/syntax/RuntimeParserException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/syntax/RuntimeParserException.java b/src/main/java/org/codehaus/groovy/syntax/RuntimeParserException.java index ce804e1..c47bc26 100644 --- a/src/main/java/org/codehaus/groovy/syntax/RuntimeParserException.java +++ b/src/main/java/org/codehaus/groovy/syntax/RuntimeParserException.java @@ -29,8 +29,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/syntax/TokenException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/syntax/TokenException.java b/src/main/java/org/codehaus/groovy/syntax/TokenException.java index fea3ec2..5c9f275 100644 --- a/src/main/java/org/codehaus/groovy/syntax/TokenException.java +++ b/src/main/java/org/codehaus/groovy/syntax/TokenException.java @@ -19,8 +19,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/syntax/TokenMismatchException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/syntax/TokenMismatchException.java b/src/main/java/org/codehaus/groovy/syntax/TokenMismatchException.java index 3f799fa..32c90a5 100644 --- a/src/main/java/org/codehaus/groovy/syntax/TokenMismatchException.java +++ b/src/main/java/org/codehaus/groovy/syntax/TokenMismatchException.java @@ -19,7 +19,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java b/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java index 4d5117d..74f9fff 100644 --- a/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java +++ b/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java @@ -24,9 +24,7 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java b/src/main/java/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java index fbb3fe3..90c956c 100644 --- a/src/main/java/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java +++ b/src/main/java/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java @@ -56,10 +56,7 @@ 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>() { - private static final long serialVersionUID = -9117028399464862605L; - - { + protected static final Map<Integer, MethodNode> BYTECODE_BINARY_ADAPTERS = Collections.unmodifiableMap(new HashMap<Integer, MethodNode>() {{ 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/44e70cad/src/main/java/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java b/src/main/java/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java index d6cae87..8e2fad7 100644 --- a/src/main/java/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java +++ b/src/main/java/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java @@ -436,7 +436,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java index 6254b0a..52ccdf1 100644 --- a/src/main/java/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java +++ b/src/main/java/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java @@ -65,10 +65,7 @@ public class GroovyTypeCheckingExtensionSupport extends AbstractTypeCheckingExte // method name to DSL name private static final Map<String, String> METHOD_ALIASES = Collections.unmodifiableMap( - new HashMap<String, String>() { - private static final long serialVersionUID = 8938707932245818749L; - - { + new HashMap<String, String>() {{ put("onMethodSelection", "onMethodSelection"); put("afterMethodCall", "afterMethodCall"); put("beforeMethodCall", "beforeMethodCall"); http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java index f07dd97..8b94a1d 100644 --- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -165,10 +165,7 @@ 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>() { - private static final long serialVersionUID = 8841951852732042766L; - - { + new HashMap<ClassNode, Integer>() {{ put(byte_TYPE, 0); put(Byte_TYPE, 0); put(short_TYPE, 1); @@ -184,10 +181,7 @@ public abstract class StaticTypeCheckingSupport { }}); protected static final Map<String, Integer> NUMBER_OPS = Collections.unmodifiableMap( - new HashMap<String, Integer>() { - private static final long serialVersionUID = 6951856193525808411L; - - { + new HashMap<String, Integer>() {{ put("plus", PLUS); put("minus", MINUS); put("multiply", MULTIPLY); http://git-wip-us.apache.org/repos/asf/groovy/blob/44e70cad/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java index 349c930..d60396b 100644 --- a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java +++ b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java @@ -50,8 +50,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java index 2cfc82a..b21c0af 100644 --- a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java +++ b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java @@ -154,7 +154,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/util/LazyReference.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/util/LazyReference.java b/src/main/java/org/codehaus/groovy/util/LazyReference.java index 54e0ab2..fc34803 100644 --- a/src/main/java/org/codehaus/groovy/util/LazyReference.java +++ b/src/main/java/org/codehaus/groovy/util/LazyReference.java @@ -24,7 +24,6 @@ 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/44e70cad/src/main/java/org/codehaus/groovy/util/ManagedConcurrentMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/util/ManagedConcurrentMap.java b/src/main/java/org/codehaus/groovy/util/ManagedConcurrentMap.java index da06275..209de66 100644 --- a/src/main/java/org/codehaus/groovy/util/ManagedConcurrentMap.java +++ b/src/main/java/org/codehaus/groovy/util/ManagedConcurrentMap.java @@ -33,7 +33,6 @@ 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);
