remove checkstyle warnings (ported)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f3029967 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f3029967 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f3029967 Branch: refs/heads/GROOVY_2_4_X Commit: f302996794a1bcaead336eb32efd32b1c1a6844e Parents: d96256c Author: paulk <[email protected]> Authored: Thu Dec 29 22:30:38 2016 +1000 Committer: paulk <[email protected]> Committed: Thu Dec 29 22:42:52 2016 +1000 ---------------------------------------------------------------------- src/main/groovy/lang/GroovyClassLoader.java | 2 +- src/main/groovy/ui/GroovyMain.java | 6 +++--- src/main/groovy/ui/GroovySocketServer.java | 4 ++-- src/main/groovy/util/ConfigObject.java | 2 +- src/main/org/codehaus/groovy/GroovyBugError.java | 2 +- src/main/org/codehaus/groovy/classgen/Verifier.java | 2 +- .../org/codehaus/groovy/classgen/asm/MopWriter.java | 7 ++++--- .../classgen/asm/sc/StaticTypesClosureWriter.java | 2 +- .../groovy/control/ASTTransformationsContext.java | 1 - .../org/codehaus/groovy/control/StaticVerifier.java | 3 ++- .../groovy/control/customizers/ImportCustomizer.java | 2 +- .../groovy/control/customizers/SecureASTCustomizer.java | 4 ++-- .../customizers/builder/ImportCustomizerFactory.java | 2 +- src/main/org/codehaus/groovy/reflection/ClassInfo.java | 2 +- .../codehaus/groovy/reflection/GroovyClassValue.java | 2 +- .../groovy/reflection/GroovyClassValueFactory.java | 2 +- .../org/codehaus/groovy/runtime/IOGroovyMethods.java | 2 +- .../codehaus/groovy/runtime/ResourceGroovyMethods.java | 4 ++-- .../codehaus/groovy/runtime/SocketGroovyMethods.java | 4 ++-- .../codehaus/groovy/runtime/StringGroovyMethods.java | 12 ++++++------ .../groovy/runtime/metaclass/MetaMethodIndex.java | 4 ++-- .../groovy/transform/stc/StaticTypeCheckingSupport.java | 2 +- src/main/org/codehaus/groovy/util/ListHashMap.java | 7 ++++--- 23 files changed, 41 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/groovy/lang/GroovyClassLoader.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/GroovyClassLoader.java b/src/main/groovy/lang/GroovyClassLoader.java index ac1f9f9..a9b5894 100644 --- a/src/main/groovy/lang/GroovyClassLoader.java +++ b/src/main/groovy/lang/GroovyClassLoader.java @@ -977,7 +977,7 @@ public class GroovyClassLoader extends URLClassLoader { } private static class TimestampAdder extends CompilationUnit.PrimaryClassNodeOperation implements Opcodes { - private final static TimestampAdder INSTANCE = new TimestampAdder(); + private static final TimestampAdder INSTANCE = new TimestampAdder(); private TimestampAdder() {} http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/groovy/ui/GroovyMain.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/ui/GroovyMain.java b/src/main/groovy/ui/GroovyMain.java index bd236a2..b1aea2b 100644 --- a/src/main/groovy/ui/GroovyMain.java +++ b/src/main/groovy/ui/GroovyMain.java @@ -426,7 +426,7 @@ public class GroovyMain { */ @Deprecated public String getText(String uriOrFilename) throws IOException { - if (uriPattern.matcher(uriOrFilename).matches()) { + if (URI_PATTERN.matcher(uriOrFilename).matches()) { try { return ResourceGroovyMethods.getText(new URL(uriOrFilename)); } catch (Exception e) { @@ -452,7 +452,7 @@ public class GroovyMain { if (isScriptFile) { // search for the file and if it exists don't try to use URIs ... File scriptFile = huntForTheScriptFile(script); - if (!scriptFile.exists() && uriPattern.matcher(script).matches()) { + if (!scriptFile.exists() && URI_PATTERN.matcher(script).matches()) { return new GroovyCodeSource(new URI(script)); } return new GroovyCodeSource( scriptFile ); @@ -463,7 +463,7 @@ public class GroovyMain { // RFC2396 // scheme = alpha *( alpha | digit | "+" | "-" | "." ) // match URIs but not Windows filenames, e.g.: http://cnn.com but not C:\xxx\file.ext - private static final Pattern uriPattern = Pattern.compile("\\p{Alpha}[-+.\\p{Alnum}]*:[^\\\\]*"); + private static final Pattern URI_PATTERN = Pattern.compile("\\p{Alpha}[-+.\\p{Alnum}]*:[^\\\\]*"); /** * Search for the script file, doesn't bother if it is named precisely. http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/groovy/ui/GroovySocketServer.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/ui/GroovySocketServer.java b/src/main/groovy/ui/GroovySocketServer.java index 1ad91ec..6037e0b 100644 --- a/src/main/groovy/ui/GroovySocketServer.java +++ b/src/main/groovy/ui/GroovySocketServer.java @@ -93,7 +93,7 @@ public class GroovySocketServer implements Runnable { private static GroovyCodeSource getCodeSource(boolean scriptFile, String scriptFilenameOrText) { if (scriptFile) { try { - if (uriPattern.matcher(scriptFilenameOrText).matches()) { + if (URI_PATTERN.matcher(scriptFilenameOrText).matches()) { return new GroovyCodeSource(new URI(scriptFilenameOrText)); } else { return new GroovyCodeSource(GroovyMain.searchForGroovyScriptFile(scriptFilenameOrText)); @@ -118,7 +118,7 @@ public class GroovySocketServer implements Runnable { // RFC2396 // scheme = alpha *( alpha | digit | "+" | "-" | "." ) - private static final Pattern uriPattern = Pattern.compile("\\p{Alpha}[-+.\\p{Alnum}]*:.*"); + private static final Pattern URI_PATTERN = Pattern.compile("\\p{Alpha}[-+.\\p{Alnum}]*:.*"); /** * This creates and starts the socket server on a new Thread. There is no need to call run or spawn http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/groovy/util/ConfigObject.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/util/ConfigObject.java b/src/main/groovy/util/ConfigObject.java index 8452455..6308d74 100644 --- a/src/main/groovy/util/ConfigObject.java +++ b/src/main/groovy/util/ConfigObject.java @@ -53,7 +53,7 @@ public class ConfigObject extends GroovyObjectSupport implements Writable, Map, */ private URL configFile; - private LinkedHashMap delegateMap = new LinkedHashMap(); + private HashMap delegateMap = new LinkedHashMap(); public ConfigObject(URL file) { this.configFile = file; http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/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 040c137..30ed7de 100644 --- a/src/main/org/codehaus/groovy/GroovyBugError.java +++ b/src/main/org/codehaus/groovy/GroovyBugError.java @@ -21,7 +21,7 @@ package org.codehaus.groovy; /** * This class represents an error that is thrown when a bug is * recognized inside the runtime. Basically it is thrown when - * a constraint is not fullfilled that should be fullfiled. + * a constraint is not fulfilled that should be fulfilled. * * @author Jochen Theodorou */ http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/classgen/Verifier.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/Verifier.java b/src/main/org/codehaus/groovy/classgen/Verifier.java index 78e53d0..5234f8b 100644 --- a/src/main/org/codehaus/groovy/classgen/Verifier.java +++ b/src/main/org/codehaus/groovy/classgen/Verifier.java @@ -233,7 +233,7 @@ public class Verifier implements GroovyClassVisitor, Opcodes { } private static void checkForDuplicateMethods(ClassNode cn) { - HashSet<String> descriptors = new HashSet<String>(); + Set<String> descriptors = new HashSet<String>(); for (MethodNode mn : cn.getMethods()) { if (mn.isSynthetic()) continue; String mySig = makeDescriptorWithoutReturnType(mn); http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java b/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java index 3b0df47..df6d461 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Set; import org.codehaus.groovy.ast.ClassHelper; @@ -35,7 +36,7 @@ import org.objectweb.asm.MethodVisitor; import static org.objectweb.asm.Opcodes.*; public class MopWriter { - public static interface Factory { + public interface Factory { MopWriter create(WriterController controller); } @@ -85,7 +86,7 @@ public class MopWriter { private static Set<MopKey> buildCurrentClassSignatureSet(List<MethodNode> methods) { if (methods.isEmpty()) return Collections.EMPTY_SET; - HashSet<MopKey> result = new HashSet<MopKey>(methods.size()); + Set<MopKey> result = new HashSet<MopKey>(methods.size()); for (MethodNode mn : methods) { MopKey key = new MopKey(mn.getName(), mn.getParameters()); result.add(key); @@ -105,7 +106,7 @@ public class MopWriter { * @see #generateMopCalls(LinkedList, boolean) */ private void visitMopMethodList(List<MethodNode> methods, boolean isThis, Set<MopKey> useOnlyIfDeclaredHereToo, List<String> orNameMentionedHere) { - HashMap<MopKey, MethodNode> mops = new HashMap<MopKey, MethodNode>(); + Map<MopKey, MethodNode> mops = new HashMap<MopKey, MethodNode>(); LinkedList<MethodNode> mopCalls = new LinkedList<MethodNode>(); for (MethodNode mn : methods) { // mop methods are helper for this and super calls and do direct calls http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java index 48e3d87..fc26486 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java @@ -110,7 +110,7 @@ public class StaticTypesClosureWriter extends ClosureWriter { new ReturnStatement(doCallNoArgs))); } - private static class MethodTargetCompletionVisitor extends ClassCodeVisitorSupport { + private static final class MethodTargetCompletionVisitor extends ClassCodeVisitorSupport { private final MethodNode doCallMethod; http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java b/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java index 9cc0b10..ae95275 100644 --- a/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java +++ b/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.control; import groovy.lang.GroovyClassLoader; -import org.codehaus.groovy.control.CompilationUnit; import java.util.HashSet; import java.util.Set; http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/control/StaticVerifier.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/StaticVerifier.java b/src/main/org/codehaus/groovy/control/StaticVerifier.java index 7c70bd4..67bfa13 100644 --- a/src/main/org/codehaus/groovy/control/StaticVerifier.java +++ b/src/main/org/codehaus/groovy/control/StaticVerifier.java @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Set; /** * Verifier to check non-static access in static contexts @@ -83,7 +84,7 @@ public class StaticVerifier extends ClassCodeVisitorSupport { currentMethod = node; super.visitConstructorOrMethod(node, isConstructor); if (isConstructor) { - final HashSet<String> exceptions = new HashSet<String>(); + final Set<String> exceptions = new HashSet<String>(); for (final Parameter param : node.getParameters()) { exceptions.add(param.getName()); if (param.hasInitialExpression()) { http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java index 8d5cd91..a1069c0 100644 --- a/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java +++ b/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java @@ -127,7 +127,7 @@ public class ImportCustomizer extends CompilationCustomizer { /** * Represents imports which are possibly aliased. */ - private static class Import { + private static final class Import { final ImportType type; final ClassNode classNode; final String alias; http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java index a05d899..b3d39f7 100644 --- a/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java +++ b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java @@ -1107,7 +1107,7 @@ public class SecureASTCustomizer extends CompilationCustomizer { * This interface allows the user to plugin custom expression checkers if expression blacklist or whitelist are not * sufficient */ - public static interface ExpressionChecker { + public interface ExpressionChecker { boolean isAuthorized(Expression expression); } @@ -1115,7 +1115,7 @@ public class SecureASTCustomizer extends CompilationCustomizer { * This interface allows the user to plugin custom statement checkers if statement blacklist or whitelist are not * sufficient */ - public static interface StatementChecker { + public interface StatementChecker { boolean isAuthorized(Statement expression); } http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java index 4f129fe..e9e8b7e 100644 --- a/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java +++ b/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java @@ -86,7 +86,7 @@ public class ImportCustomizerFactory extends AbstractFactory { return false; } - private static class ImportHelper { + private static final class ImportHelper { private final ImportCustomizer customizer; private ImportHelper(final ImportCustomizer customizer) { http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/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 72bc533..00190a4 100644 --- a/src/main/org/codehaus/groovy/reflection/ClassInfo.java +++ b/src/main/org/codehaus/groovy/reflection/ClassInfo.java @@ -481,7 +481,7 @@ public class ClassInfo implements Finalizable { } - public static interface ClassInfoAction { + public interface ClassInfoAction { void onClassInfo(ClassInfo classInfo); } } http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java b/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java index a15be3e..909f9b1 100644 --- a/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java +++ b/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java @@ -25,7 +25,7 @@ package org.codehaus.groovy.reflection; */ public interface GroovyClassValue<T> { - public static interface ComputeValue<T>{ + interface ComputeValue<T>{ T computeValue(Class<?> type); } http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java b/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java index 3b00638..f3d55e1 100644 --- a/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java +++ b/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java @@ -29,7 +29,7 @@ class GroovyClassValueFactory { * See https://bugs.openjdk.java.net/browse/JDK-8136353 * This issue does not exist on IBM Java (J9) so use ClassValue by default on that JVM. */ - private final static boolean USE_CLASSVALUE = Boolean.valueOf(System.getProperty("groovy.use.classvalue", "IBM J9 VM".equals(System.getProperty("java.vm.name"))?"true":"false")); + private static final boolean USE_CLASSVALUE = Boolean.valueOf(System.getProperty("groovy.use.classvalue", "IBM J9 VM".equals(System.getProperty("java.vm.name"))?"true":"false")); private static final Constructor groovyClassValueConstructor; http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java index 230a3fa..96a26eb 100644 --- a/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java @@ -1508,7 +1508,7 @@ public class IOGroovyMethods extends DefaultGroovyMethodsSupport { * from the reader when the Writable#writeTo(Writer) is called. * @since 1.0 */ - public static Writable filterLine(Reader reader, final @ClosureParams(value=SimpleType.class, options="java.lang.String") Closure closure) { + public static Writable filterLine(Reader reader, @ClosureParams(value=SimpleType.class, options="java.lang.String") final Closure closure) { final BufferedReader br = new BufferedReader(reader); return new Writable() { public Writer writeTo(Writer out) throws IOException { http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/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 d164323..9ec2660 100644 --- a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java @@ -1189,7 +1189,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport { * @see groovy.io.FileType * @since 1.7.1 */ - public static void traverse(final File self, final Map<String, Object> options, final @ClosureParams(value=SimpleType.class, options="java.io.File") Closure closure) + public static void traverse(final File self, final Map<String, Object> options, @ClosureParams(value=SimpleType.class, options="java.io.File") final Closure closure) throws FileNotFoundException, IllegalArgumentException { Number maxDepthNumber = DefaultGroovyMethods.asType(options.remove("maxDepth"), Number.class); int maxDepth = maxDepthNumber == null ? -1 : maxDepthNumber.intValue(); @@ -1267,7 +1267,7 @@ public class ResourceGroovyMethods extends DefaultGroovyMethodsSupport { * @see #traverse(java.io.File, java.util.Map, groovy.lang.Closure) * @since 1.7.1 */ - public static void traverse(final File self, final @ClosureParams(value=SimpleType.class, options="java.io.File") Closure closure) + public static void traverse(final File self, @ClosureParams(value=SimpleType.class, options="java.io.File") final Closure closure) throws FileNotFoundException, IllegalArgumentException { traverse(self, new HashMap<String, Object>(), closure); } http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java index 2162ceb..6582485 100644 --- a/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java @@ -158,7 +158,7 @@ public class SocketGroovyMethods extends DefaultGroovyMethodsSupport { * @see java.net.ServerSocket#accept() * @since 1.0 */ - public static Socket accept(ServerSocket serverSocket, final @ClosureParams(value=SimpleType.class, options="java.net.Socket") Closure closure) throws IOException { + public static Socket accept(ServerSocket serverSocket, @ClosureParams(value=SimpleType.class, options="java.net.Socket") final Closure closure) throws IOException { return accept(serverSocket, true, closure); } @@ -175,7 +175,7 @@ public class SocketGroovyMethods extends DefaultGroovyMethodsSupport { * @since 1.7.6 */ public static Socket accept(ServerSocket serverSocket, final boolean runInANewThread, - final @ClosureParams(value=SimpleType.class, options="java.net.Socket") Closure closure) throws IOException { + @ClosureParams(value=SimpleType.class, options="java.net.Socket") final Closure closure) throws IOException { final Socket socket = serverSocket.accept(); if (runInANewThread) { new Thread(new Runnable() { http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java index 9565fab..f4af313 100644 --- a/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java @@ -2595,7 +2595,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport { * @see #replaceAll(CharSequence, java.util.regex.Pattern, groovy.lang.Closure) */ @Deprecated - public static String replaceAll(final String self, final Pattern pattern, final @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) Closure closure) { + public static String replaceAll(final String self, final Pattern pattern, @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) final Closure closure) { return replaceAll((CharSequence) self, pattern, closure); } @@ -2613,7 +2613,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport { * @see #replaceAll(CharSequence, CharSequence, groovy.lang.Closure) */ @Deprecated - public static String replaceAll(final String self, final String regex, final @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) Closure closure) { + public static String replaceAll(final String self, final String regex, @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) final Closure closure) { return replaceAll((CharSequence) self, (CharSequence) regex, closure); } @@ -2653,7 +2653,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport { * @see #replaceFirst(String, String, groovy.lang.Closure) * @since 1.8.2 */ - public static String replaceFirst(final CharSequence self, final CharSequence regex, final @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) Closure closure) { + public static String replaceFirst(final CharSequence self, final CharSequence regex, @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) final Closure closure) { return replaceFirst(self, Pattern.compile(regex.toString()), closure); } @@ -2701,7 +2701,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport { * @return a CharSequence with replaced content * @since 1.8.2 */ - public static String replaceFirst(final CharSequence self, final Pattern pattern, final @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) Closure closure) { + public static String replaceFirst(final CharSequence self, final Pattern pattern, @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) final Closure closure) { final String s = self.toString(); final Matcher matcher = pattern.matcher(s); if (matcher.find()) { @@ -2720,7 +2720,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport { * @see #replaceFirst(CharSequence, java.util.regex.Pattern, groovy.lang.Closure) */ @Deprecated - public static String replaceFirst(final String self, final Pattern pattern, final @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) Closure closure) { + public static String replaceFirst(final String self, final Pattern pattern, @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) final Closure closure) { return replaceFirst((CharSequence) self, pattern, closure); } @@ -2738,7 +2738,7 @@ public class StringGroovyMethods extends DefaultGroovyMethodsSupport { * @see #replaceFirst(CharSequence, CharSequence, groovy.lang.Closure) */ @Deprecated - public static String replaceFirst(final String self, final String regex, final @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) Closure closure) { + public static String replaceFirst(final String self, final String regex, @ClosureParams(value=FromString.class, options={"List<String>","String[]"}) final Closure closure) { return replaceFirst((CharSequence) self, (CharSequence) regex, closure); } http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java index fc32607..0598f9a 100644 --- a/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java +++ b/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java @@ -47,8 +47,8 @@ public class MetaMethodIndex { } public static class CacheEntry { - final public Class [] params; - final public MetaMethod method; + public final Class [] params; + public final MetaMethod method; public CacheEntry(final Class[] params, final MetaMethod method) { this.params = params; http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/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 cfca499..5312dc2 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -2156,7 +2156,7 @@ public abstract class StaticTypeCheckingSupport { * @return a set of interfaces implemented by this class node */ public static Set<ClassNode> collectAllInterfaces(ClassNode node) { - HashSet<ClassNode> result = new HashSet<ClassNode>(); + Set<ClassNode> result = new HashSet<ClassNode>(); collectAllInterfaces(node, result); return result; } http://git-wip-us.apache.org/repos/asf/groovy/blob/f3029967/src/main/org/codehaus/groovy/util/ListHashMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/ListHashMap.java b/src/main/org/codehaus/groovy/util/ListHashMap.java index 31cd251..b1a141b 100644 --- a/src/main/org/codehaus/groovy/util/ListHashMap.java +++ b/src/main/org/codehaus/groovy/util/ListHashMap.java @@ -21,6 +21,7 @@ package org.codehaus.groovy.util; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; @@ -205,9 +206,9 @@ public class ListHashMap<K,V> implements Map<K,V> { } public Collection<V> values() { - if (innerMap==null) { - ArrayList<V> list = new ArrayList(size); - for (int i=0; i<size; i++) { + if (innerMap == null) { + List<V> list = new ArrayList<V>(size); + for (int i = 0; i < size; i++) { list.add((V) listValues[i]); } return list;
