diff options
Diffstat (limited to 'extensions')
130 files changed, 636 insertions, 431 deletions
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) |