diff options
313 files changed, 1339 insertions, 872 deletions
@@ -235,8 +235,18 @@ </fileset> <arg value="-DNO_AOP" /> </munge> - <replace file="build/no_aop/common.xml" token="<zipfileset src="${common.basedir}/lib/build/asm-3.3.1.jar"/>" value=""/> - <replace file="build/no_aop/common.xml" token="<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"/>" value=""/> + <replace file="build/no_aop/common.xml" value=""> + <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-3.3.1.jar"/>]]></replacetoken> + </replace> + <replace file="build/no_aop/common.xml" value=""> + <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"/>]]></replacetoken> + </replace> + <replace file="build/no_aop/common.xml" value=""> + <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"> + <include name="LICENSE"/> + <include name="NOTICE"/> + </zipfileset>]]></replacetoken> + </replace> </target> <target name="clean.all" @@ -165,8 +165,8 @@ classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/> <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar"> <zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"> - <include name="LICENSE"/> - <include name="NOTICE"/> + <include name="LICENSE"/> + <include name="NOTICE"/> </zipfileset> <fileset dir="${build.dir}/classes"/> <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/> diff --git a/core/src/com/google/inject/AbstractModule.java b/core/src/com/google/inject/AbstractModule.java index 67f4470c..152d4440 100644 --- a/core/src/com/google/inject/AbstractModule.java +++ b/core/src/com/google/inject/AbstractModule.java @@ -16,16 +16,18 @@ package com.google.inject; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.inject.binder.AnnotatedBindingBuilder; import com.google.inject.binder.AnnotatedConstantBindingBuilder; import com.google.inject.binder.LinkedBindingBuilder; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; import com.google.inject.matcher.Matcher; import com.google.inject.spi.Message; import com.google.inject.spi.ProvisionListener; import com.google.inject.spi.TypeConverter; import com.google.inject.spi.TypeListener; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/Binder.java b/core/src/com/google/inject/Binder.java index c39584b6..cb58ca6c 100644 --- a/core/src/com/google/inject/Binder.java +++ b/core/src/com/google/inject/Binder.java @@ -24,6 +24,7 @@ import com.google.inject.spi.Message; import com.google.inject.spi.ProvisionListener; import com.google.inject.spi.TypeConverter; import com.google.inject.spi.TypeListener; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Proxy; diff --git a/core/src/com/google/inject/BindingAnnotation.java b/core/src/com/google/inject/BindingAnnotation.java index 110630b8..2d373e43 100644 --- a/core/src/com/google/inject/BindingAnnotation.java +++ b/core/src/com/google/inject/BindingAnnotation.java @@ -17,8 +17,9 @@ package com.google.inject; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/ConfigurationException.java b/core/src/com/google/inject/ConfigurationException.java index 6878d229..e298cff8 100644 --- a/core/src/com/google/inject/ConfigurationException.java +++ b/core/src/com/google/inject/ConfigurationException.java @@ -16,10 +16,12 @@ package com.google.inject; -import com.google.inject.internal.Errors; import static com.google.common.base.Preconditions.checkState; + import com.google.common.collect.ImmutableSet; +import com.google.inject.internal.Errors; import com.google.inject.spi.Message; + import java.util.Collection; /** diff --git a/core/src/com/google/inject/CreationException.java b/core/src/com/google/inject/CreationException.java index 6b8e5d2c..ceca03b3 100644 --- a/core/src/com/google/inject/CreationException.java +++ b/core/src/com/google/inject/CreationException.java @@ -16,10 +16,12 @@ package com.google.inject; -import com.google.inject.internal.Errors; -import com.google.common.collect.ImmutableSet; import static com.google.common.base.Preconditions.checkArgument; + +import com.google.common.collect.ImmutableSet; +import com.google.inject.internal.Errors; import com.google.inject.spi.Message; + import java.util.Collection; /** diff --git a/core/src/com/google/inject/Exposed.java b/core/src/com/google/inject/Exposed.java index 90e4a1c3..45a448fe 100644 --- a/core/src/com/google/inject/Exposed.java +++ b/core/src/com/google/inject/Exposed.java @@ -16,10 +16,11 @@ package com.google.inject; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/Guice.java b/core/src/com/google/inject/Guice.java index 3c6da0fa..9b21193b 100644 --- a/core/src/com/google/inject/Guice.java +++ b/core/src/com/google/inject/Guice.java @@ -16,10 +16,9 @@ package com.google.inject; -import java.util.Arrays; - import com.google.inject.internal.InternalInjectorCreator; +import java.util.Arrays; /** * The entry point to the Guice framework. Creates {@link Injector}s from diff --git a/core/src/com/google/inject/ImplementedBy.java b/core/src/com/google/inject/ImplementedBy.java index e0ba497d..464a279e 100644 --- a/core/src/com/google/inject/ImplementedBy.java +++ b/core/src/com/google/inject/ImplementedBy.java @@ -17,8 +17,9 @@ package com.google.inject; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/Inject.java b/core/src/com/google/inject/Inject.java index d0535f2d..e96dfa9c 100644 --- a/core/src/com/google/inject/Inject.java +++ b/core/src/com/google/inject/Inject.java @@ -16,12 +16,13 @@ package com.google.inject; -import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/Injector.java b/core/src/com/google/inject/Injector.java index 47eee017..42c7331d 100644 --- a/core/src/com/google/inject/Injector.java +++ b/core/src/com/google/inject/Injector.java @@ -16,13 +16,13 @@ package com.google.inject; +import com.google.inject.spi.TypeConverterBinding; + import java.lang.annotation.Annotation; import java.util.List; import java.util.Map; import java.util.Set; -import com.google.inject.spi.TypeConverterBinding; - /** * Builds the graphs of objects that make up your application. The injector tracks the dependencies * for each type and uses bindings to inject them. This is the core of Guice, although you rarely diff --git a/core/src/com/google/inject/Key.java b/core/src/com/google/inject/Key.java index 911bb01c..89841207 100644 --- a/core/src/com/google/inject/Key.java +++ b/core/src/com/google/inject/Key.java @@ -16,10 +16,12 @@ package com.google.inject; -import com.google.inject.internal.Annotations; -import com.google.inject.internal.MoreTypes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.inject.internal.Annotations; +import com.google.inject.internal.MoreTypes; + import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/core/src/com/google/inject/PrivateModule.java b/core/src/com/google/inject/PrivateModule.java index 2a5711c7..7fdc181a 100644 --- a/core/src/com/google/inject/PrivateModule.java +++ b/core/src/com/google/inject/PrivateModule.java @@ -16,15 +16,17 @@ package com.google.inject; +import static com.google.common.base.Preconditions.checkState; + import com.google.inject.binder.AnnotatedBindingBuilder; import com.google.inject.binder.AnnotatedConstantBindingBuilder; import com.google.inject.binder.AnnotatedElementBuilder; import com.google.inject.binder.LinkedBindingBuilder; -import static com.google.common.base.Preconditions.checkState; import com.google.inject.matcher.Matcher; import com.google.inject.spi.Message; import com.google.inject.spi.TypeConverter; import com.google.inject.spi.TypeListener; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/ProvidedBy.java b/core/src/com/google/inject/ProvidedBy.java index 9df67d94..7ad12f78 100644 --- a/core/src/com/google/inject/ProvidedBy.java +++ b/core/src/com/google/inject/ProvidedBy.java @@ -17,8 +17,9 @@ package com.google.inject; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/Provides.java b/core/src/com/google/inject/Provides.java index 21844b53..ca7aa656 100644 --- a/core/src/com/google/inject/Provides.java +++ b/core/src/com/google/inject/Provides.java @@ -16,10 +16,11 @@ package com.google.inject; -import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/ProvisionException.java b/core/src/com/google/inject/ProvisionException.java index d9100b97..4d6afcdb 100644 --- a/core/src/com/google/inject/ProvisionException.java +++ b/core/src/com/google/inject/ProvisionException.java @@ -16,11 +16,13 @@ package com.google.inject; -import com.google.inject.internal.Errors; +import static com.google.common.base.Preconditions.checkArgument; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import static com.google.common.base.Preconditions.checkArgument; +import com.google.inject.internal.Errors; import com.google.inject.spi.Message; + import java.util.Collection; /** diff --git a/core/src/com/google/inject/ScopeAnnotation.java b/core/src/com/google/inject/ScopeAnnotation.java index 6a3084bd..8f869a09 100644 --- a/core/src/com/google/inject/ScopeAnnotation.java +++ b/core/src/com/google/inject/ScopeAnnotation.java @@ -17,8 +17,9 @@ package com.google.inject; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/Singleton.java b/core/src/com/google/inject/Singleton.java index c0c6e54a..0ea9a14d 100644 --- a/core/src/com/google/inject/Singleton.java +++ b/core/src/com/google/inject/Singleton.java @@ -16,9 +16,10 @@ package com.google.inject; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/TypeLiteral.java b/core/src/com/google/inject/TypeLiteral.java index 174404e8..61034b30 100644 --- a/core/src/com/google/inject/TypeLiteral.java +++ b/core/src/com/google/inject/TypeLiteral.java @@ -16,12 +16,14 @@ package com.google.inject; -import com.google.inject.internal.MoreTypes; -import static com.google.inject.internal.MoreTypes.canonicalize; -import com.google.common.collect.ImmutableList; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.inject.internal.MoreTypes.canonicalize; + +import com.google.common.collect.ImmutableList; +import com.google.inject.internal.MoreTypes; import com.google.inject.util.Types; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.GenericArrayType; diff --git a/core/src/com/google/inject/binder/LinkedBindingBuilder.java b/core/src/com/google/inject/binder/LinkedBindingBuilder.java index 9c13d953..08ca1eff 100644 --- a/core/src/com/google/inject/binder/LinkedBindingBuilder.java +++ b/core/src/com/google/inject/binder/LinkedBindingBuilder.java @@ -19,6 +19,7 @@ package com.google.inject.binder; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.TypeLiteral; + import java.lang.reflect.Constructor; /** diff --git a/core/src/com/google/inject/binder/ScopedBindingBuilder.java b/core/src/com/google/inject/binder/ScopedBindingBuilder.java index a6011398..ceb8497d 100644 --- a/core/src/com/google/inject/binder/ScopedBindingBuilder.java +++ b/core/src/com/google/inject/binder/ScopedBindingBuilder.java @@ -17,6 +17,7 @@ package com.google.inject.binder; import com.google.inject.Scope; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/internal/AbstractBindingBuilder.java b/core/src/com/google/inject/internal/AbstractBindingBuilder.java index d7d49525..e803b75a 100644 --- a/core/src/com/google/inject/internal/AbstractBindingBuilder.java +++ b/core/src/com/google/inject/internal/AbstractBindingBuilder.java @@ -16,12 +16,14 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Scope; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.spi.Element; import com.google.inject.spi.InstanceBinding; + import java.lang.annotation.Annotation; import java.util.List; diff --git a/core/src/com/google/inject/internal/AbstractBindingProcessor.java b/core/src/com/google/inject/internal/AbstractBindingProcessor.java index 7feab8aa..f09c40b4 100644 --- a/core/src/com/google/inject/internal/AbstractBindingProcessor.java +++ b/core/src/com/google/inject/internal/AbstractBindingProcessor.java @@ -16,8 +16,7 @@ package com.google.inject.internal; -import java.util.Set; - +import com.google.common.collect.ImmutableSet; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -28,9 +27,10 @@ import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.Scope; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; import com.google.inject.spi.DefaultBindingTargetVisitor; +import java.util.Set; + /** * Guarantees that processing of Binding elements happens in a sane way. * diff --git a/core/src/com/google/inject/internal/AbstractProcessor.java b/core/src/com/google/inject/internal/AbstractProcessor.java index 063b117b..2697a99c 100644 --- a/core/src/com/google/inject/internal/AbstractProcessor.java +++ b/core/src/com/google/inject/internal/AbstractProcessor.java @@ -18,6 +18,7 @@ package com.google.inject.internal; import com.google.inject.spi.DefaultElementVisitor; import com.google.inject.spi.Element; + import java.util.Iterator; import java.util.List; diff --git a/core/src/com/google/inject/internal/Annotations.java b/core/src/com/google/inject/internal/Annotations.java index bf770fc3..982bc0b0 100644 --- a/core/src/com/google/inject/internal/Annotations.java +++ b/core/src/com/google/inject/internal/Annotations.java @@ -16,15 +16,16 @@ package com.google.inject.internal; +import com.google.common.base.Function; +import com.google.common.collect.MapMaker; import com.google.inject.BindingAnnotation; import com.google.inject.Key; import com.google.inject.ScopeAnnotation; import com.google.inject.TypeLiteral; import com.google.inject.internal.util.Classes; -import com.google.common.base.Function; -import com.google.common.collect.MapMaker; import com.google.inject.name.Named; import com.google.inject.name.Names; + import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -32,6 +33,7 @@ import java.lang.reflect.Member; import java.util.Arrays; import java.util.Collection; import java.util.Map; + import javax.inject.Qualifier; /** diff --git a/core/src/com/google/inject/internal/BindingBuilder.java b/core/src/com/google/inject/internal/BindingBuilder.java index 65c7b552..7b89dccb 100644 --- a/core/src/com/google/inject/internal/BindingBuilder.java +++ b/core/src/com/google/inject/internal/BindingBuilder.java @@ -16,6 +16,9 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.ConfigurationException; import com.google.inject.Key; @@ -23,11 +26,10 @@ import com.google.inject.Provider; import com.google.inject.TypeLiteral; import com.google.inject.binder.AnnotatedBindingBuilder; import com.google.inject.binder.ScopedBindingBuilder; -import com.google.common.collect.ImmutableSet; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.spi.Element; import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.Message; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.util.List; diff --git a/core/src/com/google/inject/internal/BindingProcessor.java b/core/src/com/google/inject/internal/BindingProcessor.java index dd2a41df..952cfaab 100644 --- a/core/src/com/google/inject/internal/BindingProcessor.java +++ b/core/src/com/google/inject/internal/BindingProcessor.java @@ -31,6 +31,7 @@ import com.google.inject.spi.ProviderBinding; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderKeyBinding; import com.google.inject.spi.UntargettedBinding; + import java.util.Set; /** diff --git a/core/src/com/google/inject/internal/BoundProviderFactory.java b/core/src/com/google/inject/internal/BoundProviderFactory.java index 62b8759b..97ce3238 100644 --- a/core/src/com/google/inject/internal/BoundProviderFactory.java +++ b/core/src/com/google/inject/internal/BoundProviderFactory.java @@ -16,12 +16,12 @@ package com.google.inject.internal; -import javax.inject.Provider; - import com.google.inject.Key; import com.google.inject.internal.InjectorImpl.JitLimitation; import com.google.inject.spi.Dependency; +import javax.inject.Provider; + /** * Delegates to a custom factory which is also bound in the injector. */ diff --git a/core/src/com/google/inject/internal/ConstantBindingBuilderImpl.java b/core/src/com/google/inject/internal/ConstantBindingBuilderImpl.java index bb89a2d7..8a0c5c6a 100644 --- a/core/src/com/google/inject/internal/ConstantBindingBuilderImpl.java +++ b/core/src/com/google/inject/internal/ConstantBindingBuilderImpl.java @@ -16,13 +16,14 @@ package com.google.inject.internal; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.binder.AnnotatedConstantBindingBuilder; import com.google.inject.binder.ConstantBindingBuilder; -import com.google.common.collect.ImmutableSet; import com.google.inject.spi.Element; import com.google.inject.spi.InjectionPoint; + import java.lang.annotation.Annotation; import java.util.List; diff --git a/core/src/com/google/inject/internal/ConstructionProxy.java b/core/src/com/google/inject/internal/ConstructionProxy.java index 81d4d950..6c6f3fcc 100644 --- a/core/src/com/google/inject/internal/ConstructionProxy.java +++ b/core/src/com/google/inject/internal/ConstructionProxy.java @@ -18,6 +18,7 @@ package com.google.inject.internal; import com.google.common.collect.ImmutableMap; import com.google.inject.spi.InjectionPoint; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/internal/ConstructorBindingImpl.java b/core/src/com/google/inject/internal/ConstructorBindingImpl.java index 69683b86..19a2c9c1 100644 --- a/core/src/com/google/inject/internal/ConstructorBindingImpl.java +++ b/core/src/com/google/inject/internal/ConstructorBindingImpl.java @@ -16,19 +16,21 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkState; +import static com.google.inject.internal.Annotations.findScopeAnnotation; + +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.ConfigurationException; import com.google.inject.Key; import com.google.inject.TypeLiteral; -import static com.google.inject.internal.Annotations.findScopeAnnotation; import com.google.inject.internal.util.Classes; -import com.google.common.collect.ImmutableSet; -import com.google.common.base.Objects; -import static com.google.common.base.Preconditions.checkState; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ConstructorBinding; import com.google.inject.spi.Dependency; import com.google.inject.spi.InjectionPoint; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/internal/ConstructorInjector.java b/core/src/com/google/inject/internal/ConstructorInjector.java index d40f4652..2c1219bb 100644 --- a/core/src/com/google/inject/internal/ConstructorInjector.java +++ b/core/src/com/google/inject/internal/ConstructorInjector.java @@ -16,9 +16,10 @@ package com.google.inject.internal; -import com.google.inject.internal.ProvisionListenerStackCallback.ProvisionCallback; import com.google.common.collect.ImmutableSet; +import com.google.inject.internal.ProvisionListenerStackCallback.ProvisionCallback; import com.google.inject.spi.InjectionPoint; + import java.lang.reflect.InvocationTargetException; import java.util.Set; diff --git a/core/src/com/google/inject/internal/ConstructorInjectorStore.java b/core/src/com/google/inject/internal/ConstructorInjectorStore.java index cf6db1b7..e780bdeb 100644 --- a/core/src/com/google/inject/internal/ConstructorInjectorStore.java +++ b/core/src/com/google/inject/internal/ConstructorInjectorStore.java @@ -16,8 +16,9 @@ package com.google.inject.internal; -import com.google.common.collect.ImmutableList; import static com.google.common.collect.Iterables.concat; + +import com.google.common.collect.ImmutableList; import com.google.inject.spi.InjectionPoint; /** diff --git a/core/src/com/google/inject/internal/DefaultConstructionProxyFactory.java b/core/src/com/google/inject/internal/DefaultConstructionProxyFactory.java index c1a17f74..947b49a2 100644 --- a/core/src/com/google/inject/internal/DefaultConstructionProxyFactory.java +++ b/core/src/com/google/inject/internal/DefaultConstructionProxyFactory.java @@ -16,9 +16,10 @@ package com.google.inject.internal; -import com.google.inject.internal.BytecodeGen.Visibility; import com.google.common.collect.ImmutableMap; +import com.google.inject.internal.BytecodeGen.Visibility; import com.google.inject.spi.InjectionPoint; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/internal/DeferredLookups.java b/core/src/com/google/inject/internal/DeferredLookups.java index e4cce30e..049c9a8d 100644 --- a/core/src/com/google/inject/internal/DeferredLookups.java +++ b/core/src/com/google/inject/internal/DeferredLookups.java @@ -16,14 +16,15 @@ package com.google.inject.internal; +import com.google.common.collect.Lists; import com.google.inject.Key; import com.google.inject.MembersInjector; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import com.google.common.collect.Lists; import com.google.inject.spi.Element; import com.google.inject.spi.MembersInjectorLookup; import com.google.inject.spi.ProviderLookup; + import java.util.List; /** diff --git a/core/src/com/google/inject/internal/EncounterImpl.java b/core/src/com/google/inject/internal/EncounterImpl.java index 44770f66..957743b3 100644 --- a/core/src/com/google/inject/internal/EncounterImpl.java +++ b/core/src/com/google/inject/internal/EncounterImpl.java @@ -16,18 +16,20 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkState; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import com.google.inject.Key; import com.google.inject.MembersInjector; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import static com.google.common.base.Preconditions.checkState; import com.google.inject.matcher.Matcher; import com.google.inject.matcher.Matchers; import com.google.inject.spi.InjectionListener; import com.google.inject.spi.Message; import com.google.inject.spi.TypeEncounter; + import java.lang.reflect.Method; import java.util.List; diff --git a/core/src/com/google/inject/internal/Errors.java b/core/src/com/google/inject/internal/Errors.java index 479c35bd..41102a9a 100644 --- a/core/src/com/google/inject/internal/Errors.java +++ b/core/src/com/google/inject/internal/Errors.java @@ -16,6 +16,9 @@ package com.google.inject.internal; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.ConfigurationException; import com.google.inject.CreationException; import com.google.inject.Key; @@ -25,9 +28,6 @@ import com.google.inject.ProvisionException; import com.google.inject.Scope; import com.google.inject.TypeLiteral; import com.google.inject.internal.util.Classes; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.inject.internal.util.SourceProvider; import com.google.inject.internal.util.StackTraceElements; import com.google.inject.spi.Dependency; @@ -36,6 +36,7 @@ import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.Message; import com.google.inject.spi.TypeConverterBinding; import com.google.inject.spi.TypeListenerBinding; + import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; diff --git a/core/src/com/google/inject/internal/ExposedBindingImpl.java b/core/src/com/google/inject/internal/ExposedBindingImpl.java index 6f70d035..f17d5a6a 100644 --- a/core/src/com/google/inject/internal/ExposedBindingImpl.java +++ b/core/src/com/google/inject/internal/ExposedBindingImpl.java @@ -16,15 +16,16 @@ package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.base.Objects; -import com.google.common.collect.ImmutableSet; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.ExposedBinding; import com.google.inject.spi.PrivateElements; + import java.util.Set; public final class ExposedBindingImpl<T> extends BindingImpl<T> implements ExposedBinding<T> { diff --git a/core/src/com/google/inject/internal/ExposureBuilder.java b/core/src/com/google/inject/internal/ExposureBuilder.java index 3f4bcd59..3b1c2279 100644 --- a/core/src/com/google/inject/internal/ExposureBuilder.java +++ b/core/src/com/google/inject/internal/ExposureBuilder.java @@ -16,10 +16,11 @@ package com.google.inject.internal; +import com.google.common.base.Preconditions; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.binder.AnnotatedElementBuilder; -import com.google.common.base.Preconditions; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/internal/InheritingState.java b/core/src/com/google/inject/internal/InheritingState.java index a729d569..056adce4 100644 --- a/core/src/com/google/inject/internal/InheritingState.java +++ b/core/src/com/google/inject/internal/InheritingState.java @@ -16,18 +16,19 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.inject.Binding; import com.google.inject.Key; import com.google.inject.Scope; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import static com.google.common.base.Preconditions.checkNotNull; - import com.google.inject.spi.ProvisionListenerBinding; import com.google.inject.spi.TypeConverterBinding; import com.google.inject.spi.TypeListenerBinding; + import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/com/google/inject/internal/Initializer.java b/core/src/com/google/inject/internal/Initializer.java index 51b116ef..d57f1b31 100644 --- a/core/src/com/google/inject/internal/Initializer.java +++ b/core/src/com/google/inject/internal/Initializer.java @@ -16,13 +16,15 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.inject.Key; import com.google.inject.Stage; import com.google.inject.TypeLiteral; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.spi.InjectionPoint; + import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; diff --git a/core/src/com/google/inject/internal/InjectionRequestProcessor.java b/core/src/com/google/inject/internal/InjectionRequestProcessor.java index 455419b2..72be1a1f 100644 --- a/core/src/com/google/inject/internal/InjectionRequestProcessor.java +++ b/core/src/com/google/inject/internal/InjectionRequestProcessor.java @@ -16,13 +16,14 @@ package com.google.inject.internal; -import com.google.inject.ConfigurationException; -import com.google.inject.Stage; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.google.inject.ConfigurationException; +import com.google.inject.Stage; import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.InjectionRequest; import com.google.inject.spi.StaticInjectionRequest; + import java.util.List; import java.util.Set; diff --git a/core/src/com/google/inject/internal/InjectorImpl.java b/core/src/com/google/inject/internal/InjectorImpl.java index 3c7bcdb5..320efb7e 100644 --- a/core/src/com/google/inject/internal/InjectorImpl.java +++ b/core/src/com/google/inject/internal/InjectorImpl.java @@ -16,6 +16,12 @@ package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.inject.Binder; import com.google.inject.Binding; import com.google.inject.ConfigurationException; @@ -30,12 +36,6 @@ import com.google.inject.ProvisionException; import com.google.inject.Scope; import com.google.inject.Stage; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.base.Objects; import com.google.inject.internal.util.SourceProvider; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ConvertedConstantBinding; @@ -45,6 +45,7 @@ import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.ProviderBinding; import com.google.inject.spi.TypeConverterBinding; import com.google.inject.util.Providers; + import java.lang.annotation.Annotation; import java.lang.reflect.GenericArrayType; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/com/google/inject/internal/InjectorShell.java b/core/src/com/google/inject/internal/InjectorShell.java index ebb286e2..4985f8cb 100644 --- a/core/src/com/google/inject/internal/InjectorShell.java +++ b/core/src/com/google/inject/internal/InjectorShell.java @@ -16,19 +16,20 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; +import static com.google.inject.Scopes.SINGLETON; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; -import static com.google.inject.Scopes.SINGLETON; import com.google.inject.Singleton; import com.google.inject.Stage; import com.google.inject.internal.InjectorImpl.InjectorOptions; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; import com.google.inject.internal.util.SourceProvider; import com.google.inject.internal.util.Stopwatch; import com.google.inject.spi.Dependency; @@ -38,6 +39,7 @@ import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.PrivateElements; import com.google.inject.spi.ProvisionListenerBinding; import com.google.inject.spi.TypeListenerBinding; + import java.util.List; import java.util.logging.Logger; diff --git a/core/src/com/google/inject/internal/InstanceBindingImpl.java b/core/src/com/google/inject/internal/InstanceBindingImpl.java index f57c32de..57129b14 100644 --- a/core/src/com/google/inject/internal/InstanceBindingImpl.java +++ b/core/src/com/google/inject/internal/InstanceBindingImpl.java @@ -16,17 +16,18 @@ package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Provider; -import com.google.common.collect.ImmutableSet; -import com.google.common.base.Objects; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.InstanceBinding; import com.google.inject.util.Providers; + import java.util.Set; final class InstanceBindingImpl<T> extends BindingImpl<T> implements InstanceBinding<T> { diff --git a/core/src/com/google/inject/internal/InterceptorStackCallback.java b/core/src/com/google/inject/internal/InterceptorStackCallback.java index 74143bf0..8912ee25 100644 --- a/core/src/com/google/inject/internal/InterceptorStackCallback.java +++ b/core/src/com/google/inject/internal/InterceptorStackCallback.java @@ -17,15 +17,18 @@ package com.google.inject.internal; import com.google.common.collect.Lists; + +import net.sf.cglib.proxy.MethodProxy; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.lang.reflect.AccessibleObject; import java.lang.reflect.Method; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import net.sf.cglib.proxy.MethodProxy; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * Intercepts a method with a stack of interceptors. diff --git a/core/src/com/google/inject/internal/InternalContext.java b/core/src/com/google/inject/internal/InternalContext.java index 2d9fab2f..2ff2af61 100644 --- a/core/src/com/google/inject/internal/InternalContext.java +++ b/core/src/com/google/inject/internal/InternalContext.java @@ -16,9 +16,9 @@ package com.google.inject.internal; -import com.google.inject.Key; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; +import com.google.inject.Key; import com.google.inject.spi.Dependency; import com.google.inject.spi.DependencyAndSource; diff --git a/core/src/com/google/inject/internal/InternalFactoryToInitializableAdapter.java b/core/src/com/google/inject/internal/InternalFactoryToInitializableAdapter.java index fa1519fc..4f0f6d89 100644 --- a/core/src/com/google/inject/internal/InternalFactoryToInitializableAdapter.java +++ b/core/src/com/google/inject/internal/InternalFactoryToInitializableAdapter.java @@ -16,8 +16,9 @@ package com.google.inject.internal; -import com.google.inject.Provider; import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.inject.Provider; import com.google.inject.spi.Dependency; import com.google.inject.spi.ProviderInstanceBinding; diff --git a/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.java b/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.java index d4001677..4cd1b2e1 100644 --- a/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.java +++ b/core/src/com/google/inject/internal/InternalFactoryToProviderAdapter.java @@ -16,8 +16,9 @@ package com.google.inject.internal; -import com.google.inject.Provider; import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.inject.Provider; import com.google.inject.spi.Dependency; /** diff --git a/core/src/com/google/inject/internal/InternalInjectorCreator.java b/core/src/com/google/inject/internal/InternalInjectorCreator.java index a6570033..d40bc83b 100644 --- a/core/src/com/google/inject/internal/InternalInjectorCreator.java +++ b/core/src/com/google/inject/internal/InternalInjectorCreator.java @@ -16,6 +16,8 @@ package com.google.inject.internal; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import com.google.inject.Binding; import com.google.inject.Injector; import com.google.inject.Key; @@ -25,11 +27,10 @@ import com.google.inject.Provider; import com.google.inject.Scope; import com.google.inject.Stage; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import com.google.inject.internal.util.Stopwatch; import com.google.inject.spi.Dependency; import com.google.inject.spi.TypeConverterBinding; + import java.lang.annotation.Annotation; import java.util.Collection; import java.util.List; diff --git a/core/src/com/google/inject/internal/LinkedBindingImpl.java b/core/src/com/google/inject/internal/LinkedBindingImpl.java index dca03424..33b9a7cb 100644 --- a/core/src/com/google/inject/internal/LinkedBindingImpl.java +++ b/core/src/com/google/inject/internal/LinkedBindingImpl.java @@ -16,14 +16,15 @@ package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Key; -import com.google.common.collect.ImmutableSet; -import com.google.common.base.Objects; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.LinkedKeyBinding; + import java.util.Set; public final class LinkedBindingImpl<T> extends BindingImpl<T> implements LinkedKeyBinding<T>, HasDependencies { diff --git a/core/src/com/google/inject/internal/LinkedProviderBindingImpl.java b/core/src/com/google/inject/internal/LinkedProviderBindingImpl.java index e15dfc60..f2204ba7 100644 --- a/core/src/com/google/inject/internal/LinkedProviderBindingImpl.java +++ b/core/src/com/google/inject/internal/LinkedProviderBindingImpl.java @@ -16,14 +16,15 @@ package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Key; -import com.google.common.collect.ImmutableSet; -import com.google.common.base.Objects; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.ProviderKeyBinding; + import java.util.Set; final class LinkedProviderBindingImpl<T> diff --git a/core/src/com/google/inject/internal/MembersInjectorImpl.java b/core/src/com/google/inject/internal/MembersInjectorImpl.java index 6b6303a5..d405de56 100644 --- a/core/src/com/google/inject/internal/MembersInjectorImpl.java +++ b/core/src/com/google/inject/internal/MembersInjectorImpl.java @@ -16,11 +16,11 @@ package com.google.inject.internal; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.inject.Key; import com.google.inject.MembersInjector; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.inject.spi.InjectionListener; import com.google.inject.spi.InjectionPoint; diff --git a/core/src/com/google/inject/internal/MembersInjectorStore.java b/core/src/com/google/inject/internal/MembersInjectorStore.java index 658f17b7..7604d4c2 100644 --- a/core/src/com/google/inject/internal/MembersInjectorStore.java +++ b/core/src/com/google/inject/internal/MembersInjectorStore.java @@ -16,12 +16,13 @@ package com.google.inject.internal; -import com.google.inject.ConfigurationException; -import com.google.inject.TypeLiteral; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.google.inject.ConfigurationException; +import com.google.inject.TypeLiteral; import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.TypeListenerBinding; + import java.lang.reflect.Field; import java.util.List; import java.util.Set; diff --git a/core/src/com/google/inject/internal/MessageProcessor.java b/core/src/com/google/inject/internal/MessageProcessor.java index 23f9d924..d7c607b1 100644 --- a/core/src/com/google/inject/internal/MessageProcessor.java +++ b/core/src/com/google/inject/internal/MessageProcessor.java @@ -18,6 +18,7 @@ package com.google.inject.internal; import com.google.inject.Guice; import com.google.inject.spi.Message; + import java.util.logging.Level; import java.util.logging.Logger; diff --git a/core/src/com/google/inject/internal/MethodAspect.java b/core/src/com/google/inject/internal/MethodAspect.java index 6b84f484..7bdf193d 100644 --- a/core/src/com/google/inject/internal/MethodAspect.java +++ b/core/src/com/google/inject/internal/MethodAspect.java @@ -17,11 +17,14 @@ package com.google.inject.internal; import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.matcher.Matcher; + +import org.aopalliance.intercept.MethodInterceptor; + import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import org.aopalliance.intercept.MethodInterceptor; /** * Ties a matcher to a method interceptor. diff --git a/core/src/com/google/inject/internal/MoreTypes.java b/core/src/com/google/inject/internal/MoreTypes.java index f0c10670..d51016b1 100644 --- a/core/src/com/google/inject/internal/MoreTypes.java +++ b/core/src/com/google/inject/internal/MoreTypes.java @@ -17,13 +17,15 @@ package com.google.inject.internal; -import com.google.inject.ConfigurationException; -import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableMap; -import com.google.common.base.Objects; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableMap; +import com.google.inject.ConfigurationException; +import com.google.inject.TypeLiteral; import com.google.inject.util.Types; + import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; diff --git a/core/src/com/google/inject/internal/PrivateElementProcessor.java b/core/src/com/google/inject/internal/PrivateElementProcessor.java index 98454bdb..4a641a98 100644 --- a/core/src/com/google/inject/internal/PrivateElementProcessor.java +++ b/core/src/com/google/inject/internal/PrivateElementProcessor.java @@ -18,6 +18,7 @@ package com.google.inject.internal; import com.google.common.collect.Lists; import com.google.inject.spi.PrivateElements; + import java.util.List; /** diff --git a/core/src/com/google/inject/internal/PrivateElementsImpl.java b/core/src/com/google/inject/internal/PrivateElementsImpl.java index c5dae6d6..6a3d9158 100644 --- a/core/src/com/google/inject/internal/PrivateElementsImpl.java +++ b/core/src/com/google/inject/internal/PrivateElementsImpl.java @@ -16,21 +16,23 @@ package com.google.inject.internal; -import com.google.inject.Binder; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.PrivateBinder; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import com.google.inject.Binder; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.PrivateBinder; import com.google.inject.spi.Element; import com.google.inject.spi.ElementVisitor; import com.google.inject.spi.PrivateElements; + import java.util.List; import java.util.Map; import java.util.Set; diff --git a/core/src/com/google/inject/internal/ProcessedBindingData.java b/core/src/com/google/inject/internal/ProcessedBindingData.java index 3787f1a9..8cd26027 100644 --- a/core/src/com/google/inject/internal/ProcessedBindingData.java +++ b/core/src/com/google/inject/internal/ProcessedBindingData.java @@ -16,10 +16,10 @@ package com.google.inject.internal; -import java.util.List; - import com.google.common.collect.Lists; +import java.util.List; + /** * Keeps track of creation listeners & uninitialized bindings, * so they can be processed after bindings are recorded. diff --git a/core/src/com/google/inject/internal/ProviderInstanceBindingImpl.java b/core/src/com/google/inject/internal/ProviderInstanceBindingImpl.java index 677508df..ad02fefa 100644 --- a/core/src/com/google/inject/internal/ProviderInstanceBindingImpl.java +++ b/core/src/com/google/inject/internal/ProviderInstanceBindingImpl.java @@ -16,11 +16,11 @@ limitations under the License. package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Provider; -import com.google.common.collect.ImmutableSet; -import com.google.common.base.Objects; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; diff --git a/core/src/com/google/inject/internal/ProviderInternalFactory.java b/core/src/com/google/inject/internal/ProviderInternalFactory.java index 8902cad5..b061070f 100644 --- a/core/src/com/google/inject/internal/ProviderInternalFactory.java +++ b/core/src/com/google/inject/internal/ProviderInternalFactory.java @@ -19,11 +19,11 @@ package com.google.inject.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Provider; import com.google.inject.internal.ProvisionListenerStackCallback.ProvisionCallback; - import com.google.inject.spi.Dependency; +import javax.inject.Provider; + /** * Base class for InternalFactories that are used by Providers, to handle * circular dependencies. diff --git a/core/src/com/google/inject/internal/ProviderMethod.java b/core/src/com/google/inject/internal/ProviderMethod.java index 2e34197a..62214992 100644 --- a/core/src/com/google/inject/internal/ProviderMethod.java +++ b/core/src/com/google/inject/internal/ProviderMethod.java @@ -16,16 +16,17 @@ package com.google.inject.internal; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Exposed; import com.google.inject.Key; import com.google.inject.PrivateBinder; import com.google.inject.Provider; -import com.google.common.collect.ImmutableSet; -import com.google.common.base.Objects; import com.google.inject.internal.util.StackTraceElements; import com.google.inject.spi.Dependency; import com.google.inject.spi.ProviderWithDependencies; + import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/internal/ProviderMethodsModule.java b/core/src/com/google/inject/internal/ProviderMethodsModule.java index fcfbcabc..7ec3075a 100644 --- a/core/src/com/google/inject/internal/ProviderMethodsModule.java +++ b/core/src/com/google/inject/internal/ProviderMethodsModule.java @@ -16,18 +16,20 @@ package com.google.inject.internal; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.Provides; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.spi.Dependency; import com.google.inject.spi.Message; import com.google.inject.util.Modules; + import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/internal/ProvisionListenerCallbackStore.java b/core/src/com/google/inject/internal/ProvisionListenerCallbackStore.java index b27da9fa..8300fcb6 100644 --- a/core/src/com/google/inject/internal/ProvisionListenerCallbackStore.java +++ b/core/src/com/google/inject/internal/ProvisionListenerCallbackStore.java @@ -16,17 +16,17 @@ package com.google.inject.internal; -import java.util.List; -import java.util.Map; - -import com.google.inject.Key; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.MapMaker; +import com.google.inject.Key; import com.google.inject.spi.ProvisionListener; import com.google.inject.spi.ProvisionListenerBinding; +import java.util.List; +import java.util.Map; + /** * {@link ProvisionListenerStackCallback} for each key. * diff --git a/core/src/com/google/inject/internal/ProvisionListenerStackCallback.java b/core/src/com/google/inject/internal/ProvisionListenerStackCallback.java index a865a0a8..7fdfc13c 100644 --- a/core/src/com/google/inject/internal/ProvisionListenerStackCallback.java +++ b/core/src/com/google/inject/internal/ProvisionListenerStackCallback.java @@ -16,12 +16,12 @@ package com.google.inject.internal; -import java.util.List; - import com.google.inject.Key; import com.google.inject.ProvisionException; -import com.google.inject.spi.ProvisionListener; import com.google.inject.spi.DependencyAndSource; +import com.google.inject.spi.ProvisionListener; + +import java.util.List; /** * Intercepts provisions with a stack of listeners. diff --git a/core/src/com/google/inject/internal/ProxyFactory.java b/core/src/com/google/inject/internal/ProxyFactory.java index 12d386c5..3ab04bd0 100644 --- a/core/src/com/google/inject/internal/ProxyFactory.java +++ b/core/src/com/google/inject/internal/ProxyFactory.java @@ -17,12 +17,21 @@ package com.google.inject.internal; import static com.google.inject.internal.BytecodeGen.newFastClass; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.spi.InjectionPoint; +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.reflect.FastClass; +import net.sf.cglib.reflect.FastConstructor; + +import org.aopalliance.intercept.MethodInterceptor; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -31,13 +40,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import net.sf.cglib.proxy.Callback; -import net.sf.cglib.proxy.CallbackFilter; -import net.sf.cglib.proxy.Enhancer; -import net.sf.cglib.reflect.FastClass; -import net.sf.cglib.reflect.FastConstructor; -import org.aopalliance.intercept.MethodInterceptor; - /** * Builds a construction proxy that can participate in AOP. This class manages applying type and * method matchers to come up with the set of intercepted methods. diff --git a/core/src/com/google/inject/internal/ScopeBindingProcessor.java b/core/src/com/google/inject/internal/ScopeBindingProcessor.java index a7d83c5f..cf0a99f3 100644 --- a/core/src/com/google/inject/internal/ScopeBindingProcessor.java +++ b/core/src/com/google/inject/internal/ScopeBindingProcessor.java @@ -16,9 +16,11 @@ package com.google.inject.internal; -import com.google.inject.Scope; import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.inject.Scope; import com.google.inject.spi.ScopeBinding; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/internal/Scoping.java b/core/src/com/google/inject/internal/Scoping.java index eb54d5e0..9dd9524e 100644 --- a/core/src/com/google/inject/internal/Scoping.java +++ b/core/src/com/google/inject/internal/Scoping.java @@ -16,6 +16,7 @@ package com.google.inject.internal; +import com.google.common.base.Objects; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.Scope; @@ -23,8 +24,8 @@ import com.google.inject.Scopes; import com.google.inject.Singleton; import com.google.inject.Stage; import com.google.inject.binder.ScopedBindingBuilder; -import com.google.common.base.Objects; import com.google.inject.spi.BindingScopingVisitor; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/internal/SingleFieldInjector.java b/core/src/com/google/inject/internal/SingleFieldInjector.java index 5a062c0e..52be1f45 100644 --- a/core/src/com/google/inject/internal/SingleFieldInjector.java +++ b/core/src/com/google/inject/internal/SingleFieldInjector.java @@ -19,6 +19,7 @@ package com.google.inject.internal; import com.google.inject.internal.InjectorImpl.JitLimitation; import com.google.inject.spi.Dependency; import com.google.inject.spi.InjectionPoint; + import java.lang.reflect.Field; /** diff --git a/core/src/com/google/inject/internal/SingleMethodInjector.java b/core/src/com/google/inject/internal/SingleMethodInjector.java index daf4bc05..8bc8a34e 100644 --- a/core/src/com/google/inject/internal/SingleMethodInjector.java +++ b/core/src/com/google/inject/internal/SingleMethodInjector.java @@ -19,6 +19,7 @@ package com.google.inject.internal; import com.google.inject.internal.BytecodeGen.Visibility; import com.google.inject.internal.InjectorImpl.MethodInvoker; import com.google.inject.spi.InjectionPoint; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/core/src/com/google/inject/internal/State.java b/core/src/com/google/inject/internal/State.java index 44aea7e0..9a3e9218 100644 --- a/core/src/com/google/inject/internal/State.java +++ b/core/src/com/google/inject/internal/State.java @@ -16,16 +16,17 @@ package com.google.inject.internal; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.inject.Binding; import com.google.inject.Key; import com.google.inject.Scope; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.inject.spi.ProvisionListenerBinding; import com.google.inject.spi.TypeConverterBinding; import com.google.inject.spi.TypeListenerBinding; + import java.lang.annotation.Annotation; import java.util.List; import java.util.Map; diff --git a/core/src/com/google/inject/internal/TypeConverterBindingProcessor.java b/core/src/com/google/inject/internal/TypeConverterBindingProcessor.java index 0208aead..3ad1b68f 100644 --- a/core/src/com/google/inject/internal/TypeConverterBindingProcessor.java +++ b/core/src/com/google/inject/internal/TypeConverterBindingProcessor.java @@ -18,12 +18,12 @@ package com.google.inject.internal; import com.google.inject.TypeLiteral; import com.google.inject.internal.util.SourceProvider; -import com.google.common.base.Strings; import com.google.inject.matcher.AbstractMatcher; import com.google.inject.matcher.Matcher; import com.google.inject.matcher.Matchers; import com.google.inject.spi.TypeConverter; import com.google.inject.spi.TypeConverterBinding; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/core/src/com/google/inject/internal/UniqueAnnotations.java b/core/src/com/google/inject/internal/UniqueAnnotations.java index 0754f3ce..924175e6 100644 --- a/core/src/com/google/inject/internal/UniqueAnnotations.java +++ b/core/src/com/google/inject/internal/UniqueAnnotations.java @@ -16,10 +16,12 @@ package com.google.inject.internal; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.BindingAnnotation; + import java.lang.annotation.Annotation; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/core/src/com/google/inject/internal/UntargettedBindingImpl.java b/core/src/com/google/inject/internal/UntargettedBindingImpl.java index 99a70cf0..8af74a28 100644 --- a/core/src/com/google/inject/internal/UntargettedBindingImpl.java +++ b/core/src/com/google/inject/internal/UntargettedBindingImpl.java @@ -16,9 +16,9 @@ package com.google.inject.internal; +import com.google.common.base.Objects; import com.google.inject.Binder; import com.google.inject.Key; -import com.google.common.base.Objects; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.UntargettedBinding; diff --git a/core/src/com/google/inject/internal/WeakKeySet.java b/core/src/com/google/inject/internal/WeakKeySet.java index 2c62ecac..791ef0ff 100644 --- a/core/src/com/google/inject/internal/WeakKeySet.java +++ b/core/src/com/google/inject/internal/WeakKeySet.java @@ -16,9 +16,9 @@ package com.google.inject.internal; -import com.google.inject.Key; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.inject.Key; import com.google.inject.internal.util.SourceProvider; import java.util.Map; diff --git a/core/src/com/google/inject/internal/util/Classes.java b/core/src/com/google/inject/internal/util/Classes.java index 4891dac5..0badab12 100644 --- a/core/src/com/google/inject/internal/util/Classes.java +++ b/core/src/com/google/inject/internal/util/Classes.java @@ -24,7 +24,6 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.Modifier; - /** * Class utilities. */ diff --git a/core/src/com/google/inject/internal/util/LineNumbers.java b/core/src/com/google/inject/internal/util/LineNumbers.java index 36ef21a8..227c81e7 100644 --- a/core/src/com/google/inject/internal/util/LineNumbers.java +++ b/core/src/com/google/inject/internal/util/LineNumbers.java @@ -18,13 +18,9 @@ package com.google.inject.internal.util; import static com.google.common.base.Preconditions.checkNotNull; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Member; -import java.lang.reflect.Method; -import java.util.Map; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; + import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Attribute; import org.objectweb.asm.ClassReader; @@ -34,8 +30,13 @@ import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.util.Map; /** * Looks up line numbers for classes and their members. diff --git a/core/src/com/google/inject/internal/util/SourceProvider.java b/core/src/com/google/inject/internal/util/SourceProvider.java index 18c66891..75a03538 100644 --- a/core/src/com/google/inject/internal/util/SourceProvider.java +++ b/core/src/com/google/inject/internal/util/SourceProvider.java @@ -17,11 +17,12 @@ package com.google.inject.internal.util; import static com.google.common.collect.Iterables.concat; -import java.util.List; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import java.util.List; + /** * Provides access to the calling line of code. * diff --git a/core/src/com/google/inject/internal/util/StackTraceElements.java b/core/src/com/google/inject/internal/util/StackTraceElements.java index 3c86ebcd..4f5b167e 100644 --- a/core/src/com/google/inject/internal/util/StackTraceElements.java +++ b/core/src/com/google/inject/internal/util/StackTraceElements.java @@ -16,14 +16,14 @@ package com.google.inject.internal.util; +import com.google.common.base.Function; +import com.google.common.collect.MapMaker; + import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Member; import java.util.Map; -import com.google.common.base.Function; -import com.google.common.collect.MapMaker; - /** * Creates stack trace elements for members. * diff --git a/core/src/com/google/inject/matcher/Matchers.java b/core/src/com/google/inject/matcher/Matchers.java index cbfa715a..872c9574 100644 --- a/core/src/com/google/inject/matcher/Matchers.java +++ b/core/src/com/google/inject/matcher/Matchers.java @@ -18,6 +18,7 @@ package com.google.inject.matcher; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; + import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; diff --git a/core/src/com/google/inject/name/Named.java b/core/src/com/google/inject/name/Named.java index 5d6a2839..23b3d5dc 100644 --- a/core/src/com/google/inject/name/Named.java +++ b/core/src/com/google/inject/name/Named.java @@ -16,10 +16,12 @@ package com.google.inject.name; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** diff --git a/core/src/com/google/inject/name/NamedImpl.java b/core/src/com/google/inject/name/NamedImpl.java index fba2a8f5..2fe01071 100644 --- a/core/src/com/google/inject/name/NamedImpl.java +++ b/core/src/com/google/inject/name/NamedImpl.java @@ -17,6 +17,7 @@ package com.google.inject.name; import static com.google.common.base.Preconditions.checkNotNull; + import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/core/src/com/google/inject/name/Names.java b/core/src/com/google/inject/name/Names.java index 146a2abf..f7ec971a 100644 --- a/core/src/com/google/inject/name/Names.java +++ b/core/src/com/google/inject/name/Names.java @@ -18,6 +18,7 @@ package com.google.inject.name; import com.google.inject.Binder; import com.google.inject.Key; + import java.util.Enumeration; import java.util.Map; import java.util.Properties; diff --git a/core/src/com/google/inject/spi/BindingScopingVisitor.java b/core/src/com/google/inject/spi/BindingScopingVisitor.java index 7a990b19..2abfc9eb 100644 --- a/core/src/com/google/inject/spi/BindingScopingVisitor.java +++ b/core/src/com/google/inject/spi/BindingScopingVisitor.java @@ -17,6 +17,7 @@ package com.google.inject.spi; import com.google.inject.Scope; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/spi/ConstructorBinding.java b/core/src/com/google/inject/spi/ConstructorBinding.java index 1be39801..6799941d 100644 --- a/core/src/com/google/inject/spi/ConstructorBinding.java +++ b/core/src/com/google/inject/spi/ConstructorBinding.java @@ -17,6 +17,7 @@ package com.google.inject.spi; import com.google.inject.Binding; + import java.lang.reflect.Method; import java.util.List; import java.util.Map; diff --git a/core/src/com/google/inject/spi/ConvertedConstantBinding.java b/core/src/com/google/inject/spi/ConvertedConstantBinding.java index 5807972b..d4ae073a 100644 --- a/core/src/com/google/inject/spi/ConvertedConstantBinding.java +++ b/core/src/com/google/inject/spi/ConvertedConstantBinding.java @@ -18,6 +18,7 @@ package com.google.inject.spi; import com.google.inject.Binding; import com.google.inject.Key; + import java.util.Set; /** diff --git a/core/src/com/google/inject/spi/DefaultBindingScopingVisitor.java b/core/src/com/google/inject/spi/DefaultBindingScopingVisitor.java index f034187c..b5172720 100644 --- a/core/src/com/google/inject/spi/DefaultBindingScopingVisitor.java +++ b/core/src/com/google/inject/spi/DefaultBindingScopingVisitor.java @@ -17,6 +17,7 @@ package com.google.inject.spi; import com.google.inject.Scope; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/spi/Dependency.java b/core/src/com/google/inject/spi/Dependency.java index 77fbb304..c51d87c2 100644 --- a/core/src/com/google/inject/spi/Dependency.java +++ b/core/src/com/google/inject/spi/Dependency.java @@ -16,11 +16,13 @@ package com.google.inject.spi; -import com.google.inject.Key; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.common.base.Objects; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.inject.Key; + import java.util.List; import java.util.Set; diff --git a/core/src/com/google/inject/spi/DependencyAndSource.java b/core/src/com/google/inject/spi/DependencyAndSource.java index c4b22876..aa1d5db4 100644 --- a/core/src/com/google/inject/spi/DependencyAndSource.java +++ b/core/src/com/google/inject/spi/DependencyAndSource.java @@ -16,11 +16,11 @@ package com.google.inject.spi; -import java.lang.reflect.Member; - import com.google.inject.Binding; import com.google.inject.internal.util.StackTraceElements; +import java.lang.reflect.Member; + /** * A combination of a {@link Dependency} and the {@link Binding#getSource() * source} where the dependency was bound. diff --git a/core/src/com/google/inject/spi/DisableCircularProxiesOption.java b/core/src/com/google/inject/spi/DisableCircularProxiesOption.java index d228efbe..4193e0ab 100644 --- a/core/src/com/google/inject/spi/DisableCircularProxiesOption.java +++ b/core/src/com/google/inject/spi/DisableCircularProxiesOption.java @@ -16,9 +16,10 @@ package com.google.inject.spi; -import com.google.inject.Binder; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.inject.Binder; + /** * A request to disable circular proxies. * diff --git a/core/src/com/google/inject/spi/Elements.java b/core/src/com/google/inject/spi/Elements.java index aa33be9f..58bdfa36 100644 --- a/core/src/com/google/inject/spi/Elements.java +++ b/core/src/com/google/inject/spi/Elements.java @@ -16,6 +16,11 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkArgument; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -38,12 +43,9 @@ import com.google.inject.internal.Errors; import com.google.inject.internal.ExposureBuilder; import com.google.inject.internal.PrivateElementsImpl; import com.google.inject.internal.ProviderMethodsModule; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.collect.Sets; import com.google.inject.internal.util.SourceProvider; import com.google.inject.matcher.Matcher; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/core/src/com/google/inject/spi/InjectionPoint.java b/core/src/com/google/inject/spi/InjectionPoint.java index c9083141..bfedd702 100644 --- a/core/src/com/google/inject/spi/InjectionPoint.java +++ b/core/src/com/google/inject/spi/InjectionPoint.java @@ -16,6 +16,11 @@ package com.google.inject.spi; +import static com.google.inject.internal.MoreTypes.getRawType; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.ConfigurationException; import com.google.inject.Inject; import com.google.inject.Key; @@ -23,12 +28,9 @@ import com.google.inject.TypeLiteral; import com.google.inject.internal.Annotations; import com.google.inject.internal.Errors; import com.google.inject.internal.ErrorsException; -import static com.google.inject.internal.MoreTypes.getRawType; import com.google.inject.internal.Nullability; import com.google.inject.internal.util.Classes; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; + import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; diff --git a/core/src/com/google/inject/spi/InjectionRequest.java b/core/src/com/google/inject/spi/InjectionRequest.java index da1a3053..f80e37a4 100644 --- a/core/src/com/google/inject/spi/InjectionRequest.java +++ b/core/src/com/google/inject/spi/InjectionRequest.java @@ -16,10 +16,12 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.Binder; import com.google.inject.ConfigurationException; import com.google.inject.TypeLiteral; -import static com.google.common.base.Preconditions.checkNotNull; + import java.util.Set; /** diff --git a/core/src/com/google/inject/spi/InstanceBinding.java b/core/src/com/google/inject/spi/InstanceBinding.java index 095e78af..2e2270cf 100644 --- a/core/src/com/google/inject/spi/InstanceBinding.java +++ b/core/src/com/google/inject/spi/InstanceBinding.java @@ -17,6 +17,7 @@ package com.google.inject.spi; import com.google.inject.Binding; + import java.util.Set; /** diff --git a/core/src/com/google/inject/spi/InterceptorBinding.java b/core/src/com/google/inject/spi/InterceptorBinding.java index 163869e5..4d87157b 100644 --- a/core/src/com/google/inject/spi/InterceptorBinding.java +++ b/core/src/com/google/inject/spi/InterceptorBinding.java @@ -16,13 +16,16 @@ package com.google.inject.spi; -import com.google.inject.Binder; -import com.google.common.collect.ImmutableList; import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableList; +import com.google.inject.Binder; import com.google.inject.matcher.Matcher; + +import org.aopalliance.intercept.MethodInterceptor; + import java.lang.reflect.Method; import java.util.List; -import org.aopalliance.intercept.MethodInterceptor; /** * Registration of interceptors for matching methods of matching classes. Instances are created diff --git a/core/src/com/google/inject/spi/MembersInjectorLookup.java b/core/src/com/google/inject/spi/MembersInjectorLookup.java index 04fa64c5..d4da8bdd 100644 --- a/core/src/com/google/inject/spi/MembersInjectorLookup.java +++ b/core/src/com/google/inject/spi/MembersInjectorLookup.java @@ -16,11 +16,12 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.inject.Binder; import com.google.inject.MembersInjector; import com.google.inject.TypeLiteral; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; /** * A lookup of the members injector for a type. Lookups are created explicitly in a module using diff --git a/core/src/com/google/inject/spi/Message.java b/core/src/com/google/inject/spi/Message.java index 76a984bc..3571ecd6 100644 --- a/core/src/com/google/inject/spi/Message.java +++ b/core/src/com/google/inject/spi/Message.java @@ -16,12 +16,14 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.internal.Errors; -import com.google.common.collect.ImmutableList; -import com.google.common.base.Objects; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.internal.util.SourceProvider; + import java.io.ObjectStreamException; import java.io.Serializable; import java.util.List; diff --git a/core/src/com/google/inject/spi/PrivateElements.java b/core/src/com/google/inject/spi/PrivateElements.java index 2495eded..fc36305e 100644 --- a/core/src/com/google/inject/spi/PrivateElements.java +++ b/core/src/com/google/inject/spi/PrivateElements.java @@ -18,6 +18,7 @@ package com.google.inject.spi; import com.google.inject.Injector; import com.google.inject.Key; + import java.util.List; import java.util.Set; diff --git a/core/src/com/google/inject/spi/ProviderInstanceBinding.java b/core/src/com/google/inject/spi/ProviderInstanceBinding.java index 00e3ab9b..36985420 100644 --- a/core/src/com/google/inject/spi/ProviderInstanceBinding.java +++ b/core/src/com/google/inject/spi/ProviderInstanceBinding.java @@ -18,6 +18,7 @@ package com.google.inject.spi; import com.google.inject.Binding; import com.google.inject.Provider; + import java.util.Set; /** diff --git a/core/src/com/google/inject/spi/ProviderLookup.java b/core/src/com/google/inject/spi/ProviderLookup.java index 50e1fb01..b9ff7a1f 100644 --- a/core/src/com/google/inject/spi/ProviderLookup.java +++ b/core/src/com/google/inject/spi/ProviderLookup.java @@ -16,11 +16,12 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Provider; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; /** * A lookup of the provider for a type. Lookups are created explicitly in a module using diff --git a/core/src/com/google/inject/spi/ProvisionListener.java b/core/src/com/google/inject/spi/ProvisionListener.java index 5fde5881..812f4e1e 100644 --- a/core/src/com/google/inject/spi/ProvisionListener.java +++ b/core/src/com/google/inject/spi/ProvisionListener.java @@ -16,12 +16,12 @@ package com.google.inject.spi; -import java.util.List; - import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.Scope; +import java.util.List; + /** * Listens for provisioning of objects. Useful for gathering timing information * about provisioning, post-provision initialization, and more. diff --git a/core/src/com/google/inject/spi/ProvisionListenerBinding.java b/core/src/com/google/inject/spi/ProvisionListenerBinding.java index 3d40232c..301d6705 100644 --- a/core/src/com/google/inject/spi/ProvisionListenerBinding.java +++ b/core/src/com/google/inject/spi/ProvisionListenerBinding.java @@ -16,13 +16,13 @@ package com.google.inject.spi; -import java.util.List; - +import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import com.google.inject.Key; -import com.google.common.collect.ImmutableList; import com.google.inject.matcher.Matcher; +import java.util.List; + /** * Binds keys (picked using a Matcher) to a provision listener. Listeners are created explicitly in * a module using {@link Binder#bindListener(Matcher, ProvisionListener)} statements: diff --git a/core/src/com/google/inject/spi/RequireExplicitBindingsOption.java b/core/src/com/google/inject/spi/RequireExplicitBindingsOption.java index 93123bb0..5962eb79 100644 --- a/core/src/com/google/inject/spi/RequireExplicitBindingsOption.java +++ b/core/src/com/google/inject/spi/RequireExplicitBindingsOption.java @@ -16,9 +16,10 @@ package com.google.inject.spi; -import com.google.inject.Binder; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.inject.Binder; + /** * A request to require explicit bindings. * diff --git a/core/src/com/google/inject/spi/ScopeBinding.java b/core/src/com/google/inject/spi/ScopeBinding.java index b316fce0..86ed685c 100644 --- a/core/src/com/google/inject/spi/ScopeBinding.java +++ b/core/src/com/google/inject/spi/ScopeBinding.java @@ -16,9 +16,11 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.Binder; import com.google.inject.Scope; -import static com.google.common.base.Preconditions.checkNotNull; + import java.lang.annotation.Annotation; /** diff --git a/core/src/com/google/inject/spi/StaticInjectionRequest.java b/core/src/com/google/inject/spi/StaticInjectionRequest.java index 1f6e0be4..87e53763 100644 --- a/core/src/com/google/inject/spi/StaticInjectionRequest.java +++ b/core/src/com/google/inject/spi/StaticInjectionRequest.java @@ -16,9 +16,11 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.Binder; import com.google.inject.ConfigurationException; -import static com.google.common.base.Preconditions.checkNotNull; + import java.util.Set; /** diff --git a/core/src/com/google/inject/spi/Toolable.java b/core/src/com/google/inject/spi/Toolable.java index e646b51d..37ed41fa 100644 --- a/core/src/com/google/inject/spi/Toolable.java +++ b/core/src/com/google/inject/spi/Toolable.java @@ -1,14 +1,15 @@ package com.google.inject.spi; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.Injector; import com.google.inject.Stage; + import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; - /** * Instructs an {@link Injector} running in {@link Stage#TOOL} that a method should be injected. * This is typically useful for for extensions to Guice that perform additional validation in an diff --git a/core/src/com/google/inject/spi/TypeConverterBinding.java b/core/src/com/google/inject/spi/TypeConverterBinding.java index e6641ad8..f4925a51 100644 --- a/core/src/com/google/inject/spi/TypeConverterBinding.java +++ b/core/src/com/google/inject/spi/TypeConverterBinding.java @@ -16,9 +16,10 @@ package com.google.inject.spi; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.Binder; import com.google.inject.TypeLiteral; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.matcher.Matcher; /** diff --git a/core/src/com/google/inject/spi/TypeEncounter.java b/core/src/com/google/inject/spi/TypeEncounter.java index ca2e2b4f..24a8c3db 100644 --- a/core/src/com/google/inject/spi/TypeEncounter.java +++ b/core/src/com/google/inject/spi/TypeEncounter.java @@ -21,6 +21,7 @@ import com.google.inject.MembersInjector; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import com.google.inject.matcher.Matcher; + import java.lang.reflect.Method; /** diff --git a/core/src/com/google/inject/util/Modules.java b/core/src/com/google/inject/util/Modules.java index 91a9c513..70cab055 100644 --- a/core/src/com/google/inject/util/Modules.java +++ b/core/src/com/google/inject/util/Modules.java @@ -16,6 +16,11 @@ package com.google.inject.util; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -24,17 +29,13 @@ import com.google.inject.Module; import com.google.inject.PrivateBinder; import com.google.inject.PrivateModule; import com.google.inject.Scope; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.google.inject.spi.DefaultBindingScopingVisitor; import com.google.inject.spi.DefaultElementVisitor; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; import com.google.inject.spi.PrivateElements; import com.google.inject.spi.ScopeBinding; + import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/core/src/com/google/inject/util/Node.java b/core/src/com/google/inject/util/Node.java index e49c22a3..ed0d4dd3 100644 --- a/core/src/com/google/inject/util/Node.java +++ b/core/src/com/google/inject/util/Node.java @@ -16,10 +16,11 @@ package com.google.inject.util; -import com.google.inject.Key; -import com.google.inject.internal.Errors; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.inject.Key; +import com.google.inject.internal.Errors; + import java.lang.annotation.Annotation; import java.util.Set; diff --git a/core/src/com/google/inject/util/Providers.java b/core/src/com/google/inject/util/Providers.java index a9cd686c..431d58e8 100644 --- a/core/src/com/google/inject/util/Providers.java +++ b/core/src/com/google/inject/util/Providers.java @@ -18,17 +18,17 @@ package com.google.inject.util; import static com.google.common.base.Preconditions.checkNotNull; -import java.util.Set; - +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.inject.spi.Dependency; import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.ProviderWithDependencies; +import java.util.Set; + /** * Static utility methods for creating and working with instances of * {@link Provider}. diff --git a/core/src/com/google/inject/util/Types.java b/core/src/com/google/inject/util/Types.java index 6453956d..c3b3a2af 100644 --- a/core/src/com/google/inject/util/Types.java +++ b/core/src/com/google/inject/util/Types.java @@ -22,6 +22,7 @@ import com.google.inject.internal.MoreTypes; import com.google.inject.internal.MoreTypes.GenericArrayTypeImpl; import com.google.inject.internal.MoreTypes.ParameterizedTypeImpl; import com.google.inject.internal.MoreTypes.WildcardTypeImpl; + import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/core/test/com/google/inject/AllTests.java b/core/test/com/google/inject/AllTests.java index 20820d51..be5b875f 100644 --- a/core/test/com/google/inject/AllTests.java +++ b/core/test/com/google/inject/AllTests.java @@ -17,9 +17,9 @@ package com.google.inject; import com.google.common.collect.ImmutableSet; -import com.google.inject.internal.util.LineNumbersTest; import com.google.inject.internal.MoreTypesTest; import com.google.inject.internal.UniqueAnnotationsTest; +import com.google.inject.internal.util.LineNumbersTest; import com.google.inject.matcher.MatcherTest; import com.google.inject.name.NamedEquivalanceTest; import com.google.inject.name.NamesTest; @@ -36,12 +36,14 @@ import com.google.inject.spi.ToolStageInjectorTest; import com.google.inject.util.NoopOverrideTest; import com.google.inject.util.ProvidersTest; import com.google.inject.util.TypesTest; -import com.googlecode.guice.Jsr330Test; import com.googlecode.guice.GuiceTck; -import java.util.Set; +import com.googlecode.guice.Jsr330Test; + import junit.framework.Test; import junit.framework.TestSuite; +import java.util.Set; + /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/Asserts.java b/core/test/com/google/inject/Asserts.java index cca029e2..4827fb7a 100644 --- a/core/test/com/google/inject/Asserts.java +++ b/core/test/com/google/inject/Asserts.java @@ -17,16 +17,18 @@ package com.google.inject; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; + +import junit.framework.Assert; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.NotSerializableException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import junit.framework.Assert; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/BinderTest.java b/core/test/com/google/inject/BinderTest.java index b2d8c3eb..6d15cd78 100644 --- a/core/test/com/google/inject/BinderTest.java +++ b/core/test/com/google/inject/BinderTest.java @@ -18,6 +18,7 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.assertNotSerializable; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -25,6 +26,9 @@ import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.spi.Message; import com.google.inject.util.Providers; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.Comparator; import java.util.Date; @@ -33,7 +37,6 @@ import java.util.concurrent.Callable; import java.util.logging.Handler; import java.util.logging.LogRecord; import java.util.logging.Logger; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/BinderTestSuite.java b/core/test/com/google/inject/BinderTestSuite.java index 6faf8210..0897f674 100644 --- a/core/test/com/google/inject/BinderTestSuite.java +++ b/core/test/com/google/inject/BinderTestSuite.java @@ -17,29 +17,32 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; -import com.google.inject.binder.AnnotatedBindingBuilder; -import com.google.inject.binder.ScopedBindingBuilder; +import static com.google.inject.name.Names.named; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.google.inject.binder.AnnotatedBindingBuilder; +import com.google.inject.binder.ScopedBindingBuilder; import com.google.inject.name.Named; -import static com.google.inject.name.Names.named; import com.google.inject.util.Providers; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; /** * @author jessewilson@google.com (Jesse Wilson) */ -public class BinderTestSuite { +public class BinderTestSuite extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(); diff --git a/core/test/com/google/inject/BindingAnnotationTest.java b/core/test/com/google/inject/BindingAnnotationTest.java index 4b792ad1..06857011 100644 --- a/core/test/com/google/inject/BindingAnnotationTest.java +++ b/core/test/com/google/inject/BindingAnnotationTest.java @@ -17,11 +17,13 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; -import java.lang.annotation.Annotation; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + import junit.framework.TestCase; +import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; + /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/BindingOrderTest.java b/core/test/com/google/inject/BindingOrderTest.java index 2e48d44b..6754cad3 100644 --- a/core/test/com/google/inject/BindingOrderTest.java +++ b/core/test/com/google/inject/BindingOrderTest.java @@ -16,13 +16,16 @@ package com.google.inject; + +import junit.framework.TestCase; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) */ + public class BindingOrderTest extends TestCase { public void testBindingOutOfOrder() { @@ -76,7 +79,7 @@ public class BindingOrderTest extends TestCase { } } }; - + Guice.createInjector(new AbstractModule() { protected void configure() { requestInjection(createsAThread); diff --git a/core/test/com/google/inject/BindingTest.java b/core/test/com/google/inject/BindingTest.java index 3b519f9f..46359d5b 100644 --- a/core/test/com/google/inject/BindingTest.java +++ b/core/test/com/google/inject/BindingTest.java @@ -17,14 +17,22 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; +import static com.google.inject.name.Names.named; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.inject.matcher.Matchers; -import static com.google.inject.name.Names.named; - import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.TypeEncounter; import com.google.inject.spi.TypeListener; + +import junit.framework.TestCase; + +/*if[AOP]*/ +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; +/*end[AOP]*/ + import java.lang.reflect.Constructor; import java.util.Collection; import java.util.List; @@ -32,11 +40,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; -import junit.framework.TestCase; -/*if[AOP]*/ -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; -/*end[AOP]*/ /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/BoundInstanceInjectionTest.java b/core/test/com/google/inject/BoundInstanceInjectionTest.java index 1826baf7..59fe8b24 100644 --- a/core/test/com/google/inject/BoundInstanceInjectionTest.java +++ b/core/test/com/google/inject/BoundInstanceInjectionTest.java @@ -16,15 +16,18 @@ package com.google.inject; -import com.google.inject.name.Named; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; + +import com.google.inject.name.Named; + import junit.framework.TestCase; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/CircularDependencyTest.java b/core/test/com/google/inject/CircularDependencyTest.java index 28e5272e..40227f26 100644 --- a/core/test/com/google/inject/CircularDependencyTest.java +++ b/core/test/com/google/inject/CircularDependencyTest.java @@ -16,11 +16,12 @@ package com.google.inject; -import java.util.ArrayList; -import java.util.List; +import static com.google.inject.Asserts.assertContains; import junit.framework.TestCase; -import static com.google.inject.Asserts.assertContains; + +import java.util.ArrayList; +import java.util.List; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/DuplicateBindingsTest.java b/core/test/com/google/inject/DuplicateBindingsTest.java index b4f343e1..eb9f503a 100644 --- a/core/test/com/google/inject/DuplicateBindingsTest.java +++ b/core/test/com/google/inject/DuplicateBindingsTest.java @@ -19,9 +19,14 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.name.Names.named; -import com.google.common.collect.Lists; import com.google.common.base.Objects; +import com.google.common.collect.Lists; import com.google.inject.name.Named; +import com.google.inject.spi.Element; +import com.google.inject.spi.Elements; +import com.google.inject.util.Providers; + +import junit.framework.TestCase; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -31,12 +36,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.logging.Logger; -import junit.framework.TestCase; - -import com.google.inject.spi.Element; -import com.google.inject.spi.Elements; -import com.google.inject.util.Providers; - /** * A suite of tests for duplicate bindings. * diff --git a/core/test/com/google/inject/ErrorHandlingTest.java b/core/test/com/google/inject/ErrorHandlingTest.java index 13b3e56b..3a1a142d 100644 --- a/core/test/com/google/inject/ErrorHandlingTest.java +++ b/core/test/com/google/inject/ErrorHandlingTest.java @@ -16,11 +16,13 @@ package com.google.inject; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.name.Named; import com.google.inject.name.Names; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.util.List; diff --git a/core/test/com/google/inject/GenericInjectionTest.java b/core/test/com/google/inject/GenericInjectionTest.java index 6cf583f6..51a1cb11 100644 --- a/core/test/com/google/inject/GenericInjectionTest.java +++ b/core/test/com/google/inject/GenericInjectionTest.java @@ -19,12 +19,14 @@ package com.google.inject; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.inject.util.Modules; + +import junit.framework.TestCase; + import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/ImplicitBindingTest.java b/core/test/com/google/inject/ImplicitBindingTest.java index 638db418..f39a2950 100644 --- a/core/test/com/google/inject/ImplicitBindingTest.java +++ b/core/test/com/google/inject/ImplicitBindingTest.java @@ -17,12 +17,13 @@ package com.google.inject; import com.google.common.collect.Iterables; -import java.util.List; - import com.google.inject.name.Named; import com.google.inject.name.Names; + import junit.framework.TestCase; +import java.util.List; + /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/InjectorTest.java b/core/test/com/google/inject/InjectorTest.java index a83e8a5c..c028bd7c 100644 --- a/core/test/com/google/inject/InjectorTest.java +++ b/core/test/com/google/inject/InjectorTest.java @@ -18,20 +18,24 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.assertNotSerializable; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + + +import junit.framework.TestCase; + import java.io.IOException; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) */ + public class InjectorTest extends TestCase { @Retention(RUNTIME) diff --git a/core/test/com/google/inject/IntegrationTest.java b/core/test/com/google/inject/IntegrationTest.java index 2132898a..ceff0add 100644 --- a/core/test/com/google/inject/IntegrationTest.java +++ b/core/test/com/google/inject/IntegrationTest.java @@ -17,7 +17,9 @@ package com.google.inject; import static com.google.inject.matcher.Matchers.any; + import junit.framework.TestCase; + import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/test/com/google/inject/JitBindingsTest.java b/core/test/com/google/inject/JitBindingsTest.java index 36dac104..cd9a964c 100644 --- a/core/test/com/google/inject/JitBindingsTest.java +++ b/core/test/com/google/inject/JitBindingsTest.java @@ -16,11 +16,11 @@ package com.google.inject; +import static com.google.common.collect.ImmutableSet.of; import static com.google.inject.Asserts.assertContains; +import static com.google.inject.JitBindingsTest.GetBindingCheck.ALLOW_BINDING; import static com.google.inject.JitBindingsTest.GetBindingCheck.ALLOW_BINDING_PROVIDER; import static com.google.inject.JitBindingsTest.GetBindingCheck.FAIL_ALL; -import static com.google.inject.JitBindingsTest.GetBindingCheck.ALLOW_BINDING; -import static com.google.common.collect.ImmutableSet.of; import junit.framework.TestCase; diff --git a/core/test/com/google/inject/KeyTest.java b/core/test/com/google/inject/KeyTest.java index 616a37f9..74f7a94f 100644 --- a/core/test/com/google/inject/KeyTest.java +++ b/core/test/com/google/inject/KeyTest.java @@ -19,13 +19,17 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.assertEqualsBothWays; import static com.google.inject.Asserts.assertNotSerializable; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.util.Types; + +import junit.framework.TestCase; + import java.io.IOException; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -33,7 +37,6 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.List; import java.util.Map; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/LoggerInjectionTest.java b/core/test/com/google/inject/LoggerInjectionTest.java index c8b512ac..36e5b229 100644 --- a/core/test/com/google/inject/LoggerInjectionTest.java +++ b/core/test/com/google/inject/LoggerInjectionTest.java @@ -1,10 +1,13 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; + import com.google.inject.name.Names; -import java.util.logging.Logger; + import junit.framework.TestCase; +import java.util.logging.Logger; + /** * Test built-in injection of loggers. * diff --git a/core/test/com/google/inject/MembersInjectorTest.java b/core/test/com/google/inject/MembersInjectorTest.java index cf0bf863..4bb32ddc 100644 --- a/core/test/com/google/inject/MembersInjectorTest.java +++ b/core/test/com/google/inject/MembersInjectorTest.java @@ -17,12 +17,15 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; + import com.google.inject.name.Names; import com.google.inject.util.Providers; -import java.util.concurrent.atomic.AtomicReference; + import junit.framework.AssertionFailedError; import junit.framework.TestCase; +import java.util.concurrent.atomic.AtomicReference; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/MethodInterceptionTest.java b/core/test/com/google/inject/MethodInterceptionTest.java index e81faee8..6d6d5961 100644 --- a/core/test/com/google/inject/MethodInterceptionTest.java +++ b/core/test/com/google/inject/MethodInterceptionTest.java @@ -16,23 +16,26 @@ package com.google.inject; +import static com.google.inject.matcher.Matchers.only; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.inject.matcher.AbstractMatcher; import com.google.inject.matcher.Matchers; -import static com.google.inject.matcher.Matchers.only; import com.google.inject.spi.ConstructorBinding; + +import junit.framework.TestCase; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/ModulesTest.java b/core/test/com/google/inject/ModulesTest.java index fcf8f9ca..76a28e0c 100644 --- a/core/test/com/google/inject/ModulesTest.java +++ b/core/test/com/google/inject/ModulesTest.java @@ -17,9 +17,11 @@ package com.google.inject; import com.google.inject.util.Modules; -import java.util.Arrays; + import junit.framework.TestCase; +import java.util.Arrays; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/NullableInjectionPointTest.java b/core/test/com/google/inject/NullableInjectionPointTest.java index 59f6ab6b..10eaefda 100644 --- a/core/test/com/google/inject/NullableInjectionPointTest.java +++ b/core/test/com/google/inject/NullableInjectionPointTest.java @@ -2,14 +2,14 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; +import junit.framework.TestCase; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import junit.framework.TestCase; - /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/OptionalBindingTest.java b/core/test/com/google/inject/OptionalBindingTest.java index 2358de40..46cff710 100644 --- a/core/test/com/google/inject/OptionalBindingTest.java +++ b/core/test/com/google/inject/OptionalBindingTest.java @@ -18,8 +18,10 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; + import com.google.inject.name.Named; import com.google.inject.name.Names; + import junit.framework.TestCase; /** diff --git a/core/test/com/google/inject/OverrideModuleTest.java b/core/test/com/google/inject/OverrideModuleTest.java index ff155392..0f211c20 100644 --- a/core/test/com/google/inject/OverrideModuleTest.java +++ b/core/test/com/google/inject/OverrideModuleTest.java @@ -19,17 +19,19 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Guice.createInjector; import static com.google.inject.name.Names.named; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import com.google.common.base.Objects; import com.google.inject.name.Named; import com.google.inject.util.Modules; -import static java.lang.annotation.ElementType.TYPE; + +import junit.framework.TestCase; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.util.Date; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; /** * @author sberlin@gmail.com (Sam Berlin) diff --git a/core/test/com/google/inject/ParentInjectorTest.java b/core/test/com/google/inject/ParentInjectorTest.java index e737c248..abedd6e8 100644 --- a/core/test/com/google/inject/ParentInjectorTest.java +++ b/core/test/com/google/inject/ParentInjectorTest.java @@ -17,18 +17,20 @@ limitations under the License. package com.google.inject; import static com.google.inject.Asserts.assertContains; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.inject.matcher.Matchers; import com.google.inject.name.Names; import com.google.inject.spi.TypeConverter; -import static java.lang.annotation.ElementType.TYPE; + +import junit.framework.TestCase; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.util.List; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/PerformanceComparison.java b/core/test/com/google/inject/PerformanceComparison.java index 825c2a8f..a6351a30 100644 --- a/core/test/com/google/inject/PerformanceComparison.java +++ b/core/test/com/google/inject/PerformanceComparison.java @@ -16,18 +16,20 @@ package com.google.inject; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.text.DecimalFormat; -import java.util.concurrent.Callable; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertSame; + import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; +import java.lang.annotation.Retention; +import java.text.DecimalFormat; +import java.util.concurrent.Callable; + /** * A semi-useless microbenchmark. Spring and Guice constuct the same object * graph a bunch of times, and we see who can construct the most per second. diff --git a/core/test/com/google/inject/PrivateModuleTest.java b/core/test/com/google/inject/PrivateModuleTest.java index 0a6f84de..72fa35da 100644 --- a/core/test/com/google/inject/PrivateModuleTest.java +++ b/core/test/com/google/inject/PrivateModuleTest.java @@ -17,15 +17,11 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import static com.google.inject.name.Names.named; import com.google.common.collect.ImmutableSet; import com.google.inject.name.Named; import com.google.inject.name.Names; -import static com.google.inject.name.Names.named; import com.google.inject.spi.Dependency; import com.google.inject.spi.ExposedBinding; import com.google.inject.spi.PrivateElements; @@ -33,6 +29,10 @@ import com.google.inject.util.Types; import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/ProviderInjectionTest.java b/core/test/com/google/inject/ProviderInjectionTest.java index b73e3837..755ff97a 100644 --- a/core/test/com/google/inject/ProviderInjectionTest.java +++ b/core/test/com/google/inject/ProviderInjectionTest.java @@ -16,8 +16,10 @@ package com.google.inject; -import com.google.inject.name.Named; import static com.google.inject.name.Names.named; + +import com.google.inject.name.Named; + import junit.framework.TestCase; import java.util.Arrays; diff --git a/core/test/com/google/inject/ProvisionExceptionTest.java b/core/test/com/google/inject/ProvisionExceptionTest.java index 6bef496a..aa4bfd5c 100644 --- a/core/test/com/google/inject/ProvisionExceptionTest.java +++ b/core/test/com/google/inject/ProvisionExceptionTest.java @@ -18,16 +18,18 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.reserialize; -import java.io.IOException; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; + import junit.framework.TestCase; +import java.io.IOException; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/ProvisionExceptionsTest.java b/core/test/com/google/inject/ProvisionExceptionsTest.java index 0ee50e38..23c323c1 100644 --- a/core/test/com/google/inject/ProvisionExceptionsTest.java +++ b/core/test/com/google/inject/ProvisionExceptionsTest.java @@ -16,14 +16,14 @@ package com.google.inject; -import java.io.IOException; - -import junit.framework.TestCase; - import com.google.inject.internal.Errors; import com.google.inject.name.Named; import com.google.inject.name.Names; +import junit.framework.TestCase; + +import java.io.IOException; + /** * Tests that ProvisionExceptions are readable and clearly indicate to the user what went wrong with * their code. diff --git a/core/test/com/google/inject/ProvisionListenerTest.java b/core/test/com/google/inject/ProvisionListenerTest.java index 0747bdf8..9d08b5cd 100644 --- a/core/test/com/google/inject/ProvisionListenerTest.java +++ b/core/test/com/google/inject/ProvisionListenerTest.java @@ -16,15 +16,10 @@ package com.google.inject; -import static com.google.inject.Asserts.assertContains; import static com.google.common.collect.ImmutableList.of; +import static com.google.inject.Asserts.assertContains; import static com.google.inject.name.Names.named; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; - -import junit.framework.TestCase; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.inject.matcher.Matcher; @@ -33,6 +28,11 @@ import com.google.inject.name.Named; import com.google.inject.spi.DependencyAndSource; import com.google.inject.spi.ProvisionListener; +import junit.framework.TestCase; + +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + /** * Tests for {@link Binder#bindListener(Matcher, ProvisionListener...)} * diff --git a/core/test/com/google/inject/ReflectionTest.java b/core/test/com/google/inject/ReflectionTest.java index ba5be259..15695e4a 100644 --- a/core/test/com/google/inject/ReflectionTest.java +++ b/core/test/com/google/inject/ReflectionTest.java @@ -18,10 +18,10 @@ package com.google.inject; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Retention; - import junit.framework.TestCase; +import java.lang.annotation.Retention; + /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/RequestInjectionTest.java b/core/test/com/google/inject/RequestInjectionTest.java index f30cb27b..b91bd93b 100644 --- a/core/test/com/google/inject/RequestInjectionTest.java +++ b/core/test/com/google/inject/RequestInjectionTest.java @@ -17,10 +17,12 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + import junit.framework.TestCase; +import java.lang.annotation.Retention; + /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/ScopesTest.java b/core/test/com/google/inject/ScopesTest.java index a7b2ba93..c2b8a7a8 100644 --- a/core/test/com/google/inject/ScopesTest.java +++ b/core/test/com/google/inject/ScopesTest.java @@ -17,25 +17,28 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; +import static com.google.inject.name.Names.named; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.name.Named; -import static com.google.inject.name.Names.named; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; import com.google.inject.spi.PrivateElements; import com.google.inject.util.Providers; + +import junit.framework.TestCase; + import java.io.IOException; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) @@ -240,7 +243,7 @@ public class ScopesTest extends TestCase { public void testUnscopedProviderWorksOutsideOfRequestedScope() { final RememberProviderScope scope = new RememberProviderScope(); - + Injector injector = Guice.createInjector(new AbstractModule() { protected void configure() { bindScope(CustomScoped.class, scope); @@ -471,7 +474,7 @@ public class ScopesTest extends TestCase { bind(e).toProvider(Providers.of("e")).asEagerSingleton(); bind(f).toProvider(Providers.of("f")).in(Singleton.class); bind(h).to(AnnotatedSingleton.class); - install(new PrivateModule() { + install(new PrivateModule() { @Override protected void configure() { bind(i).toProvider(Providers.of("i")).in(Singleton.class); @@ -509,7 +512,7 @@ public class ScopesTest extends TestCase { assertTrue(Scopes.isSingleton(injector.getBinding(h))); assertTrue(Scopes.isSingleton(injector.getBinding(i))); } - + public void testIsSingletonNegative() { final Key<String> a = Key.get(String.class, named("A")); final Key<String> b = Key.get(String.class, named("B")); @@ -525,7 +528,7 @@ public class ScopesTest extends TestCase { bind(c).toProvider(Providers.of("c")).in(Scopes.NO_SCOPE); bind(d).toProvider(Providers.of("d")).in(CustomScoped.class); bindScope(CustomScoped.class, Scopes.NO_SCOPE); - install(new PrivateModule() { + install(new PrivateModule() { @Override protected void configure() { bind(f).toProvider(Providers.of("f")).in(CustomScoped.class); diff --git a/core/test/com/google/inject/SerializationTest.java b/core/test/com/google/inject/SerializationTest.java index ec2245da..df353f67 100644 --- a/core/test/com/google/inject/SerializationTest.java +++ b/core/test/com/google/inject/SerializationTest.java @@ -18,11 +18,13 @@ package com.google.inject; import static com.google.inject.Asserts.assertSimilarWhenReserialized; + +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + import java.io.IOException; import java.io.Serializable; import java.util.List; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/SuiteUtils.java b/core/test/com/google/inject/SuiteUtils.java index eac6e684..cd9eb10c 100644 --- a/core/test/com/google/inject/SuiteUtils.java +++ b/core/test/com/google/inject/SuiteUtils.java @@ -16,12 +16,12 @@ package com.google.inject; -import java.util.Enumeration; -import java.util.Set; - import junit.framework.Test; import junit.framework.TestSuite; +import java.util.Enumeration; +import java.util.Set; + public class SuiteUtils { public static TestSuite removeSuppressedTests(TestSuite suite, Set<String> suppressedTestNames) { diff --git a/core/test/com/google/inject/TypeConversionTest.java b/core/test/com/google/inject/TypeConversionTest.java index ef24dfc9..02fb4422 100644 --- a/core/test/com/google/inject/TypeConversionTest.java +++ b/core/test/com/google/inject/TypeConversionTest.java @@ -17,17 +17,20 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.common.collect.Iterables; import com.google.inject.matcher.Matchers; import com.google.inject.spi.ConvertedConstantBinding; import com.google.inject.spi.TypeConverter; import com.google.inject.spi.TypeConverterBinding; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.util.Date; + import junit.framework.AssertionFailedError; import junit.framework.TestCase; +import java.lang.annotation.Retention; +import java.util.Date; + /** * @author crazybob@google.com (Bob Lee) */ @@ -114,7 +117,7 @@ public class TypeConversionTest extends TestCase { assertEquals(Bar.TEE, foo.enumField); assertEquals(Foo.class, foo.classField); } - + public void testConstantInjectionWithExplicitBindingsRequired() throws CreationException { Injector injector = Guice.createInjector(new AbstractModule() { protected void configure() { @@ -224,7 +227,7 @@ public class TypeConversionTest extends TestCase { bind(LongHolder.class); } }); - + assertEquals(5L, (long) injector.getInstance(LongHolder.class).foo); } @@ -323,7 +326,7 @@ public class TypeConversionTest extends TestCase { "at " + DateHolder.class.getName() + ".date(TypeConversionTest.java:"); } } - + public void testStringIsConvertedOnlyOnce() { final TypeConverter converter = new TypeConverter() { boolean converted = false; diff --git a/core/test/com/google/inject/TypeListenerTest.java b/core/test/com/google/inject/TypeListenerTest.java index dfb28309..5526d2e6 100644 --- a/core/test/com/google/inject/TypeListenerTest.java +++ b/core/test/com/google/inject/TypeListenerTest.java @@ -17,21 +17,24 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; +import static com.google.inject.matcher.Matchers.any; +import static com.google.inject.matcher.Matchers.only; +import static com.google.inject.name.Names.named; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.inject.matcher.Matcher; import com.google.inject.matcher.Matchers; -import static com.google.inject.matcher.Matchers.any; -import static com.google.inject.matcher.Matchers.only; -import static com.google.inject.name.Names.named; import com.google.inject.spi.InjectionListener; import com.google.inject.spi.Message; import com.google.inject.spi.TypeEncounter; import com.google.inject.spi.TypeListener; + +import junit.framework.TestCase; + import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/TypeLiteralInjectionTest.java b/core/test/com/google/inject/TypeLiteralInjectionTest.java index eee1f4ab..1231a813 100644 --- a/core/test/com/google/inject/TypeLiteralInjectionTest.java +++ b/core/test/com/google/inject/TypeLiteralInjectionTest.java @@ -17,11 +17,14 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; -import com.google.inject.util.Types; import static com.google.inject.util.Types.listOf; -import java.util.List; + +import com.google.inject.util.Types; + import junit.framework.TestCase; +import java.util.List; + /** * Demonstrates type reification. * diff --git a/core/test/com/google/inject/TypeLiteralTest.java b/core/test/com/google/inject/TypeLiteralTest.java index e009d144..ca14e43c 100644 --- a/core/test/com/google/inject/TypeLiteralTest.java +++ b/core/test/com/google/inject/TypeLiteralTest.java @@ -18,13 +18,16 @@ package com.google.inject; import static com.google.inject.Asserts.assertEqualsBothWays; import static com.google.inject.Asserts.assertNotSerializable; + import com.google.common.collect.ImmutableList; import com.google.inject.util.Types; + +import junit.framework.TestCase; + import java.io.IOException; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.List; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/TypeLiteralTypeResolutionTest.java b/core/test/com/google/inject/TypeLiteralTypeResolutionTest.java index 6911a95e..64bc4c70 100644 --- a/core/test/com/google/inject/TypeLiteralTypeResolutionTest.java +++ b/core/test/com/google/inject/TypeLiteralTypeResolutionTest.java @@ -18,13 +18,17 @@ package com.google.inject; import static com.google.inject.Asserts.assertEqualsBothWays; import static com.google.inject.Asserts.assertNotSerializable; -import com.google.common.collect.ImmutableList; -import com.google.inject.util.Types; import static com.google.inject.util.Types.arrayOf; import static com.google.inject.util.Types.listOf; import static com.google.inject.util.Types.newParameterizedType; import static com.google.inject.util.Types.newParameterizedTypeWithOwner; import static com.google.inject.util.Types.setOf; + +import com.google.common.collect.ImmutableList; +import com.google.inject.util.Types; + +import junit.framework.TestCase; + import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -39,7 +43,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestCase; /** * This test checks that TypeLiteral can perform type resolution on its members. diff --git a/core/test/com/google/inject/example/ClientServiceWithGuice.java b/core/test/com/google/inject/example/ClientServiceWithGuice.java index d16dd831..c0273775 100644 --- a/core/test/com/google/inject/example/ClientServiceWithGuice.java +++ b/core/test/com/google/inject/example/ClientServiceWithGuice.java @@ -16,13 +16,14 @@ package com.google.inject.example; +import static junit.framework.Assert.assertTrue; + import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Scopes; -import static junit.framework.Assert.assertTrue; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java b/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java index d53c2bb0..5a3d9a77 100644 --- a/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java +++ b/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java @@ -22,6 +22,7 @@ import com.google.inject.ImplementedBy; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; + import junit.framework.Assert; /** diff --git a/core/test/com/google/inject/example/JndiProvider.java b/core/test/com/google/inject/example/JndiProvider.java index e377caa5..fd90dc05 100644 --- a/core/test/com/google/inject/example/JndiProvider.java +++ b/core/test/com/google/inject/example/JndiProvider.java @@ -18,6 +18,7 @@ package com.google.inject.example; import com.google.inject.Inject; import com.google.inject.Provider; + import javax.naming.Context; import javax.naming.NamingException; diff --git a/core/test/com/google/inject/example/JndiProviderClient.java b/core/test/com/google/inject/example/JndiProviderClient.java index e2ad2a2f..897b2492 100644 --- a/core/test/com/google/inject/example/JndiProviderClient.java +++ b/core/test/com/google/inject/example/JndiProviderClient.java @@ -16,11 +16,13 @@ package com.google.inject.example; +import static com.google.inject.example.JndiProvider.fromJndi; + import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Injector; -import static com.google.inject.example.JndiProvider.fromJndi; + import javax.naming.Context; import javax.naming.InitialContext; import javax.sql.DataSource; diff --git a/core/test/com/google/inject/internal/MoreTypesTest.java b/core/test/com/google/inject/internal/MoreTypesTest.java index 9a1e4ef6..34026a08 100644 --- a/core/test/com/google/inject/internal/MoreTypesTest.java +++ b/core/test/com/google/inject/internal/MoreTypesTest.java @@ -17,9 +17,11 @@ package com.google.inject.internal; import com.google.inject.TypeLiteral; + +import junit.framework.TestCase; + import java.util.Map; import java.util.Set; -import junit.framework.TestCase; /** * @author schmitt@google.com (Peter Schmitt) diff --git a/core/test/com/google/inject/internal/ProxyFactoryTest.java b/core/test/com/google/inject/internal/ProxyFactoryTest.java index ab42b3ee..ce8caa66 100644 --- a/core/test/com/google/inject/internal/ProxyFactoryTest.java +++ b/core/test/com/google/inject/internal/ProxyFactoryTest.java @@ -16,21 +16,24 @@ package com.google.inject.internal; -import com.google.inject.Inject; import static com.google.inject.matcher.Matchers.annotatedWith; import static com.google.inject.matcher.Matchers.any; import static com.google.inject.matcher.Matchers.not; import static com.google.inject.matcher.Matchers.only; import com.google.common.collect.Lists; +import com.google.inject.Inject; import com.google.inject.spi.InjectionPoint; + +import junit.framework.TestCase; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.InvocationTargetException; import java.util.List; -import junit.framework.TestCase; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * @author crazybob@google.com (Bob Lee) diff --git a/core/test/com/google/inject/internal/util/LineNumbersTest.java b/core/test/com/google/inject/internal/util/LineNumbersTest.java index 78421cd7..68a2b26b 100644 --- a/core/test/com/google/inject/internal/util/LineNumbersTest.java +++ b/core/test/com/google/inject/internal/util/LineNumbersTest.java @@ -16,16 +16,19 @@ package com.google.inject.internal.util; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertContains; + +import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.matcher.Matchers; -import java.lang.reflect.Modifier; + import junit.framework.TestCase; +import java.lang.reflect.Modifier; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/matcher/MatcherTest.java b/core/test/com/google/inject/matcher/MatcherTest.java index 8b3ac981..58fbdf2a 100644 --- a/core/test/com/google/inject/matcher/MatcherTest.java +++ b/core/test/com/google/inject/matcher/MatcherTest.java @@ -27,18 +27,22 @@ import static com.google.inject.matcher.Matchers.not; import static com.google.inject.matcher.Matchers.only; import static com.google.inject.matcher.Matchers.returns; import static com.google.inject.matcher.Matchers.subclassesOf; + import com.google.inject.name.Named; import com.google.inject.name.Names; + +import junit.framework.TestCase; + import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Method; import java.util.AbstractList; -import junit.framework.TestCase; /** * @author crazybob@google.com (Bob Lee) */ + public class MatcherTest extends TestCase { public void testAny() { @@ -143,7 +147,7 @@ public class MatcherTest extends TestCase { assertEqualsBothWays(predicate, returns(only(String.class))); assertFalse(predicate.equals(returns(only(Integer.class)))); } - + public void testSerialization() throws IOException { assertEqualWhenReserialized(any()); assertEqualWhenReserialized(not(any())); @@ -160,7 +164,7 @@ public class MatcherTest extends TestCase { } static abstract class MyRunnable implements Runnable {} - + @Retention(RetentionPolicy.RUNTIME) @interface Foo {} diff --git a/core/test/com/google/inject/name/NamedEquivalanceTest.java b/core/test/com/google/inject/name/NamedEquivalanceTest.java index 58a6a909..36dee0c6 100644 --- a/core/test/com/google/inject/name/NamedEquivalanceTest.java +++ b/core/test/com/google/inject/name/NamedEquivalanceTest.java @@ -18,12 +18,6 @@ package com.google.inject.name; import static com.google.inject.Asserts.assertContains; -import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.util.Properties; - -import junit.framework.TestCase; - import com.google.inject.AbstractModule; import com.google.inject.ConfigurationException; import com.google.inject.CreationException; @@ -34,6 +28,12 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provides; +import junit.framework.TestCase; + +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.util.Properties; + /** * Tests that {@code javax.inject.Named} and {@code com.google.inject.name.Named} are completely * interchangeable: bindings for one can be used to inject the other. diff --git a/core/test/com/google/inject/name/NamesTest.java b/core/test/com/google/inject/name/NamesTest.java index 9ea7ef42..0df35131 100644 --- a/core/test/com/google/inject/name/NamesTest.java +++ b/core/test/com/google/inject/name/NamesTest.java @@ -17,17 +17,20 @@ package com.google.inject.name; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertEqualWhenReserialized; import static com.google.inject.Asserts.assertEqualsBothWays; + +import com.google.common.collect.ImmutableMap; +import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.ImmutableMap; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.Map; import java.util.Properties; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/spi/BindingTargetVisitorTest.java b/core/test/com/google/inject/spi/BindingTargetVisitorTest.java index 6f804953..7740551c 100644 --- a/core/test/com/google/inject/spi/BindingTargetVisitorTest.java +++ b/core/test/com/google/inject/spi/BindingTargetVisitorTest.java @@ -18,6 +18,7 @@ package com.google.inject.spi; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Injector; + import junit.framework.TestCase; /** diff --git a/core/test/com/google/inject/spi/ElementsTest.java b/core/test/com/google/inject/spi/ElementsTest.java index d0aa8904..57b844c6 100644 --- a/core/test/com/google/inject/spi/ElementsTest.java +++ b/core/test/com/google/inject/spi/ElementsTest.java @@ -16,8 +16,13 @@ package com.google.inject.spi; -import com.google.inject.AbstractModule; +import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.inject.Asserts.assertContains; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.BindingAnnotation; import com.google.inject.Inject; @@ -35,19 +40,17 @@ import com.google.inject.binder.AnnotatedBindingBuilder; import com.google.inject.binder.AnnotatedConstantBindingBuilder; import com.google.inject.binder.ConstantBindingBuilder; import com.google.inject.binder.ScopedBindingBuilder; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import static com.google.common.collect.Iterables.getOnlyElement; - import com.google.inject.matcher.Matcher; import com.google.inject.matcher.Matchers; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.util.Providers; + +import junit.framework.TestCase; + import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -62,7 +65,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/spi/FailingBindingScopingVisitor.java b/core/test/com/google/inject/spi/FailingBindingScopingVisitor.java index 5dcb0d4f..bd08c4b4 100644 --- a/core/test/com/google/inject/spi/FailingBindingScopingVisitor.java +++ b/core/test/com/google/inject/spi/FailingBindingScopingVisitor.java @@ -17,9 +17,11 @@ package com.google.inject.spi; import com.google.inject.Scope; -import java.lang.annotation.Annotation; + import junit.framework.AssertionFailedError; +import java.lang.annotation.Annotation; + public class FailingBindingScopingVisitor implements BindingScopingVisitor<Void> { public Void visitEagerSingleton() { diff --git a/core/test/com/google/inject/spi/FailingTargetVisitor.java b/core/test/com/google/inject/spi/FailingTargetVisitor.java index 9cf554a2..68d5f7e0 100644 --- a/core/test/com/google/inject/spi/FailingTargetVisitor.java +++ b/core/test/com/google/inject/spi/FailingTargetVisitor.java @@ -17,6 +17,7 @@ package com.google.inject.spi; import com.google.inject.Binding; + import junit.framework.AssertionFailedError; public class FailingTargetVisitor<T> extends DefaultBindingTargetVisitor<T, Void> { diff --git a/core/test/com/google/inject/spi/HasDependenciesTest.java b/core/test/com/google/inject/spi/HasDependenciesTest.java index c6310e91..670f2f4b 100644 --- a/core/test/com/google/inject/spi/HasDependenciesTest.java +++ b/core/test/com/google/inject/spi/HasDependenciesTest.java @@ -16,17 +16,19 @@ package com.google.inject.spi; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import java.util.Set; + import junit.framework.TestCase; +import java.util.Set; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/spi/InjectionPointTest.java b/core/test/com/google/inject/spi/InjectionPointTest.java index 9c9adecf..596894dd 100644 --- a/core/test/com/google/inject/spi/InjectionPointTest.java +++ b/core/test/com/google/inject/spi/InjectionPointTest.java @@ -16,20 +16,25 @@ package com.google.inject.spi; +import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.assertEqualsBothWays; import static com.google.inject.Asserts.assertNotSerializable; +import static com.google.inject.name.Names.named; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.inject.ConfigurationException; import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.TypeLiteral; import com.google.inject.internal.ErrorsException; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import static com.google.common.collect.Iterables.getOnlyElement; - import com.google.inject.name.Named; -import static com.google.inject.name.Names.named; +import com.google.inject.spi.InjectionPoint.Signature; + +import junit.framework.Assert; +import junit.framework.TestCase; + import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -38,9 +43,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import junit.framework.Assert; -import junit.framework.TestCase; -import com.google.inject.spi.InjectionPoint.Signature; /** * @author jessewilson@google.com (Jesse Wilson) @@ -239,14 +241,14 @@ public class InjectionPointTest extends TestCase { } public void testOverrideBehavior() { - Set<InjectionPoint> points; - - points = InjectionPoint.forInstanceMethodsAndFields(Super.class); - assertEquals(points.toString(), 6, points.size()); - assertPoints(points, Super.class, "atInject", "gInject", "privateAtAndPublicG", - "privateGAndPublicAt", "atFirstThenG", "gFirstThenAt"); - - points = InjectionPoint.forInstanceMethodsAndFields(Sub.class); + Set<InjectionPoint> points; + + points = InjectionPoint.forInstanceMethodsAndFields(Super.class); + assertEquals(points.toString(), 6, points.size()); + assertPoints(points, Super.class, "atInject", "gInject", "privateAtAndPublicG", + "privateGAndPublicAt", "atFirstThenG", "gFirstThenAt"); + + points = InjectionPoint.forInstanceMethodsAndFields(Sub.class); assertEquals(points.toString(), 7, points.size()); // Superclass will always have is private members injected, // and 'gInject' was last @Injected in Super, so that remains the owner @@ -278,13 +280,13 @@ public class InjectionPointTest extends TestCase { } static class Super { - @javax.inject.Inject public void atInject() {} - @com.google.inject.Inject public void gInject() {} - - @javax.inject.Inject private void privateAtAndPublicG() {} - @com.google.inject.Inject private void privateGAndPublicAt() {} - - @javax.inject.Inject public void atFirstThenG() {} + @javax.inject.Inject public void atInject() {} + @com.google.inject.Inject public void gInject() {} + + @javax.inject.Inject private void privateAtAndPublicG() {} + @com.google.inject.Inject private void privateGAndPublicAt() {} + + @javax.inject.Inject public void atFirstThenG() {} @com.google.inject.Inject public void gFirstThenAt() {} } diff --git a/core/test/com/google/inject/spi/InjectorSpiTest.java b/core/test/com/google/inject/spi/InjectorSpiTest.java index d2b2b97f..a973fe96 100644 --- a/core/test/com/google/inject/spi/InjectorSpiTest.java +++ b/core/test/com/google/inject/spi/InjectorSpiTest.java @@ -1,7 +1,5 @@ package com.google.inject.spi; -import java.util.Map; - import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.Guice; @@ -13,6 +11,8 @@ import com.google.inject.TypeLiteral; import junit.framework.TestCase; +import java.util.Map; + /** * @author sberlin@gmail.com (Sam Berlin) */ diff --git a/core/test/com/google/inject/spi/ModuleRewriterTest.java b/core/test/com/google/inject/spi/ModuleRewriterTest.java index 885585ec..06581da5 100644 --- a/core/test/com/google/inject/spi/ModuleRewriterTest.java +++ b/core/test/com/google/inject/spi/ModuleRewriterTest.java @@ -16,6 +16,7 @@ package com.google.inject.spi; +import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.ConfigurationException; @@ -25,11 +26,11 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; -import com.google.common.collect.Lists; import com.google.inject.name.Names; -import java.util.List; + import junit.framework.TestCase; +import java.util.List; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/google/inject/spi/ProviderMethodsTest.java b/core/test/com/google/inject/spi/ProviderMethodsTest.java index 3a78db94..3c608298 100644 --- a/core/test/com/google/inject/spi/ProviderMethodsTest.java +++ b/core/test/com/google/inject/spi/ProviderMethodsTest.java @@ -16,8 +16,12 @@ package com.google.inject.spi; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertContains; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.BindingAnnotation; import com.google.inject.CreationException; @@ -29,24 +33,22 @@ import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.Provides; import com.google.inject.Singleton; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.inject.internal.ProviderMethod; import com.google.inject.internal.ProviderMethodsModule; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.util.Types; + +import junit.framework.TestCase; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Logger; -import junit.framework.TestCase; - /** * @author crazybob@google.com (Bob Lee) */ diff --git a/core/test/com/google/inject/spi/SpiBindingsTest.java b/core/test/com/google/inject/spi/SpiBindingsTest.java index c5b99862..a5fb45a0 100644 --- a/core/test/com/google/inject/spi/SpiBindingsTest.java +++ b/core/test/com/google/inject/spi/SpiBindingsTest.java @@ -16,8 +16,11 @@ package com.google.inject.spi; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertContains; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Inject; @@ -29,9 +32,11 @@ import com.google.inject.Scope; import com.google.inject.Scopes; import com.google.inject.Singleton; import com.google.inject.Stage; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.inject.name.Names; + +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + import java.lang.reflect.Constructor; import java.util.Collections; import java.util.Comparator; @@ -40,9 +45,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/core/test/com/google/inject/spi/ToolStageInjectorTest.java b/core/test/com/google/inject/spi/ToolStageInjectorTest.java index 89291129..7f63f1ca 100644 --- a/core/test/com/google/inject/spi/ToolStageInjectorTest.java +++ b/core/test/com/google/inject/spi/ToolStageInjectorTest.java @@ -1,12 +1,5 @@ package com.google.inject.spi; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import junit.framework.TestCase; - import com.google.inject.AbstractModule; import com.google.inject.Asserts; import com.google.inject.CreationException; @@ -18,6 +11,13 @@ import com.google.inject.Provider; import com.google.inject.Stage; import com.google.inject.spi.Toolable; +import junit.framework.TestCase; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class ToolStageInjectorTest extends TestCase { @Override diff --git a/core/test/com/google/inject/util/ProvidersTest.java b/core/test/com/google/inject/util/ProvidersTest.java index b99d1262..1074db31 100644 --- a/core/test/com/google/inject/util/ProvidersTest.java +++ b/core/test/com/google/inject/util/ProvidersTest.java @@ -17,6 +17,7 @@ package com.google.inject.util; import com.google.inject.Provider; + import junit.framework.TestCase; /** diff --git a/core/test/com/google/inject/util/TypesTest.java b/core/test/com/google/inject/util/TypesTest.java index e9a65c5c..d3c2e842 100644 --- a/core/test/com/google/inject/util/TypesTest.java +++ b/core/test/com/google/inject/util/TypesTest.java @@ -20,10 +20,15 @@ package com.google.inject.util; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.assertEqualWhenReserialized; import static com.google.inject.Asserts.assertEqualsBothWays; -import com.google.inject.TypeLiteral; -import com.google.inject.internal.MoreTypes; import static com.google.inject.util.Types.subtypeOf; import static com.google.inject.util.Types.supertypeOf; + +import com.google.inject.TypeLiteral; +import com.google.inject.internal.MoreTypes; + +import junit.framework.Assert; +import junit.framework.TestCase; + import java.io.IOException; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; @@ -32,8 +37,6 @@ import java.lang.reflect.WildcardType; import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.Assert; -import junit.framework.TestCase; /** * @author jessewilson@google.com (Jesse Wilson) diff --git a/core/test/com/googlecode/guice/BytecodeGenTest.java b/core/test/com/googlecode/guice/BytecodeGenTest.java index 054bd383..a62aacc0 100644 --- a/core/test/com/googlecode/guice/BytecodeGenTest.java +++ b/core/test/com/googlecode/guice/BytecodeGenTest.java @@ -16,13 +16,20 @@ package com.googlecode.guice; +import static com.google.inject.matcher.Matchers.any; + import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import static com.google.inject.matcher.Matchers.any; import com.googlecode.guice.PackageVisibilityTestModule.PublicUserOfPackagePrivate; + +import junit.framework.TestCase; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.io.File; import java.lang.ref.Reference; import java.lang.ref.WeakReference; @@ -31,9 +38,6 @@ import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import junit.framework.TestCase; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * This test is in a separate package so we can test package-level visibility diff --git a/core/test/com/googlecode/guice/GuiceTck.java b/core/test/com/googlecode/guice/GuiceTck.java index 0a39858b..5616fd7d 100644 --- a/core/test/com/googlecode/guice/GuiceTck.java +++ b/core/test/com/googlecode/guice/GuiceTck.java @@ -19,8 +19,10 @@ package com.googlecode.guice; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Provides; -import javax.inject.Named; + import junit.framework.Test; +import junit.framework.TestCase; + import org.atinject.tck.Tck; import org.atinject.tck.auto.Car; import org.atinject.tck.auto.Convertible; @@ -34,7 +36,9 @@ import org.atinject.tck.auto.V8Engine; import org.atinject.tck.auto.accessories.Cupholder; import org.atinject.tck.auto.accessories.SpareTire; -public class GuiceTck { +import javax.inject.Named; + +public class GuiceTck extends TestCase { public static Test suite() { return Tck.testsFor(Guice.createInjector(new AbstractModule() { diff --git a/core/test/com/googlecode/guice/Jsr330Test.java b/core/test/com/googlecode/guice/Jsr330Test.java index 421c4b31..32e331f5 100644 --- a/core/test/com/googlecode/guice/Jsr330Test.java +++ b/core/test/com/googlecode/guice/Jsr330Test.java @@ -16,9 +16,10 @@ package com.googlecode.guice; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertContains; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -33,18 +34,17 @@ import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.util.Providers; +import junit.framework.TestCase; + import java.lang.annotation.Annotation; import java.lang.annotation.Retention; -import java.util.Iterator; import java.util.Set; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; import javax.inject.Qualifier; import javax.inject.Singleton; -import junit.framework.TestCase; public class Jsr330Test extends TestCase { diff --git a/core/test/com/googlecode/guice/OSGiContainerTest.java b/core/test/com/googlecode/guice/OSGiContainerTest.java index 5a00d2da..77ab8fae 100644 --- a/core/test/com/googlecode/guice/OSGiContainerTest.java +++ b/core/test/com/googlecode/guice/OSGiContainerTest.java @@ -16,15 +16,10 @@ package com.googlecode.guice; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Iterator; -import java.util.Properties; -import javax.imageio.spi.ServiceRegistry; +import aQute.bnd.main.bnd; + +import com.googlecode.guice.bundle.OSGiTestActivator; import junit.framework.TestCase; @@ -32,13 +27,19 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; -import aQute.bnd.main.bnd; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Iterator; +import java.util.Properties; -import com.googlecode.guice.bundle.OSGiTestActivator; +import javax.imageio.spi.ServiceRegistry; /** * Run various tests inside one or more OSGi containers. - * + * * @author mcculls@gmail.com (Stuart McCulloch) */ public class OSGiContainerTest @@ -112,7 +113,7 @@ public class OSGiContainerTest // assemble bundle, use -failok switch to avoid early exit bnd.main(new String[]{"-failok", "build", "-classpath", classpath, bndFileName}); } - + private String failMsg() { return "This test may fail if it is not run from ant, or if it is not run after ant has " + "compiled & built jars. This is because the test is validating that the Guice jar " diff --git a/core/test/com/googlecode/guice/bundle/OSGiTestActivator.java b/core/test/com/googlecode/guice/bundle/OSGiTestActivator.java index 51e42947..7c46fa05 100644 --- a/core/test/com/googlecode/guice/bundle/OSGiTestActivator.java +++ b/core/test/com/googlecode/guice/bundle/OSGiTestActivator.java @@ -18,15 +18,6 @@ package com.googlecode.guice.bundle; import static com.google.inject.name.Names.named; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Random; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Inject; @@ -34,6 +25,15 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.matcher.AbstractMatcher; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Random; + /** * Test Guice from inside an OSGi bundle activator. * diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/Assisted.java b/extensions/assistedinject/src/com/google/inject/assistedinject/Assisted.java index 0edf31ca..bdd633e5 100755 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/Assisted.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/Assisted.java @@ -16,12 +16,14 @@ package com.google.inject.assistedinject; -import com.google.inject.BindingAnnotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import com.google.inject.BindingAnnotation; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java b/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java index d3d94aa5..2d7084db 100755 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java @@ -16,9 +16,10 @@ package com.google.inject.assistedinject; +import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.TypeLiteral; -import com.google.common.collect.Lists; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedInject.java b/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedInject.java index 9fc4ca39..b639229d 100755 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedInject.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedInject.java @@ -17,12 +17,13 @@ package com.google.inject.assistedinject; import static java.lang.annotation.ElementType.CONSTRUCTOR; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; import com.google.inject.Inject; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + /** * <p> * When used in tandem with {@link FactoryModuleBuilder}, constructors annotated with diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java b/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java index d464b6a8..837c5c16 100644 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java @@ -15,12 +15,13 @@ */ package com.google.inject.assistedinject; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; import com.google.inject.ConfigurationException; import com.google.inject.Key; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import com.google.inject.spi.Message; + import java.util.Collections; import java.util.Map; diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java index b2c6103e..677252dd 100755 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java @@ -16,23 +16,25 @@ package com.google.inject.assistedinject; +import static com.google.inject.internal.Annotations.getKey; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.inject.ConfigurationException; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import static com.google.inject.internal.Annotations.getKey; import com.google.inject.internal.BytecodeGen; import com.google.inject.internal.Errors; import com.google.inject.internal.ErrorsException; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.Message; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationHandler; diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java index 430738f4..0485a96f 100644 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java @@ -16,9 +16,15 @@ package com.google.inject.assistedinject; -import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.base.Preconditions.checkState; +import static com.google.common.collect.Iterables.getOnlyElement; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -36,12 +42,6 @@ import com.google.inject.internal.BytecodeGen; import com.google.inject.internal.Errors; import com.google.inject.internal.ErrorsException; import com.google.inject.internal.util.Classes; -import com.google.common.base.Objects; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java index ab5bad7d..c3afd0cc 100755 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java @@ -16,12 +16,14 @@ package com.google.inject.assistedinject; +import static com.google.common.base.Preconditions.checkArgument; + import com.google.inject.ConfigurationException; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.internal.Annotations; -import static com.google.common.base.Preconditions.checkArgument; + import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/ParameterListKey.java b/extensions/assistedinject/src/com/google/inject/assistedinject/ParameterListKey.java index c0e32746..332b11da 100755 --- a/extensions/assistedinject/src/com/google/inject/assistedinject/ParameterListKey.java +++ b/extensions/assistedinject/src/com/google/inject/assistedinject/ParameterListKey.java @@ -17,6 +17,7 @@ package com.google.inject.assistedinject; import com.google.inject.TypeLiteral; + import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/ExtensionSpiTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/ExtensionSpiTest.java index cdbe9312..dfe05f26 100644 --- a/extensions/assistedinject/test/com/google/inject/assistedinject/ExtensionSpiTest.java +++ b/extensions/assistedinject/test/com/google/inject/assistedinject/ExtensionSpiTest.java @@ -18,6 +18,10 @@ package com.google.inject.assistedinject; import static com.google.inject.name.Names.named; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.Guice; @@ -25,10 +29,6 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Stage; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.inject.name.Named; import com.google.inject.spi.DefaultBindingTargetVisitor; import com.google.inject.spi.Dependency; diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java index 52dfc0be..39f039c0 100644 --- a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java +++ b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java @@ -19,14 +19,8 @@ package com.google.inject.assistedinject; import static com.google.inject.Asserts.assertContains; import static com.google.inject.name.Names.named; -import java.awt.Color; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import junit.framework.TestCase; - +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.CreationException; @@ -39,8 +33,6 @@ import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.Stage; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.spi.Dependency; @@ -49,7 +41,16 @@ import com.google.inject.spi.Elements; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.Message; +import junit.framework.TestCase; + +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class FactoryModuleBuilderTest extends TestCase { + + private enum Color { BLUE, GREEN, RED, GRAY, BLACK } public void testImplicitForwardingAssistedBindingFailsWithInterface() { try { diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProvider2Test.java b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProvider2Test.java index 2e94f58c..4bce4a1a 100644 --- a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProvider2Test.java +++ b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProvider2Test.java @@ -16,9 +16,10 @@ package com.google.inject.assistedinject; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertContains; import static com.google.inject.Asserts.assertEqualsBothWays; + +import com.google.inject.AbstractModule; import com.google.inject.ConfigurationException; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -34,7 +35,6 @@ import com.google.inject.name.Names; import junit.framework.TestCase; -import java.awt.*; import java.util.Collection; import java.util.Collections; import java.util.Set; @@ -43,6 +43,8 @@ import java.util.concurrent.atomic.AtomicInteger; @SuppressWarnings("deprecation") public class FactoryProvider2Test extends TestCase { + private enum Color { BLUE, GREEN, RED, GRAY, BLACK, ORANGE, PINK } + public void testAssistedFactory() { Injector injector = Guice.createInjector(new AbstractModule() { @Override @@ -576,7 +578,7 @@ public class FactoryProvider2Test extends TestCase { assertContains(expected.getMessage(), "1) A Provider may not be a type in a factory method of an AssistedInject." + "\n Offending instance is parameter [1] with key" - + " [com.google.inject.Provider<java.awt.Color>] on method [" + + " [com.google.inject.Provider<" + Color.class.getName() + ">] on method [" + ProviderBasedColoredCarFactory.class.getName() + ".createCar()]", "2) A Provider may not be a type in a factory method of an AssistedInject." + "\n Offending instance is parameter [2] with key" @@ -584,7 +586,7 @@ public class FactoryProvider2Test extends TestCase { + ProviderBasedColoredCarFactory.class.getName() + ".createCar()]", "3) A Provider may not be a type in a factory method of an AssistedInject." + "\n Offending instance is parameter [1] with key" - + " [com.google.inject.Provider<java.awt.Color>" + + " [com.google.inject.Provider<" + Color.class.getName() + ">" + " annotated with @com.google.inject.assistedinject.Assisted(value=color)]" + " on method [" + ProviderBasedColoredCarFactory.class.getName() + ".createMustang()]" ); @@ -610,7 +612,7 @@ public class FactoryProvider2Test extends TestCase { assertContains(expected.getMessage(), "1) A Provider may not be a type in a factory method of an AssistedInject." + "\n Offending instance is parameter [1] with key" - + " [com.google.inject.Provider<java.awt.Color>] on method [" + + " [com.google.inject.Provider<" + Color.class.getName() + ">] on method [" + JavaxProviderBasedColoredCarFactory.class.getName() + ".createCar()]", "2) A Provider may not be a type in a factory method of an AssistedInject." + "\n Offending instance is parameter [2] with key" @@ -618,7 +620,7 @@ public class FactoryProvider2Test extends TestCase { + JavaxProviderBasedColoredCarFactory.class.getName() + ".createCar()]", "3) A Provider may not be a type in a factory method of an AssistedInject." + "\n Offending instance is parameter [1] with key" - + " [com.google.inject.Provider<java.awt.Color>" + + " [com.google.inject.Provider<" + Color.class.getName() + ">" + " annotated with @com.google.inject.assistedinject.Assisted(value=color)]" + " on method [" + JavaxProviderBasedColoredCarFactory.class.getName() + ".createMustang()]" ); @@ -726,7 +728,7 @@ public class FactoryProvider2Test extends TestCase { }); fail(); } catch (CreationException expected) { - assertContains(expected.getMessage(), "A binding to java.awt.Color annotated with @" + assertContains(expected.getMessage(), "A binding to " + Color.class.getName() + " annotated with @" + Assisted.class.getName() + "(value=paint) was already configured at"); } } diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java index 1ab17577..1bfeeb55 100755 --- a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java +++ b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java @@ -16,8 +16,10 @@ package com.google.inject.assistedinject; -import com.google.inject.AbstractModule; import static com.google.inject.Asserts.assertContains; + +import com.google.common.collect.ImmutableSet; +import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.ConfigurationException; import com.google.inject.CreationException; @@ -27,22 +29,24 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; -import java.awt.Color; + +import junit.framework.TestCase; + import java.util.Collection; import java.util.Collections; import java.util.Set; -import junit.framework.TestCase; /** * @author jmourits@google.com (Jerome Mourits) * @author jessewilson@google.com (Jesse Wilson) */ public class FactoryProviderTest extends TestCase { + + private enum Color { BLUE, GREEN, RED, GRAY, BLACK, ORANGE, PINK } public void testAssistedFactory() { Injector injector = Guice.createInjector(new AbstractModule() { diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java index 323a7d95..8c071dc2 100644 --- a/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java +++ b/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java @@ -16,14 +16,14 @@ package com.google.inject.assistedinject; -import junit.framework.TestCase; - import com.google.inject.AbstractModule; import com.google.inject.Asserts; import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Injector; +import junit.framework.TestCase; + /** * @author sameb@google.com (Sam Berlin) */ diff --git a/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java b/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java index b5d23410..41a3be7a 100644 --- a/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java +++ b/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java @@ -16,11 +16,11 @@ package com.google.inject.grapher; +import com.google.common.collect.Lists; import com.google.inject.Binding; import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.Provider; -import com.google.common.collect.Lists; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ConstructorBinding; import com.google.inject.spi.ConvertedConstantBinding; @@ -34,6 +34,7 @@ import com.google.inject.spi.ProviderBinding; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderKeyBinding; import com.google.inject.spi.UntargettedBinding; + import java.lang.reflect.Member; import java.util.Collection; import java.util.List; diff --git a/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java b/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java index 9e9a1e29..bb70fd69 100644 --- a/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java +++ b/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java @@ -16,13 +16,14 @@ package com.google.inject.grapher; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.Sets; import com.google.inject.spi.BindingTargetVisitor; + import java.io.IOException; import java.util.Collection; import java.util.Iterator; diff --git a/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java b/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java index 49684581..1bf6b3ef 100644 --- a/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java +++ b/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java @@ -16,12 +16,13 @@ package com.google.inject.grapher; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; import com.google.common.base.Joiner; import com.google.common.collect.Lists; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; import com.google.inject.internal.ProviderMethod; import com.google.inject.internal.util.StackTraceElements; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Member; diff --git a/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java b/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java index 1a3d9002..27deaa65 100644 --- a/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java +++ b/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java @@ -16,9 +16,9 @@ package com.google.inject.grapher; -import com.google.inject.Key; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.inject.Key; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ConstructorBinding; import com.google.inject.spi.ConvertedConstantBinding; @@ -31,6 +31,7 @@ import com.google.inject.spi.ProviderBinding; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderKeyBinding; import com.google.inject.spi.UntargettedBinding; + import java.util.Collection; import java.util.Set; diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java index 9dd40e4f..825f3ffe 100644 --- a/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java +++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java @@ -16,9 +16,9 @@ package com.google.inject.grapher.graphviz; +import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.google.inject.grapher.BindingEdge; -import com.google.common.collect.ImmutableList; /** * Graphviz-specific implementation of {@link BindingEdge.Factory}. Uses a diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java index d703acb7..ae9e4415 100644 --- a/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java +++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java @@ -16,9 +16,9 @@ package com.google.inject.grapher.graphviz; +import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.google.inject.grapher.DependencyEdge; -import com.google.common.collect.ImmutableList; import com.google.inject.spi.InjectionPoint; /** diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java index 2618717b..9d1b9f0d 100644 --- a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java +++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java @@ -17,6 +17,7 @@ package com.google.inject.grapher.graphviz; import com.google.common.collect.ImmutableList; + import java.util.List; /** diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java index a5a989bf..8a554321 100644 --- a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java +++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java @@ -19,6 +19,7 @@ package com.google.inject.grapher.graphviz; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; + import java.util.List; import java.util.Map; diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java index 891641fd..1402133a 100644 --- a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java +++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java @@ -16,12 +16,13 @@ package com.google.inject.grapher.graphviz; -import com.google.inject.grapher.ImplementationNode; -import com.google.inject.grapher.NodeAliasFactory; -import com.google.inject.grapher.Renderer; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.inject.grapher.ImplementationNode; +import com.google.inject.grapher.NodeAliasFactory; +import com.google.inject.grapher.Renderer; + import java.io.PrintWriter; import java.util.List; import java.util.Map; diff --git a/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java b/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java index 84f03c3d..7deb3fc1 100644 --- a/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java +++ b/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java @@ -16,26 +16,29 @@ package com.google.inject.grapher; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.inject.spi.ConstructorBinding; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.InjectionPoint; import com.google.inject.spi.InstanceBinding; + +import junit.framework.TestCase; + import java.util.Collection; import java.util.List; import java.util.Set; -import junit.framework.TestCase; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Tests for {@link GraphingVisitor}. diff --git a/extensions/grapher/test/com/google/inject/grapher/InjectorGrapherTest.java b/extensions/grapher/test/com/google/inject/grapher/InjectorGrapherTest.java index 13d64cf0..2df6b9d8 100644 --- a/extensions/grapher/test/com/google/inject/grapher/InjectorGrapherTest.java +++ b/extensions/grapher/test/com/google/inject/grapher/InjectorGrapherTest.java @@ -2,14 +2,14 @@ package com.google.inject.grapher; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provides; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.spi.BindingTargetVisitor; @@ -22,9 +22,11 @@ import com.google.inject.spi.ProviderBinding; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderKeyBinding; import com.google.inject.spi.UntargettedBinding; + +import junit.framework.TestCase; + import java.util.Collection; import java.util.Set; -import junit.framework.TestCase; /** * Tests for {@link InjectorGrapher}. diff --git a/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java b/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java index 97772d27..e344f116 100644 --- a/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java +++ b/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java @@ -32,13 +32,13 @@ import com.google.inject.name.Names; import com.google.inject.spi.DefaultBindingTargetVisitor; import com.google.inject.spi.ProviderInstanceBinding; +import junit.framework.TestCase; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.lang.reflect.Member; -import junit.framework.TestCase; - /** * Tests for {@link ShortNameFactory}. * diff --git a/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java b/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java index 1d4b414d..23ebbc03 100644 --- a/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java +++ b/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java @@ -16,6 +16,7 @@ package com.google.inject.grapher; +import com.google.common.collect.ImmutableSet; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.Guice; @@ -24,7 +25,6 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; import com.google.inject.name.Names; import com.google.inject.spi.ConstructorBinding; import com.google.inject.spi.ConvertedConstantBinding; @@ -35,9 +35,11 @@ import com.google.inject.spi.LinkedKeyBinding; import com.google.inject.spi.ProviderBinding; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderKeyBinding; + +import junit.framework.TestCase; + import java.util.Collection; import java.util.Set; -import junit.framework.TestCase; /** * Tests for {@link TransitiveDependencyVisitor}. diff --git a/extensions/grapher/test/com/google/inject/grapher/demo/Driver.java b/extensions/grapher/test/com/google/inject/grapher/demo/Driver.java index feb619a1..1187c687 100644 --- a/extensions/grapher/test/com/google/inject/grapher/demo/Driver.java +++ b/extensions/grapher/test/com/google/inject/grapher/demo/Driver.java @@ -18,12 +18,12 @@ package com.google.inject.grapher.demo; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.google.inject.BindingAnnotation; - @Retention(RUNTIME) @Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) @BindingAnnotation diff --git a/extensions/grapher/test/com/google/inject/grapher/demo/Inventor.java b/extensions/grapher/test/com/google/inject/grapher/demo/Inventor.java index 19e34e7b..f9c8ab84 100644 --- a/extensions/grapher/test/com/google/inject/grapher/demo/Inventor.java +++ b/extensions/grapher/test/com/google/inject/grapher/demo/Inventor.java @@ -18,12 +18,12 @@ package com.google.inject.grapher.demo; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.google.inject.BindingAnnotation; - @Retention(RUNTIME) @Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) @BindingAnnotation diff --git a/extensions/grapher/test/com/google/inject/grapher/demo/Nuclear.java b/extensions/grapher/test/com/google/inject/grapher/demo/Nuclear.java index 0e4dd380..e273dd6c 100644 --- a/extensions/grapher/test/com/google/inject/grapher/demo/Nuclear.java +++ b/extensions/grapher/test/com/google/inject/grapher/demo/Nuclear.java @@ -18,12 +18,12 @@ package com.google.inject.grapher.demo; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.google.inject.BindingAnnotation; - @Retention(RUNTIME) @Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) @BindingAnnotation diff --git a/extensions/grapher/test/com/google/inject/grapher/demo/Renewable.java b/extensions/grapher/test/com/google/inject/grapher/demo/Renewable.java index 08e2c42a..d97a78ca 100644 --- a/extensions/grapher/test/com/google/inject/grapher/demo/Renewable.java +++ b/extensions/grapher/test/com/google/inject/grapher/demo/Renewable.java @@ -18,12 +18,12 @@ package com.google.inject.grapher.demo; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.google.inject.BindingAnnotation; - @Retention(RUNTIME) @Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) @BindingAnnotation diff --git a/extensions/grapher/test/com/google/inject/grapher/demo/Used.java b/extensions/grapher/test/com/google/inject/grapher/demo/Used.java index 4b973cf9..d1035053 100644 --- a/extensions/grapher/test/com/google/inject/grapher/demo/Used.java +++ b/extensions/grapher/test/com/google/inject/grapher/demo/Used.java @@ -18,12 +18,12 @@ package com.google.inject.grapher.demo; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.google.inject.BindingAnnotation; - @Retention(RUNTIME) @Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) @BindingAnnotation diff --git a/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java b/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java index c82d0fc3..b8810500 100644 --- a/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java +++ b/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java @@ -21,8 +21,10 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; + import java.lang.annotation.Annotation; import java.lang.management.ManagementFactory; + import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; diff --git a/extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java b/extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java index 11ac1dac..bb10f953 100644 --- a/extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java +++ b/extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java @@ -16,13 +16,15 @@ package com.google.inject.tools.jmx; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.AbstractModule; import com.google.inject.BindingAnnotation; import com.google.inject.Key; import com.google.inject.Singleton; import com.google.inject.name.Names; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * @author crazybob@google.com (Bob Lee) diff --git a/extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java b/extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java index 38ec25fe..7907841b 100644 --- a/extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java +++ b/extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java @@ -18,6 +18,7 @@ package com.google.inject.jndi; import com.google.inject.Inject; import com.google.inject.Provider; + import javax.naming.Context; import javax.naming.NamingException; diff --git a/extensions/mini/src/com/google/inject/mini/MiniGuice.java b/extensions/mini/src/com/google/inject/mini/MiniGuice.java index 5484a794..e1d7c316 100644 --- a/extensions/mini/src/com/google/inject/mini/MiniGuice.java +++ b/extensions/mini/src/com/google/inject/mini/MiniGuice.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Set; + import javax.inject.Provider; /** diff --git a/extensions/mini/test/com/google/inject/mini/MiniGuiceTest.java b/extensions/mini/test/com/google/inject/mini/MiniGuiceTest.java index 318c2e28..e6df5933 100644 --- a/extensions/mini/test/com/google/inject/mini/MiniGuiceTest.java +++ b/extensions/mini/test/com/google/inject/mini/MiniGuiceTest.java @@ -16,13 +16,16 @@ package com.google.inject.mini; import com.google.inject.Provides; + +import junit.framework.TestCase; + import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; + import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; -import junit.framework.TestCase; public final class MiniGuiceTest extends TestCase { diff --git a/extensions/multibindings/src/com/google/inject/multibindings/Element.java b/extensions/multibindings/src/com/google/inject/multibindings/Element.java index 3a4420dd..31498650 100644 --- a/extensions/multibindings/src/com/google/inject/multibindings/Element.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/Element.java @@ -17,10 +17,11 @@ package com.google.inject.multibindings; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.BindingAnnotation; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * An internal binding annotation applied to each element in a multibinding. diff --git a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java index b2590be1..9a15efd7 100644 --- a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java @@ -16,6 +16,15 @@ package com.google.inject.multibindings; +import static com.google.inject.multibindings.Multibinder.checkConfiguration; +import static com.google.inject.multibindings.Multibinder.checkNotNull; +import static com.google.inject.multibindings.Multibinder.setOf; +import static com.google.inject.util.Types.newParameterizedTypeWithOwner; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Binding; import com.google.inject.Inject; @@ -25,15 +34,7 @@ import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import com.google.inject.binder.LinkedBindingBuilder; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.inject.multibindings.Multibinder.RealMultibinder; -import static com.google.inject.multibindings.Multibinder.checkConfiguration; -import static com.google.inject.multibindings.Multibinder.checkNotNull; -import static com.google.inject.multibindings.Multibinder.setOf; - import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.ProviderInstanceBinding; @@ -42,7 +43,7 @@ import com.google.inject.spi.ProviderWithDependencies; import com.google.inject.spi.ProviderWithExtensionVisitor; import com.google.inject.spi.Toolable; import com.google.inject.util.Types; -import static com.google.inject.util.Types.newParameterizedTypeWithOwner; + import java.lang.annotation.Annotation; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/extensions/multibindings/src/com/google/inject/multibindings/MapBinderBinding.java b/extensions/multibindings/src/com/google/inject/multibindings/MapBinderBinding.java index ef0b6d0f..46d303c4 100644 --- a/extensions/multibindings/src/com/google/inject/multibindings/MapBinderBinding.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/MapBinderBinding.java @@ -16,15 +16,15 @@ package com.google.inject.multibindings; -import java.util.List; -import java.util.Map; - import com.google.inject.Binding; import com.google.inject.Key; import com.google.inject.TypeLiteral; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; +import java.util.List; +import java.util.Map; + /** * A binding for a MapBinder. * <p> diff --git a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java index 3af78a51..31226cdd 100644 --- a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java @@ -16,6 +16,11 @@ package com.google.inject.multibindings; +import static com.google.inject.name.Names.named; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -28,11 +33,6 @@ import com.google.inject.TypeLiteral; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.internal.Annotations; import com.google.inject.internal.Errors; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import static com.google.inject.name.Names.named; - import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; @@ -41,6 +41,7 @@ import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderWithExtensionVisitor; import com.google.inject.spi.Toolable; import com.google.inject.util.Types; + import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collections; diff --git a/extensions/multibindings/src/com/google/inject/multibindings/MultibinderBinding.java b/extensions/multibindings/src/com/google/inject/multibindings/MultibinderBinding.java index f1960ec8..998452c3 100644 --- a/extensions/multibindings/src/com/google/inject/multibindings/MultibinderBinding.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/MultibinderBinding.java @@ -16,14 +16,14 @@ package com.google.inject.multibindings; -import java.util.List; - import com.google.inject.Binding; import com.google.inject.Key; import com.google.inject.TypeLiteral; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; +import java.util.List; + /** * A binding for a Multibinder. * diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java index 6f4153d0..ca9dc894 100644 --- a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java +++ b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java @@ -17,14 +17,16 @@ package com.google.inject.multibindings; import static com.google.inject.Asserts.assertContains; +import static com.google.inject.multibindings.SpiUtils.VisitType.BOTH; +import static com.google.inject.multibindings.SpiUtils.VisitType.MODULE; import static com.google.inject.multibindings.SpiUtils.assertMapVisitor; import static com.google.inject.multibindings.SpiUtils.instance; import static com.google.inject.multibindings.SpiUtils.providerInstance; -import static com.google.inject.multibindings.SpiUtils.VisitType.BOTH; -import static com.google.inject.multibindings.SpiUtils.VisitType.MODULE; import static com.google.inject.name.Names.named; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.BindingAnnotation; @@ -38,13 +40,11 @@ import com.google.inject.Provider; import com.google.inject.ProvisionException; import com.google.inject.Stage; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import com.google.inject.name.Names; import com.google.inject.spi.DefaultElementVisitor; +import com.google.inject.spi.Dependency; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; -import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.util.Modules; import com.google.inject.util.Providers; diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java index af6e48fa..edab12fb 100644 --- a/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java +++ b/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java @@ -17,28 +17,17 @@ package com.google.inject.multibindings; import static com.google.inject.Asserts.assertContains; +import static com.google.inject.multibindings.SpiUtils.VisitType.BOTH; +import static com.google.inject.multibindings.SpiUtils.VisitType.MODULE; import static com.google.inject.multibindings.SpiUtils.assertSetVisitor; import static com.google.inject.multibindings.SpiUtils.instance; import static com.google.inject.multibindings.SpiUtils.providerInstance; -import static com.google.inject.multibindings.SpiUtils.VisitType.BOTH; -import static com.google.inject.multibindings.SpiUtils.VisitType.MODULE; import static com.google.inject.name.Names.named; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import junit.framework.TestCase; - +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.google.inject.AbstractModule; import com.google.inject.Binding; import com.google.inject.BindingAnnotation; @@ -51,9 +40,6 @@ import com.google.inject.Provider; import com.google.inject.ProvisionException; import com.google.inject.Stage; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.inject.name.Names; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; @@ -62,6 +48,20 @@ import com.google.inject.spi.LinkedKeyBinding; import com.google.inject.util.Modules; import com.google.inject.util.Providers; +import junit.framework.TestCase; + +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * @author jessewilson@google.com (Jesse Wilson) */ diff --git a/extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java b/extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java index 830aa545..11738e61 100644 --- a/extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java +++ b/extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java @@ -32,18 +32,13 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.google.common.collect.Lists; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.TypeLiteral; -import com.google.common.collect.Lists; import com.google.inject.spi.DefaultBindingTargetVisitor; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; @@ -52,6 +47,11 @@ import com.google.inject.spi.LinkedKeyBinding; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderLookup; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Utilities for testing the Multibinder & MapBinder extension SPI. * diff --git a/extensions/persist/src/com/google/inject/persist/PersistFilter.java b/extensions/persist/src/com/google/inject/persist/PersistFilter.java index 9e9b16c8..1aba1449 100644 --- a/extensions/persist/src/com/google/inject/persist/PersistFilter.java +++ b/extensions/persist/src/com/google/inject/persist/PersistFilter.java @@ -18,7 +18,9 @@ package com.google.inject.persist; import com.google.inject.Inject; import com.google.inject.Singleton; + import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/extensions/persist/src/com/google/inject/persist/PersistModule.java b/extensions/persist/src/com/google/inject/persist/PersistModule.java index 41fcff56..8efe8951 100644 --- a/extensions/persist/src/com/google/inject/persist/PersistModule.java +++ b/extensions/persist/src/com/google/inject/persist/PersistModule.java @@ -16,9 +16,11 @@ package com.google.inject.persist; -import com.google.inject.AbstractModule; import static com.google.inject.matcher.Matchers.annotatedWith; import static com.google.inject.matcher.Matchers.any; + +import com.google.inject.AbstractModule; + import org.aopalliance.intercept.MethodInterceptor; /** diff --git a/extensions/persist/src/com/google/inject/persist/jpa/Jpa.java b/extensions/persist/src/com/google/inject/persist/jpa/Jpa.java index c2f6d1dd..0e7ac275 100644 --- a/extensions/persist/src/com/google/inject/persist/jpa/Jpa.java +++ b/extensions/persist/src/com/google/inject/persist/jpa/Jpa.java @@ -17,6 +17,7 @@ package com.google.inject.persist.jpa; import com.google.inject.BindingAnnotation; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/extensions/persist/src/com/google/inject/persist/jpa/JpaFinderProxy.java b/extensions/persist/src/com/google/inject/persist/jpa/JpaFinderProxy.java index cead6af1..774fa9f6 100644 --- a/extensions/persist/src/com/google/inject/persist/jpa/JpaFinderProxy.java +++ b/extensions/persist/src/com/google/inject/persist/jpa/JpaFinderProxy.java @@ -16,14 +16,18 @@ package com.google.inject.persist.jpa; +import com.google.common.collect.MapMaker; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; -import com.google.common.collect.MapMaker; import com.google.inject.name.Named; import com.google.inject.persist.finder.Finder; import com.google.inject.persist.finder.FirstResult; import com.google.inject.persist.finder.MaxResults; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -31,10 +35,9 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.List; import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.Query; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * TODO(dhanji): Make this work!! diff --git a/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java b/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java index b25c68e8..942835ff 100644 --- a/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java +++ b/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java @@ -19,11 +19,14 @@ package com.google.inject.persist.jpa; import com.google.inject.Inject; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.lang.reflect.Method; + import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) diff --git a/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistModule.java b/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistModule.java index 2e84fa0c..b318b279 100644 --- a/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistModule.java +++ b/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistModule.java @@ -16,26 +16,29 @@ package com.google.inject.persist.jpa; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.google.common.collect.Lists; -import com.google.common.base.Preconditions; import com.google.inject.persist.PersistModule; import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; import com.google.inject.persist.finder.DynamicFinder; import com.google.inject.persist.finder.Finder; import com.google.inject.util.Providers; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import java.lang.reflect.AccessibleObject; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.List; import java.util.Properties; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; /** * JPA provider for guice persist. diff --git a/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java b/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java index 02597409..b8fe35c0 100644 --- a/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java +++ b/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java @@ -16,10 +16,10 @@ package com.google.inject.persist.jpa; +import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; -import com.google.common.base.Preconditions; import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; @@ -29,6 +29,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.Properties; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; diff --git a/extensions/persist/test/com/google/inject/persist/AllTests.java b/extensions/persist/test/com/google/inject/persist/AllTests.java index 282718dc..8651fc62 100644 --- a/extensions/persist/test/com/google/inject/persist/AllTests.java +++ b/extensions/persist/test/com/google/inject/persist/AllTests.java @@ -27,6 +27,7 @@ import com.google.inject.persist.jpa.ManagedLocalTransactionsAcrossRequestTest; import com.google.inject.persist.jpa.ManagedLocalTransactionsTest; import com.google.inject.persist.jpa.ManualLocalTransactionsTest; import com.google.inject.persist.jpa.ManualLocalTransactionsWithCustomMatcherTest; + import junit.framework.Test; import junit.framework.TestSuite; diff --git a/extensions/persist/test/com/google/inject/persist/EdslTest.java b/extensions/persist/test/com/google/inject/persist/EdslTest.java index 078ef170..9fd502f0 100644 --- a/extensions/persist/test/com/google/inject/persist/EdslTest.java +++ b/extensions/persist/test/com/google/inject/persist/EdslTest.java @@ -4,6 +4,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Stage; import com.google.inject.persist.jpa.JpaPersistModule; + import junit.framework.TestCase; /** diff --git a/extensions/persist/test/com/google/inject/persist/jpa/ClassLevelManagedLocalTransactionsTest.java b/extensions/persist/test/com/google/inject/persist/jpa/ClassLevelManagedLocalTransactionsTest.java index 68ee4108..36fcb312 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/ClassLevelManagedLocalTransactionsTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/ClassLevelManagedLocalTransactionsTest.java @@ -21,12 +21,15 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; + +import junit.framework.TestCase; + import java.io.FileNotFoundException; import java.io.IOException; import java.util.Date; import java.util.List; + import javax.persistence.EntityManager; -import junit.framework.TestCase; /** * This test asserts class level @Transactional annotation behavior. @@ -36,6 +39,7 @@ import junit.framework.TestCase; * * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class ClassLevelManagedLocalTransactionsTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT = "JPAsome unique text88888" + new Date(); diff --git a/extensions/persist/test/com/google/inject/persist/jpa/CustomPropsEntityManagerFactoryProvisionTest.java b/extensions/persist/test/com/google/inject/persist/jpa/CustomPropsEntityManagerFactoryProvisionTest.java index 93d2a4a3..288b2778 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/CustomPropsEntityManagerFactoryProvisionTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/CustomPropsEntityManagerFactoryProvisionTest.java @@ -20,14 +20,18 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import java.util.Properties; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class CustomPropsEntityManagerFactoryProvisionTest extends TestCase { private Injector injector; diff --git a/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java b/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java index 5c5baf3c..2fd40a49 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java @@ -23,18 +23,22 @@ import com.google.inject.Provider; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.finder.Finder; + +import junit.framework.TestCase; + import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; + import javax.persistence.EntityManager; -import junit.framework.TestCase; /** * A test around providing sessions (starting, closing etc.) * * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class DynamicFinderTest extends TestCase { private Injector injector; @@ -102,4 +106,4 @@ public class DynamicFinderTest extends TestCase { return lastEm.contains(t); } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java index add4633a..d2ec9252 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java @@ -20,13 +20,16 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class EntityManagerFactoryProvisionTest extends TestCase { private Injector injector; diff --git a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerPerRequestProvisionTest.java b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerPerRequestProvisionTest.java index 08e910f7..733884f6 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerPerRequestProvisionTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerPerRequestProvisionTest.java @@ -22,15 +22,18 @@ import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; /** * A test around providing sessions (starting, closing etc.) * * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class EntityManagerPerRequestProvisionTest extends TestCase { private Injector injector; @@ -114,4 +117,4 @@ public class EntityManagerPerRequestProvisionTest extends TestCase { return em.contains(t); } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerProvisionTest.java b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerProvisionTest.java index 9ab97b7e..fbde101a 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerProvisionTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerProvisionTest.java @@ -22,15 +22,18 @@ import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; + +import junit.framework.TestCase; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; /** * A test around providing sessions (starting, closing etc.) * * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class EntityManagerProvisionTest extends TestCase { private Injector injector; @@ -112,4 +115,4 @@ public class EntityManagerProvisionTest extends TestCase { return lastEm.contains(t); } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/JoiningLocalTransactionsTest.java b/extensions/persist/test/com/google/inject/persist/jpa/JoiningLocalTransactionsTest.java index 87bcba68..a1e4e807 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/JoiningLocalTransactionsTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/JoiningLocalTransactionsTest.java @@ -22,16 +22,20 @@ import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.NoResultException; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class JoiningLocalTransactionsTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT = JoiningLocalTransactionsTest.class + "some unique text" diff --git a/extensions/persist/test/com/google/inject/persist/jpa/JpaParentTestEntity.java b/extensions/persist/test/com/google/inject/persist/jpa/JpaParentTestEntity.java index f92d117f..600e0883 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/JpaParentTestEntity.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/JpaParentTestEntity.java @@ -18,6 +18,7 @@ package com.google.inject.persist.jpa; import java.util.ArrayList; import java.util.List; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/extensions/persist/test/com/google/inject/persist/jpa/JpaWorkManagerTest.java b/extensions/persist/test/com/google/inject/persist/jpa/JpaWorkManagerTest.java index efe063a5..1bdbf97d 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/JpaWorkManagerTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/JpaWorkManagerTest.java @@ -22,15 +22,19 @@ import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Query; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class JpaWorkManagerTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT_3 = JpaWorkManagerTest.class.getSimpleName() @@ -111,4 +115,4 @@ public class JpaWorkManagerTest extends TestCase { em.persist(testEntity); } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsAcrossRequestTest.java b/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsAcrossRequestTest.java index 1b575eda..76e3f7fd 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsAcrossRequestTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsAcrossRequestTest.java @@ -24,16 +24,20 @@ import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; import com.google.inject.persist.finder.Finder; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.NoResultException; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class ManagedLocalTransactionsAcrossRequestTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT = "some unique text" + new Date(); @@ -168,7 +172,7 @@ public class ManagedLocalTransactionsAcrossRequestTest extends TestCase { injector.getInstance(UnitOfWork.class).end(); fail(); } catch (NoResultException e) {} - + injector.getInstance(UnitOfWork.class).end(); } @@ -224,4 +228,4 @@ public class ManagedLocalTransactionsAcrossRequestTest extends TestCase { return null; } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsTest.java b/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsTest.java index be218c7b..2ba9195c 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/ManagedLocalTransactionsTest.java @@ -22,16 +22,20 @@ import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.NoResultException; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class ManagedLocalTransactionsTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT = "some unique text" + new Date(); @@ -171,4 +175,4 @@ public class ManagedLocalTransactionsTest extends TestCase { throw new IllegalStateException(); } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsConfidenceTest.java b/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsConfidenceTest.java index d5e11929..ecd2999c 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsConfidenceTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsConfidenceTest.java @@ -21,14 +21,18 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; + +import junit.framework.TestCase; + import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.PersistenceException; -import junit.framework.TestCase; /** * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class ManualLocalTransactionsConfidenceTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT_3 = diff --git a/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsTest.java b/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsTest.java index 9044051b..2baa3455 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsTest.java @@ -22,10 +22,13 @@ import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; /** * For instance, a session-per-request strategy will control the opening and closing of the EM at @@ -33,6 +36,7 @@ import junit.framework.TestCase; * * @author Dhanji R. Prasanna (dhanji@gmail.com) */ + public class ManualLocalTransactionsTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT = "some unique text" + new Date(); @@ -98,4 +102,4 @@ public class ManualLocalTransactionsTest extends TestCase { } } -}
\ No newline at end of file +} diff --git a/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsWithCustomMatcherTest.java b/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsWithCustomMatcherTest.java index 7fedb868..4290d1d7 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsWithCustomMatcherTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/ManualLocalTransactionsWithCustomMatcherTest.java @@ -22,10 +22,13 @@ import com.google.inject.Injector; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.persist.UnitOfWork; + +import junit.framework.TestCase; + import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; /** * Created with IntelliJ IDEA. On: 2/06/2007 @@ -36,6 +39,7 @@ import junit.framework.TestCase; * @author Dhanji R. Prasanna (dhanji@gmail.com) * @since 1.0 */ + public class ManualLocalTransactionsWithCustomMatcherTest extends TestCase { private Injector injector; private static final String UNIQUE_TEXT = "some unique text" + new Date(); diff --git a/extensions/service/src/com/google/inject/service/AsyncService.java b/extensions/service/src/com/google/inject/service/AsyncService.java index 9b54c1ae..73a25264 100644 --- a/extensions/service/src/com/google/inject/service/AsyncService.java +++ b/extensions/service/src/com/google/inject/service/AsyncService.java @@ -17,6 +17,7 @@ package com.google.inject.service; import com.google.common.base.Preconditions; + import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; diff --git a/extensions/service/src/com/google/inject/service/CompositeService.java b/extensions/service/src/com/google/inject/service/CompositeService.java index 5e6986a3..13e8b3dc 100644 --- a/extensions/service/src/com/google/inject/service/CompositeService.java +++ b/extensions/service/src/com/google/inject/service/CompositeService.java @@ -15,13 +15,14 @@ */ package com.google.inject.service; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Key; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import com.google.common.base.Preconditions; import com.google.common.collect.Sets; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Key; + import java.util.List; import java.util.Set; import java.util.concurrent.Callable; diff --git a/extensions/service/test/com/google/inject/service/SingleServiceIntegrationTest.java b/extensions/service/test/com/google/inject/service/SingleServiceIntegrationTest.java index f5c5d7a0..ca36b472 100644 --- a/extensions/service/test/com/google/inject/service/SingleServiceIntegrationTest.java +++ b/extensions/service/test/com/google/inject/service/SingleServiceIntegrationTest.java @@ -1,5 +1,8 @@ package com.google.inject.service; + +import junit.framework.TestCase; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -7,13 +10,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; /** * Tests using Async Service. */ + public class SingleServiceIntegrationTest extends TestCase { - + public final void testAsyncServiceLifecycle() throws InterruptedException { ExecutorService executor = Executors.newSingleThreadExecutor(); diff --git a/extensions/servlet/src/com/google/inject/servlet/ContinuingHttpServletRequest.java b/extensions/servlet/src/com/google/inject/servlet/ContinuingHttpServletRequest.java index 50672e5b..5fd7e54a 100644 --- a/extensions/servlet/src/com/google/inject/servlet/ContinuingHttpServletRequest.java +++ b/extensions/servlet/src/com/google/inject/servlet/ContinuingHttpServletRequest.java @@ -16,10 +16,12 @@ package com.google.inject.servlet; -import com.google.inject.OutOfScopeException; import com.google.common.collect.Maps; +import com.google.inject.OutOfScopeException; + import java.io.IOException; import java.util.Map; + import javax.servlet.ServletInputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/extensions/servlet/src/com/google/inject/servlet/DefaultFilterPipeline.java b/extensions/servlet/src/com/google/inject/servlet/DefaultFilterPipeline.java index d1c438bc..07438811 100755 --- a/extensions/servlet/src/com/google/inject/servlet/DefaultFilterPipeline.java +++ b/extensions/servlet/src/com/google/inject/servlet/DefaultFilterPipeline.java @@ -16,7 +16,9 @@ package com.google.inject.servlet; import com.google.inject.Singleton; + import java.io.IOException; + import javax.servlet.FilterChain; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java b/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java index 80533d42..4669875a 100755 --- a/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java +++ b/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java @@ -16,6 +16,7 @@ package com.google.inject.servlet; import java.io.IOException; + import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; diff --git a/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java b/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java index 6c9d67b6..ee42b146 100755 --- a/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java +++ b/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java @@ -15,10 +15,10 @@ */ package com.google.inject.servlet; +import com.google.common.collect.Iterators; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Scopes; -import com.google.common.collect.Iterators; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderWithExtensionVisitor; @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; + import javax.servlet.Filter; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; diff --git a/extensions/servlet/src/com/google/inject/servlet/FilterPipeline.java b/extensions/servlet/src/com/google/inject/servlet/FilterPipeline.java index a969af79..985064b1 100755 --- a/extensions/servlet/src/com/google/inject/servlet/FilterPipeline.java +++ b/extensions/servlet/src/com/google/inject/servlet/FilterPipeline.java @@ -16,12 +16,14 @@ package com.google.inject.servlet; import com.google.inject.ImplementedBy; + +import java.io.IOException; + +import javax.servlet.FilterChain; import javax.servlet.ServletContext; +import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import java.io.IOException; /** * An internal dispatcher for guice-servlet registered servlets and filters. diff --git a/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java b/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java index 14266df1..0f8976f2 100755 --- a/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java +++ b/extensions/servlet/src/com/google/inject/servlet/FiltersModuleBuilder.java @@ -15,13 +15,15 @@ */ package com.google.inject.servlet; +import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Key; -import com.google.common.collect.Lists; import com.google.inject.internal.UniqueAnnotations; + import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.servlet.Filter; /** diff --git a/extensions/servlet/src/com/google/inject/servlet/GuiceFilter.java b/extensions/servlet/src/com/google/inject/servlet/GuiceFilter.java index 7a3d6ea3..188adfa2 100644 --- a/extensions/servlet/src/com/google/inject/servlet/GuiceFilter.java +++ b/extensions/servlet/src/com/google/inject/servlet/GuiceFilter.java @@ -18,9 +18,11 @@ package com.google.inject.servlet; import com.google.inject.Inject; import com.google.inject.OutOfScopeException; + import java.io.IOException; import java.lang.ref.WeakReference; import java.util.logging.Logger; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/extensions/servlet/src/com/google/inject/servlet/GuiceServletContextListener.java b/extensions/servlet/src/com/google/inject/servlet/GuiceServletContextListener.java index 957d22f0..ffc189b1 100644 --- a/extensions/servlet/src/com/google/inject/servlet/GuiceServletContextListener.java +++ b/extensions/servlet/src/com/google/inject/servlet/GuiceServletContextListener.java @@ -17,7 +17,9 @@ package com.google.inject.servlet; import com.google.inject.Injector; + import java.lang.ref.WeakReference; + import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/extensions/servlet/src/com/google/inject/servlet/InstanceFilterBindingImpl.java b/extensions/servlet/src/com/google/inject/servlet/InstanceFilterBindingImpl.java index 2b8ef048..57b5efb9 100644 --- a/extensions/servlet/src/com/google/inject/servlet/InstanceFilterBindingImpl.java +++ b/extensions/servlet/src/com/google/inject/servlet/InstanceFilterBindingImpl.java @@ -16,12 +16,12 @@ package com.google.inject.servlet; +import com.google.common.base.Objects; + import java.util.Map; import javax.servlet.Filter; -import com.google.common.base.Objects; - /** * Default implementation of InstanceFilterBinding. * diff --git a/extensions/servlet/src/com/google/inject/servlet/InstanceServletBindingImpl.java b/extensions/servlet/src/com/google/inject/servlet/InstanceServletBindingImpl.java index 07657b2a..6e275cbd 100644 --- a/extensions/servlet/src/com/google/inject/servlet/InstanceServletBindingImpl.java +++ b/extensions/servlet/src/com/google/inject/servlet/InstanceServletBindingImpl.java @@ -16,12 +16,12 @@ package com.google.inject.servlet; +import com.google.common.base.Objects; + import java.util.Map; import javax.servlet.http.HttpServlet; -import com.google.common.base.Objects; - /** * Default implementation of InstanceServletBinding. * diff --git a/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBinding.java b/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBinding.java index ad5374fd..a30bdc36 100644 --- a/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBinding.java +++ b/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBinding.java @@ -16,10 +16,10 @@ package com.google.inject.servlet; -import javax.servlet.Filter; - import com.google.inject.Key; +import javax.servlet.Filter; + /** * A linked binding to a filter. * diff --git a/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBindingImpl.java b/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBindingImpl.java index 4404a8bc..5b87ca9f 100644 --- a/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBindingImpl.java +++ b/extensions/servlet/src/com/google/inject/servlet/LinkedFilterBindingImpl.java @@ -16,13 +16,13 @@ package com.google.inject.servlet; +import com.google.common.base.Objects; +import com.google.inject.Key; + import java.util.Map; import javax.servlet.Filter; -import com.google.common.base.Objects; -import com.google.inject.Key; - /** * Default implementation of LinkedFilterBinding. * diff --git a/extensions/servlet/src/com/google/inject/servlet/LinkedServletBinding.java b/extensions/servlet/src/com/google/inject/servlet/LinkedServletBinding.java index c082c35f..335dd1dc 100644 --- a/extensions/servlet/src/com/google/inject/servlet/LinkedServletBinding.java +++ b/extensions/servlet/src/com/google/inject/servlet/LinkedServletBinding.java @@ -16,10 +16,10 @@ package com.google.inject.servlet; -import javax.servlet.http.HttpServlet; - import com.google.inject.Key; +import javax.servlet.http.HttpServlet; + /** * A linked binding to a servlet. * diff --git a/extensions/servlet/src/com/google/inject/servlet/LinkedServletBindingImpl.java b/extensions/servlet/src/com/google/inject/servlet/LinkedServletBindingImpl.java index 61d5b5bc..8e737357 100644 --- a/extensions/servlet/src/com/google/inject/servlet/LinkedServletBindingImpl.java +++ b/extensions/servlet/src/com/google/inject/servlet/LinkedServletBindingImpl.java @@ -16,13 +16,13 @@ package com.google.inject.servlet; +import com.google.common.base.Objects; +import com.google.inject.Key; + import java.util.Map; import javax.servlet.http.HttpServlet; -import com.google.common.base.Objects; -import com.google.inject.Key; - /** * Default implementation of LinkedServletBinding. * diff --git a/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java b/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java index 9725280a..1d3ae60f 100755 --- a/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java +++ b/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java @@ -15,18 +15,20 @@ */ package com.google.inject.servlet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; + import java.io.IOException; import java.util.List; import java.util.Set; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.RequestDispatcher; diff --git a/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java b/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java index aef35f59..08a26bf7 100755 --- a/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java +++ b/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java @@ -15,18 +15,20 @@ */ package com.google.inject.servlet; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; + import java.io.IOException; import java.util.List; import java.util.Set; + import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/extensions/servlet/src/com/google/inject/servlet/RequestParameters.java b/extensions/servlet/src/com/google/inject/servlet/RequestParameters.java index d18a8e8e..ca5bbc30 100644 --- a/extensions/servlet/src/com/google/inject/servlet/RequestParameters.java +++ b/extensions/servlet/src/com/google/inject/servlet/RequestParameters.java @@ -16,10 +16,12 @@ package com.google.inject.servlet; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** diff --git a/extensions/servlet/src/com/google/inject/servlet/RequestScoped.java b/extensions/servlet/src/com/google/inject/servlet/RequestScoped.java index 3df17d33..38f9cff5 100644 --- a/extensions/servlet/src/com/google/inject/servlet/RequestScoped.java +++ b/extensions/servlet/src/com/google/inject/servlet/RequestScoped.java @@ -17,6 +17,7 @@ package com.google.inject.servlet; import com.google.inject.ScopeAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java index 5d981ed5..995561dd 100755 --- a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java +++ b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java @@ -15,10 +15,12 @@ */ package com.google.inject.servlet; +import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; + +import com.google.common.collect.Iterators; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Scopes; -import com.google.common.collect.Iterators; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ProviderInstanceBinding; import com.google.inject.spi.ProviderWithExtensionVisitor; @@ -30,6 +32,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; + import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -39,8 +42,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; - /** * An internal representation of a servlet definition mapped to a particular URI pattern. Also * performs the request dispatch to that servlet. How nice and OO =) diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletModule.java b/extensions/servlet/src/com/google/inject/servlet/ServletModule.java index 4bd54410..88d34403 100644 --- a/extensions/servlet/src/com/google/inject/servlet/ServletModule.java +++ b/extensions/servlet/src/com/google/inject/servlet/ServletModule.java @@ -18,10 +18,12 @@ package com.google.inject.servlet; import static com.google.common.base.Preconditions.checkState; +import com.google.common.collect.ImmutableList; import com.google.inject.AbstractModule; import com.google.inject.Key; -import com.google.common.collect.ImmutableList; + import java.util.Map; + import javax.servlet.Filter; import javax.servlet.ServletContext; import javax.servlet.http.HttpServlet; diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletModuleTargetVisitor.java b/extensions/servlet/src/com/google/inject/servlet/ServletModuleTargetVisitor.java index 353a6e53..fade33d8 100644 --- a/extensions/servlet/src/com/google/inject/servlet/ServletModuleTargetVisitor.java +++ b/extensions/servlet/src/com/google/inject/servlet/ServletModuleTargetVisitor.java @@ -14,13 +14,13 @@ package com.google.inject.servlet; -import javax.servlet.Filter; -import javax.servlet.http.HttpServlet; - import com.google.inject.servlet.ServletModule.FilterKeyBindingBuilder; import com.google.inject.servlet.ServletModule.ServletKeyBindingBuilder; import com.google.inject.spi.BindingTargetVisitor; +import javax.servlet.Filter; +import javax.servlet.http.HttpServlet; + /** * A visitor for the servlet extension. * diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletScopes.java b/extensions/servlet/src/com/google/inject/servlet/ServletScopes.java index fdbeacc8..27a67661 100644 --- a/extensions/servlet/src/com/google/inject/servlet/ServletScopes.java +++ b/extensions/servlet/src/com/google/inject/servlet/ServletScopes.java @@ -16,14 +16,16 @@ package com.google.inject.servlet; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import com.google.inject.Key; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; import com.google.inject.Scope; -import com.google.common.collect.Maps; -import com.google.common.base.Preconditions; + import java.util.Map; import java.util.concurrent.Callable; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java b/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java index 02e68edb..c5f973fd 100755 --- a/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java +++ b/extensions/servlet/src/com/google/inject/servlet/ServletsModuleBuilder.java @@ -15,15 +15,17 @@ */ package com.google.inject.servlet; -import com.google.inject.AbstractModule; -import com.google.inject.Key; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.inject.AbstractModule; +import com.google.inject.Key; import com.google.inject.internal.UniqueAnnotations; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.servlet.http.HttpServlet; /** diff --git a/extensions/servlet/src/com/google/inject/servlet/SessionScoped.java b/extensions/servlet/src/com/google/inject/servlet/SessionScoped.java index f4b25c00..5b61e26b 100644 --- a/extensions/servlet/src/com/google/inject/servlet/SessionScoped.java +++ b/extensions/servlet/src/com/google/inject/servlet/SessionScoped.java @@ -17,6 +17,7 @@ package com.google.inject.servlet; import com.google.inject.ScopeAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/extensions/servlet/test/com/google/inject/servlet/ContextPathTest.java b/extensions/servlet/test/com/google/inject/servlet/ContextPathTest.java index 0f1e5f97..36f62582 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ContextPathTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ContextPathTest.java @@ -19,6 +19,18 @@ package com.google.inject.servlet; import static org.easymock.EasyMock.createControl; import static org.easymock.EasyMock.expect; +import com.google.inject.Guice; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Scopes; +import com.google.inject.name.Named; +import com.google.inject.name.Names; + +import junit.framework.TestCase; + +import org.easymock.IMocksControl; + import java.io.IOException; import javax.servlet.FilterChain; @@ -31,18 +43,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; - -import org.easymock.IMocksControl; - -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Scopes; -import com.google.inject.name.Named; -import com.google.inject.name.Names; - /** Tests to make sure that servlets with a context path are handled right. */ public class ContextPathTest extends TestCase { diff --git a/extensions/servlet/test/com/google/inject/servlet/ContinuingRequestIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/ContinuingRequestIntegrationTest.java index 7d07739a..cc8f2ceb 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ContinuingRequestIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ContinuingRequestIntegrationTest.java @@ -16,14 +16,22 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.Singleton; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.List; import java.util.concurrent.AbstractExecutorService; @@ -33,6 +41,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; + import javax.servlet.FilterChain; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; @@ -40,15 +49,11 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Tests continuation of requests */ + public class ContinuingRequestIntegrationTest extends TestCase { private static final String PARAM_VALUE = "there"; private static final String PARAM_NAME = "hi"; @@ -113,7 +118,7 @@ public class ContinuingRequestIntegrationTest extends TestCase { FilterConfig filterConfig = createMock(FilterConfig.class); expect(filterConfig.getServletContext()).andReturn(createMock(ServletContext.class)); - + GuiceFilter guiceFilter = injector.getInstance(GuiceFilter.class); HttpServletRequest request = createMock(HttpServletRequest.class); @@ -167,7 +172,7 @@ public class ContinuingRequestIntegrationTest extends TestCase { expect(request.getMethod()).andReturn("GET"); FilterChain filterChain = createMock(FilterChain.class); - + replay(request, filterConfig, filterChain); guiceFilter.init(filterConfig); diff --git a/extensions/servlet/test/com/google/inject/servlet/DummyFilterImpl.java b/extensions/servlet/test/com/google/inject/servlet/DummyFilterImpl.java index 5977414e..c931801e 100644 --- a/extensions/servlet/test/com/google/inject/servlet/DummyFilterImpl.java +++ b/extensions/servlet/test/com/google/inject/servlet/DummyFilterImpl.java @@ -17,6 +17,7 @@ package com.google.inject.servlet; import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/extensions/servlet/test/com/google/inject/servlet/DummyServlet.java b/extensions/servlet/test/com/google/inject/servlet/DummyServlet.java index 3fc15481..861f8e09 100644 --- a/extensions/servlet/test/com/google/inject/servlet/DummyServlet.java +++ b/extensions/servlet/test/com/google/inject/servlet/DummyServlet.java @@ -16,6 +16,7 @@ package com.google.inject.servlet; import com.google.inject.Singleton; + import javax.servlet.http.HttpServlet; /** diff --git a/extensions/servlet/test/com/google/inject/servlet/EdslTest.java b/extensions/servlet/test/com/google/inject/servlet/EdslTest.java index 47d14003..5c621164 100644 --- a/extensions/servlet/test/com/google/inject/servlet/EdslTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/EdslTest.java @@ -22,9 +22,11 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.Stage; -import java.util.HashMap; + import junit.framework.TestCase; +import java.util.HashMap; + /** * Sanity checks the EDSL and resultant bound module(s). * diff --git a/extensions/servlet/test/com/google/inject/servlet/ExtensionSpiTest.java b/extensions/servlet/test/com/google/inject/servlet/ExtensionSpiTest.java index 9f2ff307..2e5c6935 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ExtensionSpiTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ExtensionSpiTest.java @@ -19,22 +19,22 @@ package com.google.inject.servlet; import static com.google.inject.servlet.UriPatternType.REGEX; import static com.google.inject.servlet.UriPatternType.SERVLET; -import java.util.Iterator; -import java.util.List; - -import junit.framework.TestCase; - +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.inject.name.Names; import com.google.inject.servlet.ServletSpiVisitor.Params; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; +import junit.framework.TestCase; + +import java.util.Iterator; +import java.util.List; + /** * A very basic test that servletmodule works with bindings. * diff --git a/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java b/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java index 12913dd0..1ae64e88 100644 --- a/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java @@ -1,15 +1,25 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.google.inject.spi.BindingScopingVisitor; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -18,12 +28,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import junit.framework.TestCase; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Tests the lifecycle of the encapsulated {@link FilterDefinition} class. @@ -69,7 +73,7 @@ public class FilterDefinitionTest extends TestCase { String pattern = "/*"; final FilterDefinition filterDef = new FilterDefinition(pattern, Key.get(Filter.class), - UriPatternType.get(UriPatternType.SERVLET, pattern), initParams, null); + UriPatternType.get(UriPatternType.SERVLET, pattern), initParams, null); filterDef.init(servletContext, injector, Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap())); @@ -178,7 +182,7 @@ public class FilterDefinitionTest extends TestCase { UriPatternType.get(UriPatternType.SERVLET, pattern), new HashMap<String, String>(), null); //should fire on mockfilter now filterDef.init(createMock(ServletContext.class), injector, - Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap())); + Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap())); assertTrue(filterDef.getFilter() instanceof MockFilter); diff --git a/extensions/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java index e6a2b115..81354ccd 100644 --- a/extensions/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/FilterDispatchIntegrationTest.java @@ -1,12 +1,23 @@ package com.google.inject.servlet; +import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; + +import junit.framework.TestCase; + +import org.easymock.EasyMock; +import org.easymock.IMocksControl; + import java.io.IOException; import java.util.ArrayList; import java.util.List; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -16,13 +27,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; -import org.easymock.EasyMock; -import org.easymock.IMocksControl; - -import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; /** * @@ -144,9 +148,9 @@ public class FilterDispatchIntegrationTest extends TestCase { control.verify(); assertTrue("lifecycle states did not " - + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters - + "; destroys: " + destroys, - inits == 1 && doFilters == 0 && destroys == 1); + + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters + + "; destroys: " + destroys, + inits == 1 && doFilters == 0 && destroys == 1); } public final void testDispatchFilterPipelineWithRegexMatching() throws ServletException, @@ -185,9 +189,9 @@ public class FilterDispatchIntegrationTest extends TestCase { control.verify(); assertTrue("lifecycle states did not fire " - + "correct number of times-- inits: " + inits + "; dos: " + doFilters - + "; destroys: " + destroys, - inits == 1 && doFilters == 2 && destroys == 1); + + "correct number of times-- inits: " + inits + "; dos: " + doFilters + + "; destroys: " + destroys, + inits == 1 && doFilters == 2 && destroys == 1); } @Singleton diff --git a/extensions/servlet/test/com/google/inject/servlet/FilterPipelineTest.java b/extensions/servlet/test/com/google/inject/servlet/FilterPipelineTest.java index fbef312e..6ecce07a 100644 --- a/extensions/servlet/test/com/google/inject/servlet/FilterPipelineTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/FilterPipelineTest.java @@ -1,9 +1,5 @@ package com.google.inject.servlet; -import com.google.inject.Guice; -import com.google.inject.Key; -import com.google.inject.Singleton; - import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; @@ -12,7 +8,14 @@ import static org.easymock.EasyMock.isNull; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import com.google.inject.Guice; +import com.google.inject.Key; +import com.google.inject.Singleton; + +import junit.framework.TestCase; + import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -21,7 +24,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import junit.framework.TestCase; /** * This is a basic whitebox test that verifies the glue between diff --git a/extensions/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java b/extensions/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java index 2d9e3ed4..020f277d 100644 --- a/extensions/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/InjectedFilterPipelineTest.java @@ -1,10 +1,23 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.isA; +import static org.easymock.EasyMock.isNull; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; + +import junit.framework.TestCase; + import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -13,16 +26,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import junit.framework.TestCase; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.isA; -import static org.easymock.EasyMock.isNull; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; /** * Exactly the same as {@linkplain com.google.inject.servlet.FilterPipelineTest} except @@ -169,7 +172,7 @@ public class InjectedFilterPipelineTest extends TestCase { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - fail("This filter should never have fired"); + fail("This filter should never have fired"); } public void destroy() { diff --git a/extensions/servlet/test/com/google/inject/servlet/InvalidScopeBindingTest.java b/extensions/servlet/test/com/google/inject/servlet/InvalidScopeBindingTest.java index bf07b882..689e3e86 100644 --- a/extensions/servlet/test/com/google/inject/servlet/InvalidScopeBindingTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/InvalidScopeBindingTest.java @@ -1,13 +1,16 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.createMock; + import com.google.inject.Guice; -import com.google.inject.Singleton; import com.google.inject.Scopes; +import com.google.inject.Singleton; + +import junit.framework.TestCase; + import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; -import junit.framework.TestCase; -import static org.easymock.EasyMock.createMock; /** * Ensures that an error is thrown if a Servlet or Filter is bound diff --git a/extensions/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java index fac08956..5fc285ba 100644 --- a/extensions/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/MultiModuleDispatchIntegrationTest.java @@ -1,16 +1,19 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import junit.framework.TestCase; import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -18,7 +21,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import junit.framework.TestCase; /** * @@ -87,9 +89,9 @@ public class MultiModuleDispatchIntegrationTest extends TestCase { verify(requestMock); assertTrue("lifecycle states did not" - + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters - + "; destroys: " + destroys, - inits == 1 && doFilters == 3 && destroys == 1); + + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters + + "; destroys: " + destroys, + inits == 1 && doFilters == 3 && destroys == 1); } @Singleton diff --git a/extensions/servlet/test/com/google/inject/servlet/MultipleServletInjectorsTest.java b/extensions/servlet/test/com/google/inject/servlet/MultipleServletInjectorsTest.java index 9cea30d9..96dd51b6 100644 --- a/extensions/servlet/test/com/google/inject/servlet/MultipleServletInjectorsTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/MultipleServletInjectorsTest.java @@ -15,13 +15,6 @@ */ package com.google.inject.servlet; -import com.google.inject.Guice; -import com.google.inject.Injector; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.http.HttpServlet; -import junit.framework.TestCase; - import static com.google.inject.servlet.GuiceServletContextListener.INJECTOR_NAME; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.eq; @@ -30,6 +23,15 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import com.google.inject.Guice; +import com.google.inject.Injector; + +import junit.framework.TestCase; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.http.HttpServlet; + /** * This gorgeous test asserts that multiple servlet pipelines can * run in the SAME JVM. booya. diff --git a/extensions/servlet/test/com/google/inject/servlet/ScopeRequestIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/ScopeRequestIntegrationTest.java index 1302c868..9a4d0d4c 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ScopeRequestIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ScopeRequestIntegrationTest.java @@ -16,6 +16,8 @@ package com.google.inject.servlet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; @@ -24,11 +26,11 @@ import com.google.inject.OutOfScopeException; import com.google.inject.Provider; import com.google.inject.ProvisionException; import com.google.inject.Singleton; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.inject.name.Named; import com.google.inject.name.Names; +import junit.framework.TestCase; + import java.io.IOException; import java.util.Map; import java.util.concurrent.Callable; @@ -36,12 +38,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; + import javax.servlet.ServletException; -import junit.framework.TestCase; /** * Tests continuation of requests */ + public class ScopeRequestIntegrationTest extends TestCase { private static final String A_VALUE = "thereaoskdao"; private static final String A_DIFFERENT_VALUE = "hiaoskd"; @@ -85,7 +88,7 @@ public class ScopeRequestIntegrationTest extends TestCase { executor.shutdown(); executor.awaitTermination(2, TimeUnit.SECONDS); } - + public final void testWrongValueClasses() throws Exception { Injector injector = Guice.createInjector(new ServletModule() { @Override protected void configureServlets() { @@ -93,7 +96,7 @@ public class ScopeRequestIntegrationTest extends TestCase { bind(SomeObject.class).in(RequestScoped.class); } }); - + OffRequestCallable offRequestCallable = injector.getInstance(OffRequestCallable.class); try { ServletScopes.scopeRequest(offRequestCallable, @@ -103,7 +106,7 @@ public class ScopeRequestIntegrationTest extends TestCase { assertEquals("Value[Boo!] of type[java.lang.String] is not compatible with key[" + Key.get(SomeObject.class) + "]", iae.getMessage()); } } - + public final void testNullReplacement() throws Exception { Injector injector = Guice.createInjector(new ServletModule() { @Override protected void configureServlets() { @@ -111,7 +114,7 @@ public class ScopeRequestIntegrationTest extends TestCase { bind(SomeObject.class).in(RequestScoped.class); } }); - + Callable<SomeObject> callable = injector.getInstance(Caller.class); try { assertNotNull(callable.call()); @@ -119,7 +122,7 @@ public class ScopeRequestIntegrationTest extends TestCase { } catch(ProvisionException pe) { assertTrue(pe.getCause() instanceof OutOfScopeException); } - + // Validate that an actual null entry in the map results in a null injected object. Map<Key<?>, Object> map = Maps.newHashMap(); map.put(Key.get(SomeObject.class), null); @@ -154,10 +157,10 @@ public class ScopeRequestIntegrationTest extends TestCase { return value; } } - + private static class Caller implements Callable<SomeObject> { @Inject Provider<SomeObject> someObject; - + public SomeObject call() throws Exception { return someObject.get(); } diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java index ab894bec..a5ac8414 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java @@ -16,26 +16,29 @@ package com.google.inject.servlet; +import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.google.inject.spi.BindingScopingVisitor; + +import junit.framework.TestCase; + import java.io.IOException; import java.util.HashMap; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; - -import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Ensures servlet spec compliance for CGI-style variables and general diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java index e201f87a..7ebc521c 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java @@ -16,25 +16,29 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.spi.BindingScopingVisitor; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; + +import junit.framework.TestCase; + import java.util.Enumeration; import java.util.HashMap; import java.util.Map; + import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; -import junit.framework.TestCase; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.verify; /** * Basic unit test for lifecycle of a ServletDefinition (wrapper). diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java index bf157f8c..c6d4e817 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java @@ -16,11 +16,21 @@ package com.google.inject.servlet; +import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; + +import junit.framework.TestCase; + import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -31,13 +41,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; - -import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Tests the FilterPipeline that dispatches to guice-managed servlets, diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletModuleTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletModuleTest.java index a36f6514..e33d9789 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletModuleTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletModuleTest.java @@ -16,17 +16,17 @@ package com.google.inject.servlet; -import java.util.List; - -import junit.framework.TestCase; - +import com.google.common.collect.Lists; import com.google.inject.Binding; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.common.collect.Lists; import com.google.inject.spi.DefaultBindingTargetVisitor; import com.google.inject.spi.Elements; +import junit.framework.TestCase; + +import java.util.List; + /** * Tests for ServletModule, to ensure it captures bindings correctly. * diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java index e994856c..7c22d598 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java @@ -16,38 +16,40 @@ package com.google.inject.servlet; +import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.inject.Binding; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.TypeLiteral; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.google.inject.spi.BindingScopingVisitor; import com.google.inject.util.Providers; +import junit.framework.TestCase; + import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.UUID; + import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; - -import static com.google.inject.servlet.ManagedServletPipeline.REQUEST_DISPATCHER_REQUEST; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Tests forwarding and inclusion (RequestDispatcher actions from the diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java b/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java index 8cf8b6d0..c155cf39 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletSpiVisitor.java @@ -16,6 +16,16 @@ package com.google.inject.servlet; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.inject.Binding; +import com.google.inject.Injector; +import com.google.inject.Stage; +import com.google.inject.spi.DefaultBindingTargetVisitor; + +import junit.framework.AssertionFailedError; + import java.util.List; import java.util.Map; import java.util.Set; @@ -30,16 +40,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import junit.framework.AssertionFailedError; - -import com.google.inject.Binding; -import com.google.inject.Injector; -import com.google.inject.Stage; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.base.Objects; -import com.google.inject.spi.DefaultBindingTargetVisitor; - /** * A visitor for testing the servlet SPI extension. * diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletTest.java index cab6ab02..df3d1fcf 100644 --- a/extensions/servlet/test/com/google/inject/servlet/ServletTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/ServletTest.java @@ -29,13 +29,13 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import com.google.common.collect.Maps; import com.google.inject.AbstractModule; import com.google.inject.BindingAnnotation; import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.common.collect.Maps; import com.google.inject.servlet.RequestParameters; import com.google.inject.util.Providers; diff --git a/extensions/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java index 657b59d5..ad552309 100644 --- a/extensions/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/VarargsFilterDispatchIntegrationTest.java @@ -1,16 +1,19 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import junit.framework.TestCase; import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -18,7 +21,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import junit.framework.TestCase; /** * @@ -79,7 +81,7 @@ public class VarargsFilterDispatchIntegrationTest extends TestCase { assertTrue("lifecycle states did not" + " fire correct number of times-- inits: " + inits + "; dos: " + doFilters + "; destroys: " + destroys, - inits == 1 && doFilters == 3 && destroys == 1); + inits == 1 && doFilters == 3 && destroys == 1); } public final void testDispatchThatNoFiltersFire() throws ServletException, IOException { @@ -116,9 +118,9 @@ public class VarargsFilterDispatchIntegrationTest extends TestCase { verify(requestMock); assertTrue("lifecycle states did not " - + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters - + "; destroys: " + destroys, - inits == 1 && doFilters == 0 && destroys == 1); + + "fire correct number of times-- inits: " + inits + "; dos: " + doFilters + + "; destroys: " + destroys, + inits == 1 && doFilters == 0 && destroys == 1); } public final void testDispatchFilterPipelineWithRegexMatching() throws ServletException, @@ -156,9 +158,9 @@ public class VarargsFilterDispatchIntegrationTest extends TestCase { verify(requestMock); assertTrue("lifecycle states did not fire " - + "correct number of times-- inits: " + inits + "; dos: " + doFilters - + "; destroys: " + destroys, - inits == 1 && doFilters == 2 && destroys == 1); + + "correct number of times-- inits: " + inits + "; dos: " + doFilters + + "; destroys: " + destroys, + inits == 1 && doFilters == 2 && destroys == 1); } @Singleton diff --git a/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java index c4eb75bd..84622b42 100644 --- a/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java @@ -16,11 +16,20 @@ package com.google.inject.servlet; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; + +import junit.framework.TestCase; + import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -30,11 +39,6 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import junit.framework.TestCase; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; /** * Tests the FilterPipeline that dispatches to guice-managed servlets, diff --git a/extensions/spring/src/com/google/inject/spring/SpringIntegration.java b/extensions/spring/src/com/google/inject/spring/SpringIntegration.java index 44909ddb..fd3d0fd0 100644 --- a/extensions/spring/src/com/google/inject/spring/SpringIntegration.java +++ b/extensions/spring/src/com/google/inject/spring/SpringIntegration.java @@ -16,11 +16,13 @@ package com.google.inject.spring; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.inject.Binder; import com.google.inject.Inject; import com.google.inject.Provider; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.name.Names; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; diff --git a/extensions/spring/test/com/google/inject/spring/SpringIntegrationTest.java b/extensions/spring/test/com/google/inject/spring/SpringIntegrationTest.java index 15b98181..7f9c9839 100644 --- a/extensions/spring/test/com/google/inject/spring/SpringIntegrationTest.java +++ b/extensions/spring/test/com/google/inject/spring/SpringIntegrationTest.java @@ -16,14 +16,17 @@ package com.google.inject.spring; +import static com.google.inject.spring.SpringIntegration.fromSpring; + import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.name.Names; -import static com.google.inject.spring.SpringIntegration.fromSpring; + import junit.framework.TestCase; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; diff --git a/extensions/struts2/src/com/google/inject/struts2/GuiceObjectFactory.java b/extensions/struts2/src/com/google/inject/struts2/GuiceObjectFactory.java index c6aabb69..f3bf8f03 100644 --- a/extensions/struts2/src/com/google/inject/struts2/GuiceObjectFactory.java +++ b/extensions/struts2/src/com/google/inject/struts2/GuiceObjectFactory.java @@ -23,12 +23,14 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.internal.Annotations; import com.google.inject.servlet.ServletModule; + import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.config.ConfigurationException; import com.opensymphony.xwork2.config.entities.InterceptorConfig; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.Interceptor; + import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.HashSet; diff --git a/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java b/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java index 8ae0f00b..6e9263aa 100644 --- a/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java +++ b/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java @@ -16,18 +16,11 @@ package com.google.inject.struts2; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Logger; - import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.internal.Annotations; + import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.config.ConfigurationException; @@ -35,6 +28,14 @@ import com.opensymphony.xwork2.config.entities.InterceptorConfig; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.Interceptor; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Logger; + /** * Cleanup up version from Bob's GuiceObjectFactory. Now works properly with * GS2 and fixes several bugs. diff --git a/extensions/struts2/test/com/google/inject/struts2/Struts2FactoryTest.java b/extensions/struts2/test/com/google/inject/struts2/Struts2FactoryTest.java index 45d3e1c0..3beca7f8 100644 --- a/extensions/struts2/test/com/google/inject/struts2/Struts2FactoryTest.java +++ b/extensions/struts2/test/com/google/inject/struts2/Struts2FactoryTest.java @@ -16,12 +16,7 @@ package com.google.inject.struts2; -import java.util.Date; - -import junit.framework.TestCase; - import org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter; - import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; @@ -31,6 +26,10 @@ import com.google.inject.Singleton; import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; +import junit.framework.TestCase; + +import java.util.Date; + /** * Test for Struts2Factory * diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java index e054267a..0de744af 100644 --- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java +++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java @@ -16,12 +16,7 @@ package com.google.inject.throwingproviders; -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Exposed; import com.google.inject.Key; @@ -29,12 +24,17 @@ import com.google.inject.PrivateBinder; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import com.google.inject.binder.ScopedBindingBuilder; -import com.google.common.collect.ImmutableSet; import com.google.inject.internal.util.StackTraceElements; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.throwingproviders.ThrowingProviderBinder.SecondaryBinder; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Set; + /** * A provider that invokes a method and returns its result. * diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethodsModule.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethodsModule.java index e6d4d431..523d0203 100644 --- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethodsModule.java +++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethodsModule.java @@ -16,6 +16,10 @@ package com.google.inject.throwingproviders; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Module; @@ -24,12 +28,10 @@ import com.google.inject.TypeLiteral; import com.google.inject.internal.Annotations; import com.google.inject.internal.Errors; import com.google.inject.internal.UniqueAnnotations; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.spi.Dependency; import com.google.inject.spi.Message; import com.google.inject.util.Modules; + import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Method; diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProvides.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProvides.java index 983b6ec8..3257d286 100644 --- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProvides.java +++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProvides.java @@ -16,10 +16,11 @@ package com.google.inject.throwingproviders; -import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java index ac4e4546..41e68b04 100644 --- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java +++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java @@ -16,17 +16,18 @@ package com.google.inject.throwingproviders; +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import com.google.inject.binder.ScopedBindingBuilder; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.inject.internal.UniqueAnnotations; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.inject.spi.Dependency; import com.google.inject.spi.ProviderWithDependencies; import com.google.inject.util.Types; @@ -124,7 +125,7 @@ public class ThrowingProviderBinder { } Key<P> getKey() { - return interfaceKey; + return interfaceKey; } public SecondaryBinder<P> annotatedWith(Class<? extends Annotation> annotationType) { diff --git a/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderMethodsModuleTest.java b/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderMethodsModuleTest.java index b350e69c..b7a8335d 100644 --- a/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderMethodsModuleTest.java +++ b/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderMethodsModuleTest.java @@ -184,12 +184,12 @@ public class CheckedProviderMethodsModuleTest extends TestCase { } private static class Pair<A, B> { - A first; - B second; - - Pair(A a, B b) { - this.first= a; - this.second = b; - } + A first; + B second; + + Pair(A a, B b) { + this.first= a; + this.second = b; + } } }
\ No newline at end of file diff --git a/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderTest.java b/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderTest.java index 45c9a593..3d58791c 100644 --- a/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderTest.java +++ b/extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProviderTest.java @@ -16,8 +16,11 @@ package com.google.inject.throwingproviders; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import com.google.inject.AbstractModule; - import com.google.inject.Asserts; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -26,10 +29,6 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.TypeLiteral; import com.google.inject.internal.util.Classes; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.spi.Dependency; @@ -37,6 +36,8 @@ import com.google.inject.spi.HasDependencies; import com.google.inject.spi.Message; import com.google.inject.throwingproviders.ThrowingProviderBinder.Result; +import junit.framework.TestCase; + import java.io.IOException; import java.net.BindException; import java.rmi.AccessException; @@ -46,8 +47,6 @@ import java.util.List; import java.util.Set; import java.util.TooManyListenersException; -import junit.framework.TestCase; - /** * @author jmourits@google.com (Jerome Mourits) * @author jessewilson@google.com (Jesse Wilson) diff --git a/extensions/throwingproviders/test/com/google/inject/throwingproviders/TestScope.java b/extensions/throwingproviders/test/com/google/inject/throwingproviders/TestScope.java index 1e435c3a..79445a69 100644 --- a/extensions/throwingproviders/test/com/google/inject/throwingproviders/TestScope.java +++ b/extensions/throwingproviders/test/com/google/inject/throwingproviders/TestScope.java @@ -16,12 +16,14 @@ package com.google.inject.throwingproviders; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.Scope; import com.google.inject.ScopeAnnotation; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.util.HashMap; import java.util.Map; diff --git a/extensions/throwingproviders/test/com/google/inject/throwingproviders/ThrowingProviderTest.java b/extensions/throwingproviders/test/com/google/inject/throwingproviders/ThrowingProviderTest.java index d3a68347..d56cb7dc 100644 --- a/extensions/throwingproviders/test/com/google/inject/throwingproviders/ThrowingProviderTest.java +++ b/extensions/throwingproviders/test/com/google/inject/throwingproviders/ThrowingProviderTest.java @@ -16,8 +16,11 @@ package com.google.inject.throwingproviders; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import com.google.inject.AbstractModule; - import com.google.inject.CreationException; import com.google.inject.Guice; import com.google.inject.Inject; @@ -25,16 +28,14 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.TypeLiteral; import com.google.inject.internal.util.Classes; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.spi.Dependency; import com.google.inject.spi.HasDependencies; import com.google.inject.spi.Message; +import junit.framework.TestCase; + import java.io.IOException; import java.rmi.AccessException; import java.rmi.RemoteException; @@ -43,8 +44,6 @@ import java.util.List; import java.util.Set; import java.util.TooManyListenersException; -import junit.framework.TestCase; - /** * @author jmourits@google.com (Jerome Mourits) * @author jessewilson@google.com (Jesse Wilson) |