Repository: incubator-groovy Updated Branches: refs/heads/master dfaaf67dd -> 4d2d1a435
remove some checkstyle warnings Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/4d2d1a43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/4d2d1a43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/4d2d1a43 Branch: refs/heads/master Commit: 4d2d1a435da04dfc9fadaf95e620ccc89273d5fa Parents: dfaaf67 Author: Paul King <pa...@asert.com.au> Authored: Sun May 10 11:43:43 2015 +1000 Committer: Paul King <pa...@asert.com.au> Committed: Sun May 10 11:43:43 2015 +1000 ---------------------------------------------------------------------- gradle/quality.gradle | 8 +++++-- src/main/groovy/lang/ExpandoMetaClass.java | 1 - src/main/org/codehaus/groovy/ast/ASTNode.java | 1 - .../groovy/classgen/FinalVariableAnalyzer.java | 5 ++-- .../groovy/classgen/asm/InvocationWriter.java | 1 - .../classgen/asm/sc/StaticInvocationWriter.java | 1 - .../asm/sc/StaticTypesStatementWriter.java | 8 +++++-- .../groovy/runtime/ProxyGeneratorAdapter.java | 1 - .../transform/AnnotationCollectorTransform.java | 3 +-- .../PackageScopeASTTransformation.java | 1 - .../SynchronizedASTTransformation.java | 1 - .../StaticCompilationTransformer.java | 24 ++++++++++++++++---- .../stc/StaticTypeCheckingVisitor.java | 1 - .../trait/SuperCallTraitTransformer.java | 1 - .../transform/trait/TraitASTTransformation.java | 1 - .../codehaus/groovy/transform/trait/Traits.java | 1 - .../groovy/vmplugin/v7/IndyArrayAccess.java | 1 - .../org/codehaus/groovy/vmplugin/v7/Java7.java | 3 +-- 18 files changed, 36 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/gradle/quality.gradle ---------------------------------------------------------------------- diff --git a/gradle/quality.gradle b/gradle/quality.gradle index 4da1530..1370045 100644 --- a/gradle/quality.gradle +++ b/gradle/quality.gradle @@ -68,8 +68,11 @@ allprojects { configFile = file("$rootProject.projectDir/config/checkstyle/checkstyle.xml") configProperties = ['rootProject.projectDir': rootProject.projectDir] def reportFile = file("${buildDir}/reports/checkstyle/${name}.xml") + source = sourceSets.main.allJava.matching { + // TODO why doesn't this exclusion work? + exclude '**/generated-sources/**/*' + } reports { - // TODO exclude generated-sources include ( '**/*.java') xml { destination reportFile @@ -94,7 +97,8 @@ allprojects { def xml = new XmlSlurper().parse(reportFile.newReader('utf-8')) def files = [] xml.file.each { f -> - if (f.error.size()) { + // TODO remove generated-sources check once exclude above works + if (f.error.size() && !f.@name.toString().contains('generated-sources')) { files << [ name: f.@name.toString(), errors: f.error.collect { e -> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/groovy/lang/ExpandoMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/lang/ExpandoMetaClass.java b/src/main/groovy/lang/ExpandoMetaClass.java index 2059d36..73a9baf 100644 --- a/src/main/groovy/lang/ExpandoMetaClass.java +++ b/src/main/groovy/lang/ExpandoMetaClass.java @@ -55,7 +55,6 @@ import org.codehaus.groovy.runtime.metaclass.MixinInstanceMetaMethod; import org.codehaus.groovy.runtime.metaclass.OwnedMetaClass; import org.codehaus.groovy.runtime.metaclass.ThreadManagedMetaBeanProperty; import org.codehaus.groovy.util.FastArray; -import org.objectweb.asm.Opcodes; /** * ExpandoMetaClass is a MetaClass that behaves like an Expando, allowing the addition or replacement http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/ast/ASTNode.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/ASTNode.java b/src/main/org/codehaus/groovy/ast/ASTNode.java index 8bf1957..8874794 100644 --- a/src/main/org/codehaus/groovy/ast/ASTNode.java +++ b/src/main/org/codehaus/groovy/ast/ASTNode.java @@ -22,7 +22,6 @@ import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.util.ListHashMap; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.Map; /** http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java b/src/main/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java index aa0af8a..64006c2 100644 --- a/src/main/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java +++ b/src/main/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.classgen; import org.codehaus.groovy.ast.ClassCodeVisitorSupport; -import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.Variable; import org.codehaus.groovy.ast.expr.BinaryExpression; @@ -55,7 +54,7 @@ public class FinalVariableAnalyzer extends ClassCodeVisitorSupport { private Set<VariableExpression> declaredFinalVariables = null; private boolean inAssignment = false; - private static enum VariableState { + private enum VariableState { is_uninitialized(false), is_final(true), is_var(false); @@ -94,7 +93,7 @@ public class FinalVariableAnalyzer extends ClassCodeVisitorSupport { } private Map<Variable, VariableState> pushState() { - HashMap<Variable, VariableState> state = new StateMap(); + Map<Variable, VariableState> state = new StateMap(); assignmentTracker.add(state); return state; } http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java index 19523cd..cbacce1 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java @@ -36,7 +36,6 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling; import org.codehaus.groovy.syntax.SyntaxException; -import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java index b027a8a..be657ac 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java @@ -29,7 +29,6 @@ import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.expr.*; import org.codehaus.groovy.ast.stmt.ExpressionStatement; import org.codehaus.groovy.ast.stmt.ForStatement; -import org.codehaus.groovy.ast.tools.WideningCategories; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.classgen.Verifier; import org.codehaus.groovy.classgen.asm.*; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java index cfbb833..8423dd7 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java @@ -27,13 +27,17 @@ import org.codehaus.groovy.ast.expr.MethodCallExpression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.classgen.AsmClassGenerator; -import org.codehaus.groovy.classgen.asm.*; +import org.codehaus.groovy.classgen.asm.BytecodeVariable; +import org.codehaus.groovy.classgen.asm.CompileStack; +import org.codehaus.groovy.classgen.asm.MethodCaller; +import org.codehaus.groovy.classgen.asm.OperandStack; +import org.codehaus.groovy.classgen.asm.StatementWriter; +import org.codehaus.groovy.classgen.asm.TypeChooser; import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import java.util.Enumeration; -import java.util.Iterator; import static org.objectweb.asm.Opcodes.*; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java index cd9ded4..864e7e2 100644 --- a/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java +++ b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java @@ -24,7 +24,6 @@ import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; import groovy.transform.Trait; -import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.classgen.asm.BytecodeHelper; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java index 0b39df7..c593111 100644 --- a/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java +++ b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java @@ -28,7 +28,6 @@ import org.codehaus.groovy.ast.*; import org.codehaus.groovy.ast.expr.*; import org.codehaus.groovy.ast.stmt.ReturnStatement; import org.codehaus.groovy.ast.stmt.Statement; -import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.messages.SyntaxErrorMessage; import org.codehaus.groovy.syntax.SyntaxException; @@ -57,7 +56,7 @@ public class AnnotationCollectorTransform { } /** - * Class used by {@link CompilationUnit} to transform the alias class + * Class used by {@link org.codehaus.groovy.control.CompilationUnit} to transform the alias class * into what is needed by the compiler. This means removing invalid * modifiers, interfaces and superclasses, as well as adding a static * value method returning our serialized version of the data for processing http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java b/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java index c0966ee..616fd5d 100644 --- a/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java @@ -38,7 +38,6 @@ import org.codehaus.groovy.ast.expr.PropertyExpression; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java b/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java index daa9dd4..bc944a4 100644 --- a/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java @@ -33,7 +33,6 @@ import org.codehaus.groovy.ast.stmt.SynchronizedStatement; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; -import java.util.Arrays; import java.util.Collections; import static org.codehaus.groovy.ast.ClassHelper.make; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java index 6bb4604..6242762 100644 --- a/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java +++ b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java @@ -18,17 +18,33 @@ */ package org.codehaus.groovy.transform.sc.transformers; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ClassCodeExpressionTransformer; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.ListExpression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.RangeExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.classgen.asm.sc.StaticTypesTypeChooser; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.syntax.Types; -import org.codehaus.groovy.transform.sc.StaticCompilationVisitor; import org.codehaus.groovy.transform.stc.StaticTypeCheckingVisitor; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; /** * Some expressions use symbols as aliases to method calls (<<, +=, ...). In static compilation, http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java index e4b3ed7..9328d75 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java @@ -22,7 +22,6 @@ import groovy.lang.Closure; import groovy.lang.DelegatesTo; import groovy.lang.IntRange; import groovy.lang.Range; -import groovy.transform.SelfType; import groovy.transform.TypeChecked; import groovy.transform.TypeCheckingMode; import groovy.transform.stc.ClosureParams; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java index 7755b67..e403a2c 100644 --- a/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java +++ b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java @@ -33,7 +33,6 @@ import org.codehaus.groovy.ast.expr.TupleExpression; import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.Types; -import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java index 0d4d4bd..6479e07 100644 --- a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java @@ -58,7 +58,6 @@ import org.codehaus.groovy.syntax.Types; import org.codehaus.groovy.transform.ASTTransformationCollectorCodeVisitor; import org.codehaus.groovy.transform.AbstractASTTransformation; import org.codehaus.groovy.transform.GroovyASTTransformation; -import org.codehaus.groovy.transform.sc.StaticCompileTransformation; import java.lang.reflect.Modifier; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/transform/trait/Traits.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/Traits.java b/src/main/org/codehaus/groovy/transform/trait/Traits.java index 9519e37..61d602f 100644 --- a/src/main/org/codehaus/groovy/transform/trait/Traits.java +++ b/src/main/org/codehaus/groovy/transform/trait/Traits.java @@ -34,7 +34,6 @@ import org.codehaus.groovy.ast.expr.ListExpression; import org.codehaus.groovy.ast.tools.GenericsUtils; import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.runtime.DefaultGroovyMethods; -import org.codehaus.groovy.transform.stc.Receiver; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java index d7ecf23..8709c47 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java @@ -24,7 +24,6 @@ import java.lang.invoke.MethodType; import java.util.HashMap; import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport; /** * Class for handling array access through invokedynamic using static callsite information http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4d2d1a43/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java b/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java index 0688336..4a26d82 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java @@ -24,7 +24,6 @@ import org.codehaus.groovy.vmplugin.v6.Java6; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; @@ -37,7 +36,7 @@ import java.security.PrivilegedAction; * @author Jochen Theodorou */ public class Java7 extends Java6 { - private final static Constructor<MethodHandles.Lookup> LOOKUP_Constructor; + private static final Constructor<MethodHandles.Lookup> LOOKUP_Constructor; static { Constructor<MethodHandles.Lookup> con = null; try {
