Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 431623ac7 -> e324a0ac4
Optimize imports Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e324a0ac Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e324a0ac Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e324a0ac Branch: refs/heads/GROOVY_2_6_X Commit: e324a0ac4d4dfd9a6340d2a952f51d2d4407e018 Parents: 431623a Author: sunlan <[email protected]> Authored: Tue Apr 3 08:32:17 2018 +0800 Committer: sunlan <[email protected]> Committed: Tue Apr 3 08:32:29 2018 +0800 ---------------------------------------------------------------------- .../java/org/codehaus/groovy/ast/ClassNode.java | 2 -- .../groovy/ast/decompiled/AsmDecompiler.java | 1 - .../ast/decompiled/FormalParameterParser.java | 1 - .../ast/decompiled/TypeSignatureParser.java | 1 - .../asm/sc/StaticTypesStatementWriter.java | 1 - .../classgen/asm/util/LoggableClassVisitor.java | 1 - .../groovy/control/CompilationUnit.java | 3 --- .../groovy/runtime/DefaultGroovyMethods.java | 26 -------------------- .../java/org/codehaus/groovy/syntax/Types.java | 1 - .../transform/ToStringASTTransformation.java | 2 -- .../stc/TraitTypeCheckingExtension.java | 1 - .../vmplugin/v8/PluginDefaultGroovyMethods.java | 1 - 12 files changed, 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/ast/ClassNode.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java b/src/main/java/org/codehaus/groovy/ast/ClassNode.java index a22d9f9..78b2d41 100644 --- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java +++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java @@ -18,8 +18,6 @@ */ package org.codehaus.groovy.ast; -import groovy.lang.groovydoc.Groovydoc; -import groovy.lang.groovydoc.GroovydocHolder; import org.apache.groovy.ast.tools.ClassNodeUtils; import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.ast.expr.BinaryExpression; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java b/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java index 8a789fe..75ebcbb 100644 --- a/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java +++ b/src/main/java/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java @@ -25,7 +25,6 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import java.io.BufferedInputStream; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java b/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java index bb01a95..0c0603a 100644 --- a/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java +++ b/src/main/java/org/codehaus/groovy/ast/decompiled/FormalParameterParser.java @@ -22,7 +22,6 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.GenericsType; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.vmplugin.v5.Java5; -import org.objectweb.asm.Opcodes; import org.objectweb.asm.signature.SignatureVisitor; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java b/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java index 7b217fc..21a7e6c 100644 --- a/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java +++ b/src/main/java/org/codehaus/groovy/ast/decompiled/TypeSignatureParser.java @@ -23,7 +23,6 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.GenericsType; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.vmplugin.v5.Java5; -import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.signature.SignatureVisitor; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java index c27ae5f..cabc3c4 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java @@ -27,7 +27,6 @@ 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.BytecodeHelper; import org.codehaus.groovy.classgen.asm.BytecodeVariable; import org.codehaus.groovy.classgen.asm.CompileStack; import org.codehaus.groovy.classgen.asm.MethodCaller; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableClassVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableClassVisitor.java b/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableClassVisitor.java index c102f69..dd86cbb 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableClassVisitor.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableClassVisitor.java @@ -20,7 +20,6 @@ package org.codehaus.groovy.classgen.asm.util; import org.codehaus.groovy.control.CompilerConfiguration; import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Opcodes; import org.objectweb.asm.util.TraceClassVisitor; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/control/CompilationUnit.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java index b47a653..edb4e8e 100644 --- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java +++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java @@ -52,14 +52,11 @@ import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys; import org.codehaus.groovy.transform.trait.TraitComposer; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.util.Textifier; -import org.objectweb.asm.util.TraceClassVisitor; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.PrintWriter; import java.net.URL; import java.security.CodeSource; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java index b2c9448..07b7c25 100644 --- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java @@ -18,14 +18,12 @@ */ package org.codehaus.groovy.runtime; -import groovy.io.FileType; import groovy.io.GroovyPrintWriter; import groovy.lang.Closure; import groovy.lang.DelegatesTo; import groovy.lang.DelegatingMetaClass; import groovy.lang.EmptyRange; import groovy.lang.ExpandoMetaClass; -import groovy.lang.GString; import groovy.lang.GroovyObject; import groovy.lang.GroovyRuntimeException; import groovy.lang.GroovySystem; @@ -44,7 +42,6 @@ import groovy.lang.PropertyValue; import groovy.lang.Range; import groovy.lang.SpreadMap; import groovy.lang.Tuple2; -import groovy.lang.Writable; import groovy.transform.stc.ClosureParams; import groovy.transform.stc.FirstParam; import groovy.transform.stc.FromString; @@ -97,25 +94,10 @@ import org.codehaus.groovy.util.ArrayIterator; import org.codehaus.groovy.util.IteratorBufferedIterator; import org.codehaus.groovy.util.ListBufferedIterator; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; import java.io.PrintStream; import java.io.PrintWriter; -import java.io.Reader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; import java.io.Writer; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Array; @@ -126,12 +108,6 @@ import java.lang.reflect.Proxy; import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; -import java.net.MalformedURLException; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; import java.text.MessageFormat; @@ -164,8 +140,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.BlockingQueue; import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/syntax/Types.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/syntax/Types.java b/src/main/java/org/codehaus/groovy/syntax/Types.java index a793d28..6feeed5 100644 --- a/src/main/java/org/codehaus/groovy/syntax/Types.java +++ b/src/main/java/org/codehaus/groovy/syntax/Types.java @@ -25,7 +25,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java index 018079d..3a76685 100644 --- a/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java @@ -34,7 +34,6 @@ import org.codehaus.groovy.ast.expr.MethodCallExpression; import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.Statement; -import org.codehaus.groovy.ast.tools.BeanUtils; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.runtime.DefaultGroovyMethods; @@ -57,7 +56,6 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; import static org.codehaus.groovy.ast.tools.GeneralUtils.declS; import static org.codehaus.groovy.ast.tools.GeneralUtils.equalsNullX; import static org.codehaus.groovy.ast.tools.GeneralUtils.getAllProperties; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getInstanceNonPropertyFields; import static org.codehaus.groovy.ast.tools.GeneralUtils.getterThisX; import static org.codehaus.groovy.ast.tools.GeneralUtils.hasDeclaredMethod; import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java b/src/main/java/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java index 2e98b48..7922770 100644 --- a/src/main/java/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java +++ b/src/main/java/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java @@ -29,7 +29,6 @@ import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.transform.trait.TraitASTTransformation; import org.codehaus.groovy.transform.trait.Traits; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/e324a0ac/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java index 4114a76..da0a6fb 100644 --- a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java @@ -26,7 +26,6 @@ import java.util.Spliterator; import java.util.Spliterators; import java.util.stream.BaseStream; import java.util.stream.Collectors; -import java.util.stream.IntStream; import java.util.stream.Stream; import java.util.stream.StreamSupport;
