http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java index 0503aff..dfdebc9 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java @@ -94,7 +94,7 @@ public class TestTang { @Test public void testSingleton() throws InjectionException { - Injector injector = tang.newInjector(); + final Injector injector = tang.newInjector(); Assert.assertNotNull(injector.getInstance(TwoSingletons.class)); Assert.assertNotNull(injector.getInstance(TwoSingletons.class)); } @@ -110,16 +110,16 @@ public class TestTang { // TODO: Delete this? (It is handled in TestClassHierarchy!) @Test(expected = ClassHierarchyException.class) public void testRepeatedAmbiguousArgs() throws BindException, NameResolutionException { - JavaConfigurationBuilder t = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder t = tang.newConfigurationBuilder(); t.getClassHierarchy().getNode(ReflectionUtilities.getFullName(RepeatedAmbiguousArgs.class)); } @Test public void testRepeatedOKArgs() throws BindException, InjectionException { - JavaConfigurationBuilder t = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder t = tang.newConfigurationBuilder(); t.bindNamedParameter(RepeatedNamedArgs.A.class, "1"); t.bindNamedParameter(RepeatedNamedArgs.B.class, "2"); - Injector injector = tang.newInjector(t.build()); + final Injector injector = tang.newInjector(t.build()); injector.getInstance(RepeatedNamedArgs.class); } @@ -172,7 +172,7 @@ public class TestTang { @Test public void testRepeatedNamedArgs() throws BindException, InjectionException { - Injector i = tang.newInjector(); + final Injector i = tang.newInjector(); i.bindVolatileParameter(RepeatedNamedSingletonArgs.A.class, i.getInstance(MustBeSingleton.class)); i.bindVolatileParameter(RepeatedNamedSingletonArgs.B.class, @@ -183,7 +183,7 @@ public class TestTang { @Test public void testStraightforwardBuild() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bind(Interf.class, Impl.class); tang.newInjector(cb.build()).getInstance(Interf.class); } @@ -194,12 +194,12 @@ public class TestTang { thrown.expect(BindException.class); thrown.expectMessage("Attempt to re-bind named parameter org.apache.reef.tang.OneNamedStringArg$A. " + " Old value was [not default] new value is [volatile]"); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - OneNamedStringArg a = tang.newInjector(cb.build()).getInstance( + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final OneNamedStringArg a = tang.newInjector(cb.build()).getInstance( OneNamedStringArg.class); Assert.assertEquals("default", a.s); cb.bindNamedParameter(OneNamedStringArg.A.class, "not default"); - Injector i = tang.newInjector(cb.build()); + final Injector i = tang.newInjector(cb.build()); Assert .assertEquals("not default", i.getInstance(OneNamedStringArg.class).s); i.bindVolatileParameter(OneNamedStringArg.A.class, "volatile"); @@ -209,12 +209,12 @@ public class TestTang { @Test public void testOneNamedStringArgBind() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - OneNamedStringArg a = tang.newInjector(cb.build()).getInstance( + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final OneNamedStringArg a = tang.newInjector(cb.build()).getInstance( OneNamedStringArg.class); Assert.assertEquals("default", a.s); cb.bindNamedParameter(OneNamedStringArg.A.class, "not default"); - Injector i = tang.newInjector(cb.build()); + final Injector i = tang.newInjector(cb.build()); Assert .assertEquals("not default", i.getInstance(OneNamedStringArg.class).s); } @@ -222,10 +222,10 @@ public class TestTang { @Test public void testOneNamedStringArgVolatile() throws BindException, InjectionException { - OneNamedStringArg a = tang.newInjector().getInstance( + final OneNamedStringArg a = tang.newInjector().getInstance( OneNamedStringArg.class); Assert.assertEquals("default", a.s); - Injector i = tang.newInjector(); + final Injector i = tang.newInjector(); i.bindVolatileParameter(OneNamedStringArg.A.class, "volatile"); Assert.assertEquals("volatile", i.getInstance(OneNamedStringArg.class).s); } @@ -233,14 +233,14 @@ public class TestTang { @Test public void testTwoNamedStringArgsBind() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance( + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance( TwoNamedStringArgs.class); Assert.assertEquals("defaultA", a.a); Assert.assertEquals("defaultB", a.b); cb.bindNamedParameter(TwoNamedStringArgs.A.class, "not defaultA"); cb.bindNamedParameter(TwoNamedStringArgs.B.class, "not defaultB"); - Injector i = tang.newInjector(cb.build()); + final Injector i = tang.newInjector(cb.build()); Assert.assertEquals("not defaultA", i.getInstance(TwoNamedStringArgs.class).a); Assert.assertEquals("not defaultB", @@ -250,8 +250,8 @@ public class TestTang { @Test public void testTwoNamedStringArgsBindVolatile() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance( + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance( TwoNamedStringArgs.class); Assert.assertEquals("defaultA", a.a); Assert.assertEquals("defaultB", a.b); @@ -271,21 +271,21 @@ public class TestTang { thrown.expect(BindException.class); thrown.expectMessage("Attempt to re-bind named parameter org.apache.reef.tang.TwoNamedStringArgs$A. " + " Old value was [not defaultA] new value is [not defaultA]"); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance( + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance( TwoNamedStringArgs.class); Assert.assertEquals("defaultA", a.a); Assert.assertEquals("defaultB", a.b); cb.bindNamedParameter(TwoNamedStringArgs.A.class, "not defaultA"); cb.bindNamedParameter(TwoNamedStringArgs.B.class, "not defaultB"); - Injector i = tang.newInjector(cb.build()); + final Injector i = tang.newInjector(cb.build()); i.bindVolatileParameter(TwoNamedStringArgs.A.class, "not defaultA"); i.bindVolatileParameter(TwoNamedStringArgs.B.class, "not defaultB"); } @Test public void testBextendsAinjectA() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bind(BextendsAinjectA.A.class, BextendsAinjectA.A.class); tang.newInjector(cb.build()).getInstance(BextendsAinjectA.A.class); } @@ -293,13 +293,13 @@ public class TestTang { @Test public void testExternalConstructor() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bindConstructor(ExternalConstructorExample.Legacy.class, ExternalConstructorExample.LegacyWrapper.class); - Injector i = tang.newInjector(cb.build()); + final Injector i = tang.newInjector(cb.build()); i.bindVolatileInstance(Integer.class, 42); i.bindVolatileInstance(String.class, "The meaning of life is "); - ExternalConstructorExample.Legacy l = i + final ExternalConstructorExample.Legacy l = i .getInstance(ExternalConstructorExample.Legacy.class); Assert.assertEquals(new Integer(42), l.x); Assert.assertEquals("The meaning of life is ", l.y); @@ -308,20 +308,20 @@ public class TestTang { @Test public void testLegacyConstructor() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.registerLegacyConstructor( ReflectionUtilities.getFullName(LegacyConstructor.class), ReflectionUtilities.getFullName(Integer.class), ReflectionUtilities.getFullName(String.class)); cb.bind(LegacyConstructor.class, LegacyConstructor.class); - String confString = ConfigurationFile.toConfigurationString(cb.build()); - JavaConfigurationBuilder cb2 = tang.newConfigurationBuilder(); + final String confString = ConfigurationFile.toConfigurationString(cb.build()); + final JavaConfigurationBuilder cb2 = tang.newConfigurationBuilder(); // System.err.println(confString); ConfigurationFile.addConfiguration(cb2, confString); - Injector i = tang.newInjector(cb2.build()); + final Injector i = tang.newInjector(cb2.build()); i.bindVolatileInstance(Integer.class, 42); i.bindVolatileInstance(String.class, "The meaning of life is "); - LegacyConstructor l = i.getInstance(LegacyConstructor.class); + final LegacyConstructor l = i.getInstance(LegacyConstructor.class); Assert.assertEquals(new Integer(42), l.x); Assert.assertEquals("The meaning of life is ", l.y); @@ -329,17 +329,17 @@ public class TestTang { @Test public void testNamedImpl() throws BindException, InjectionException { - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bindNamedParameter(NamedImpl.AImplName.class, NamedImpl.Aimpl.class); cb.bindNamedParameter(NamedImpl.BImplName.class, NamedImpl.Bimpl.class); - Injector i = tang.newInjector(cb.build()); - NamedImpl.Aimpl a1 = (NamedImpl.Aimpl) i + final Injector i = tang.newInjector(cb.build()); + final NamedImpl.Aimpl a1 = (NamedImpl.Aimpl) i .getNamedInstance(NamedImpl.AImplName.class); - NamedImpl.Aimpl a2 = (NamedImpl.Aimpl) i + final NamedImpl.Aimpl a2 = (NamedImpl.Aimpl) i .getNamedInstance(NamedImpl.AImplName.class); - NamedImpl.Bimpl b1 = (NamedImpl.Bimpl) i + final NamedImpl.Bimpl b1 = (NamedImpl.Bimpl) i .getNamedInstance(NamedImpl.BImplName.class); - NamedImpl.Bimpl b2 = (NamedImpl.Bimpl) i + final NamedImpl.Bimpl b2 = (NamedImpl.Bimpl) i .getNamedInstance(NamedImpl.BImplName.class); Assert.assertSame(a1, a2); Assert.assertSame(b1, b2); @@ -351,15 +351,15 @@ public class TestTang { thrown.expect(BindException.class); thrown.expectMessage("Name<org.apache.reef.tang.NamedImpl$A> " + "org.apache.reef.tang.NamedImpl$AImplName cannot take non-subclass org.apache.reef.tang.NamedImpl$Cimpl"); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bindNamedParameter((Class) NamedImpl.AImplName.class, (Class) NamedImpl.Cimpl.class); } @Test public void testUnit() throws BindException, InjectionException { - Injector inj = tang.newInjector(); - OuterUnit.InA a = inj.getInstance(OuterUnit.InA.class); - OuterUnit.InB b = inj.getInstance(OuterUnit.InB.class); + final Injector inj = tang.newInjector(); + final OuterUnit.InA a = inj.getInstance(OuterUnit.InA.class); + final OuterUnit.InB b = inj.getInstance(OuterUnit.InB.class); Assert.assertEquals(a.slf, b.slf); } @@ -368,8 +368,8 @@ public class TestTang { thrown.expect(InjectionException.class); thrown.expectMessage("Cannot inject org.apache.reef.tang.MissOuterUnit$InA: " + "No known implementations / injectable constructors for org.apache.reef.tang.MissOuterUnit$InA"); - Injector inj = tang.newInjector(); - MissOuterUnit.InA a = inj.getInstance(MissOuterUnit.InA.class); + final Injector inj = tang.newInjector(); + final MissOuterUnit.InA a = inj.getInstance(MissOuterUnit.InA.class); } @Test @@ -377,8 +377,8 @@ public class TestTang { thrown.expect(ClassHierarchyException.class); thrown.expectMessage("Cannot @Inject non-static member class unless the enclosing class an @Unit. " + " Nested class is:org.apache.reef.tang.MissOuterUnit$InB"); - Injector inj = tang.newInjector(); - MissOuterUnit.InB b = inj.getInstance(MissOuterUnit.InB.class); + final Injector inj = tang.newInjector(); + final MissOuterUnit.InB b = inj.getInstance(MissOuterUnit.InB.class); } @Test @@ -439,10 +439,9 @@ public class TestTang { @Test public void testDefaultImplementation() throws BindException, ClassHierarchyException, InjectionException { - ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - @SuppressWarnings("unused") - IfaceWithDefault iwd = i.getNamedInstance(IfaceWithDefaultName.class); + final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + @SuppressWarnings("unused") final IfaceWithDefault iwd = i.getNamedInstance(IfaceWithDefaultName.class); } @Test @@ -450,10 +449,9 @@ public class TestTang { thrown.expect(InjectionException.class); thrown.expectMessage("getInstance() called on Name org.apache.reef.tang.IfaceWithDefaultName " + "Did you mean to call getNamedInstance() instead?"); - ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - @SuppressWarnings("unused") - IfaceWithDefaultName iwd = i.getInstance(IfaceWithDefaultName.class); + final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + @SuppressWarnings("unused") final IfaceWithDefaultName iwd = i.getInstance(IfaceWithDefaultName.class); } @Test @@ -463,7 +461,7 @@ public class TestTang { @Test public void testCanOverrideDefaultedInterface() throws BindException, InjectionException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindImplementation(HaveDefaultImpl.class, OverrideDefaultImpl.class); Assert.assertTrue(Tang.Factory.getTang().newInjector(cb.build()) .getInstance(HaveDefaultImpl.class) instanceof OverrideDefaultImpl); @@ -476,7 +474,7 @@ public class TestTang { @Test public void testCanOverrideStringDefaultedInterface() throws BindException, InjectionException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindImplementation(HaveDefaultStringImpl.class, OverrideDefaultStringImpl.class); Assert.assertTrue(Tang.Factory.getTang().newInjector(cb.build()) .getInstance(HaveDefaultStringImpl.class) instanceof OverrideDefaultStringImpl); @@ -484,23 +482,23 @@ public class TestTang { @Test public void testSingletonWithMultipleConstructors() throws BindException, InjectionException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindImplementation(SMC.class, SingletonMultiConst.class); cb.bindNamedParameter(SingletonMultiConst.A.class, "foo"); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); i.getInstance(SMC.class); } @Test public void testInjectInjector() throws InjectionException, BindException { - Injector i = Tang.Factory.getTang().newInjector(); - InjectInjector ii = i.getInstance(InjectInjector.class); + final Injector i = Tang.Factory.getTang().newInjector(); + final InjectInjector ii = i.getInstance(InjectInjector.class); Assert.assertSame(i, ii.i); } @Test public void testProactiveFutures() throws InjectionException, BindException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); IsFuture.instantiated = false; i.getInstance(NeedsFuture.class); Assert.assertTrue(IsFuture.instantiated); @@ -509,24 +507,24 @@ public class TestTang { @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testGenericEventHandlers() throws BindException, InjectionException { - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); cba.bindNamedParameter(XName.class, (Class) XAA.class); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(XName.class); - JavaConfigurationBuilder cbb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cbb = Tang.Factory.getTang().newConfigurationBuilder(); cbb.bindNamedParameter(XName.class, XBB.class); Tang.Factory.getTang().newInjector(cbb.build()).getNamedInstance(XName.class); - JavaConfigurationBuilder cbc = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cbc = Tang.Factory.getTang().newConfigurationBuilder(); cbc.bindNamedParameter(XName.class, (Class) XCC.class); Tang.Factory.getTang().newInjector(cbc.build()).getNamedInstance(XName.class); } @Test public void testGenericEventHandlerDefaults() throws BindException, InjectionException { - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(XNameDA.class); - JavaConfigurationBuilder cbb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cbb = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cbb.build()).getNamedInstance(XNameDB.class); - JavaConfigurationBuilder cbc = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cbc = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cbc.build()).getNamedInstance(XNameDC.class); } @@ -536,13 +534,13 @@ public class TestTang { thrown.expectMessage("class org.apache.reef.tang.XNameDAA defines a default class org.apache.reef.tang.XCC " + "with a raw type that does not extend of its target's raw type class org.apache.reef.tang.XBB"); - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(XNameDAA.class); } @Test public void testGenericEventHandlerDefaultsGoodTreeIndirection() throws BindException, InjectionException { - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(XNameDDAA.class); } @@ -553,19 +551,19 @@ public class TestTang { "org.apache.reef.tang.GasCan with a type that does not extend its target's type " + "org.apache.reef.tang.Bottle<org.apache.reef.tang.Water"); - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(WaterBottleName.class); } @Test public void testGenericInterfaceUnboundTypeParametersName() throws BindException, InjectionException { - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(FooEventHandler.class); } @Test public void testGenericInterfaceUnboundTypeParametersNameIface() throws BindException, InjectionException { - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(IfaceEventHandler.class); } @@ -575,7 +573,7 @@ public class TestTang { thrown.expectMessage("interface org.apache.reef.tang.MyEventHandlerIface declares its default implementation " + "to be non-subclass class org.apache.reef.tang.MyEventHandler"); - JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder(); Tang.Factory.getTang().newInjector(cba.build()).isInjectable(MyEventHandlerIface.class); } @@ -586,7 +584,7 @@ public class TestTang { @Test public void testWantSomeHandlersBadOrder() throws BindException, InjectionException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); i.getInstance(AHandler.class); i.getInstance(BHandler.class); i.getInstance(WantSomeFutureHandlers.class); @@ -594,7 +592,7 @@ public class TestTang { @Test public void testWantSomeFutureHandlersAlreadyBoundVolatile() throws BindException, InjectionException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); i.bindVolatileInstance(AHandler.class, new AHandlerImpl()); i.bindVolatileInstance(BHandler.class, new BHandlerImpl()); i.getInstance(WantSomeFutureHandlers.class); @@ -618,8 +616,8 @@ public class TestTang { @Test public void testUnitMixedCanInject() throws BindException, InjectionException { //testing that you should be able to have @Unit and also static inner classes not included - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); i.getInstance(OuterUnitWithStatic.InnerStaticClass2.class); } @@ -631,39 +629,39 @@ public class TestTang { "implementations / injectable constructors for org.apache.reef.tang.OuterUnitWithStatic$InnerStaticClass"); //testing that you should be able to have @Unit and also static inner classes not included - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); i.getInstance(OuterUnitWithStatic.InnerStaticClass.class); } @Test public void testForkWorks() throws BindException, InjectionException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bind(CheckChildIface.class, CheckChildImpl.class); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - Injector i1 = i.forkInjector(); - CheckChildIface c1 = i1.getInstance(CheckChildIface.class); - Injector i2 = i.forkInjector(); - CheckChildIface c2 = i2.getInstance(CheckChildIface.class); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final Injector i1 = i.forkInjector(); + final CheckChildIface c1 = i1.getInstance(CheckChildIface.class); + final Injector i2 = i.forkInjector(); + final CheckChildIface c2 = i2.getInstance(CheckChildIface.class); Assert.assertTrue(c1 != c2); } @Test public void testReuseFailedInjector() throws BindException, InjectionException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); try { i.getInstance(Fail.class); Assert.fail("Injecting Fail should not have worked!"); - } catch (InjectionException e) { + } catch (final InjectionException e) { i.getInstance(Pass.class); } } @Test public void testForksInjectorInConstructor() throws BindException, InjectionException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); i.getInstance(ForksInjectorInConstructor.class); } @@ -734,14 +732,14 @@ class IsFuture { static boolean instantiated; @Inject - IsFuture(NeedsFuture nf) { + IsFuture(final NeedsFuture nf) { instantiated = true; } } class NeedsFuture { @Inject - NeedsFuture(InjectionFuture<IsFuture> isFut) { + NeedsFuture(final InjectionFuture<IsFuture> isFut) { } } @@ -749,18 +747,18 @@ class InjectInjector { public final Injector i; @Inject - InjectInjector(Injector i) { + InjectInjector(final Injector i) { this.i = i; } } class SingletonMultiConst implements SMC { @Inject - public SingletonMultiConst(@Parameter(A.class) String a) { + public SingletonMultiConst(@Parameter(A.class) final String a) { } @Inject - public SingletonMultiConst(@Parameter(A.class) String a, @Parameter(B.class) String b) { + public SingletonMultiConst(@Parameter(A.class) final String a, @Parameter(B.class) final String b) { } @NamedParameter @@ -802,7 +800,7 @@ class Param implements Name<Integer> { class Impl implements Interf { @Inject - Impl(@Parameter(Param.class) int p) { + Impl(@Parameter(Param.class) final int p) { } } @@ -821,26 +819,26 @@ class MustBeSingleton { class SubSingleton { @Inject - SubSingleton(MustBeSingleton a) { + SubSingleton(final MustBeSingleton a) { // Does not call super } } class TwoSingletons { @Inject - TwoSingletons(SubSingleton a, MustBeSingleton b) { + TwoSingletons(final SubSingleton a, final MustBeSingleton b) { } } class RepeatedAmbiguousArgs { @Inject - RepeatedAmbiguousArgs(int x, int y) { + RepeatedAmbiguousArgs(final int x, final int y) { } } class RepeatedNamedArgs { @Inject - RepeatedNamedArgs(@Parameter(A.class) int x, @Parameter(B.class) int y) { + RepeatedNamedArgs(@Parameter(A.class) final int x, @Parameter(B.class) final int y) { } @NamedParameter() @@ -854,8 +852,8 @@ class RepeatedNamedArgs { class RepeatedNamedSingletonArgs { @Inject - RepeatedNamedSingletonArgs(@Parameter(A.class) MustBeSingleton a, - @Parameter(B.class) MustBeSingleton b) { + RepeatedNamedSingletonArgs(@Parameter(A.class) final MustBeSingleton a, + @Parameter(B.class) final MustBeSingleton b) { } @NamedParameter() @@ -869,7 +867,7 @@ class RepeatedNamedSingletonArgs { class OneNamedSingletonArgs { @Inject - OneNamedSingletonArgs(@Parameter(A.class) MustBeSingleton a) { + OneNamedSingletonArgs(@Parameter(A.class) final MustBeSingleton a) { } @NamedParameter() @@ -885,7 +883,7 @@ class OneNamedStringArg { public final String s; @Inject - OneNamedStringArg(@Parameter(A.class) String s) { + OneNamedStringArg(@Parameter(A.class) final String s) { this.s = s; } @@ -899,7 +897,7 @@ class TwoNamedStringArgs { public final String b; @Inject - TwoNamedStringArgs(@Parameter(A.class) String a, @Parameter(B.class) String b) { + TwoNamedStringArgs(@Parameter(A.class) final String a, @Parameter(B.class) final String b) { this.a = a; this.b = b; } @@ -930,7 +928,7 @@ class ExternalConstructorExample { final String y; @Inject - LegacyWrapper(Integer x, String y) { + LegacyWrapper(final Integer x, final String y) { this.x = x; this.y = y; } @@ -946,7 +944,7 @@ class ExternalConstructorExample { final Integer x; final String y; - public Legacy(Integer x, String y) { + public Legacy(final Integer x, final String y) { this.x = x; this.y = y; } @@ -957,7 +955,7 @@ class LegacyConstructor { final Integer x; final String y; - public LegacyConstructor(Integer x, String y) { + public LegacyConstructor(final Integer x, final String y) { this.x = x; this.y = y; } @@ -1003,7 +1001,7 @@ class NamedImpl { static class ABtaker { @Inject - ABtaker(@Parameter(AImplName.class) A a, @Parameter(BImplName.class) A b) { + ABtaker(@Parameter(AImplName.class) final A a, @Parameter(BImplName.class) final A b) { Assert.assertTrue("AImplName must be instance of Aimpl", a instanceof Aimpl); Assert.assertTrue("BImplName must be instance of Bimpl", @@ -1060,24 +1058,24 @@ class ThreeConstructors { final Float f; @Inject - ThreeConstructors(@Parameter(TCInt.class) int i, @Parameter(TCString.class) String s) { + ThreeConstructors(@Parameter(TCInt.class) final int i, @Parameter(TCString.class) final String s) { this.i = i; this.s = s; this.f = -1.0f; } @Inject - ThreeConstructors(@Parameter(TCString.class) String s) { + ThreeConstructors(@Parameter(TCString.class) final String s) { this(-1, s); } @Inject - ThreeConstructors(@Parameter(TCInt.class) int i) { + ThreeConstructors(@Parameter(TCInt.class) final int i) { this(i, "default"); } @Inject - ThreeConstructors(@Parameter(TCFloat.class) float f) { + ThreeConstructors(@Parameter(TCFloat.class) final float f) { this.i = -1; this.s = "default"; this.f = f; @@ -1102,13 +1100,13 @@ class TwoConstructors { final String s; @Inject - TwoConstructors(@Parameter(TCInt.class) int i, @Parameter(TCString.class) String s) { + TwoConstructors(@Parameter(TCInt.class) final int i, @Parameter(TCString.class) final String s) { this.i = i; this.s = s; } @Inject - TwoConstructors(@Parameter(TCString.class) String s, @Parameter(TCInt.class) int i) { + TwoConstructors(@Parameter(TCString.class) final String s, @Parameter(TCInt.class) final int i) { this.i = i; this.s = s; } @@ -1179,27 +1177,27 @@ class CC extends BB { class XAA implements X<AA> { @Inject - XAA(AA aa) { + XAA(final AA aa) { } } @DefaultImplementation(XBB.class) class XBB implements X<BB> { @Inject - XBB(BB aa) { + XBB(final BB aa) { } } class XXBB extends XBB { @Inject - XXBB(BB aa) { + XXBB(final BB aa) { super(aa); } } class XCC implements X<CC> { @Inject - XCC(CC aa) { + XCC(final CC aa) { } } @@ -1286,20 +1284,20 @@ class DefaultHandlerUnit { class WantSomeHandlers { @Inject - WantSomeHandlers(AHandler a, BHandler b) { + WantSomeHandlers(final AHandler a, final BHandler b) { } } class WantSomeFutureHandlers { @Inject - WantSomeFutureHandlers(InjectionFuture<AHandler> a, InjectionFuture<BHandler> b) { + WantSomeFutureHandlers(final InjectionFuture<AHandler> a, final InjectionFuture<BHandler> b) { } } class WantSomeFutureHandlersUnit { @Inject - WantSomeFutureHandlersUnit(InjectionFuture<DefaultHandlerUnit.AHandler> a, - InjectionFuture<DefaultHandlerUnit.BHandler> b) { + WantSomeFutureHandlersUnit(final InjectionFuture<DefaultHandlerUnit.AHandler> a, + final InjectionFuture<DefaultHandlerUnit.BHandler> b) { } } @@ -1314,8 +1312,8 @@ class BHandlerName implements Name<EventHandler<BH>> { class WantSomeFutureHandlersName { @Inject WantSomeFutureHandlersName( - @Parameter(AHandlerName.class) InjectionFuture<EventHandler<AH>> a, - @Parameter(BHandlerName.class) InjectionFuture<EventHandler<BH>> b) { + @Parameter(AHandlerName.class) final InjectionFuture<EventHandler<AH>> a, + @Parameter(BHandlerName.class) final InjectionFuture<EventHandler<BH>> b) { } } @@ -1367,8 +1365,8 @@ class CheckChildImplImpl extends CheckChildImpl { class ForksInjectorInConstructor { @Inject - ForksInjectorInConstructor(Injector i) throws BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + ForksInjectorInConstructor(final Injector i) throws BindException { + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindImplementation(Number.class, Integer.class); i.forkInjector(cb.build()); }
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java index a378702..3c80e70 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java @@ -50,7 +50,7 @@ public class TestTweetExample { @Test public void test() throws Exception { - Tweeter tw = (Tweeter) tang.newInjector(TweetConfig.CONF.set(TweetConfig.PHONE_NUMBER, + final Tweeter tw = (Tweeter) tang.newInjector(TweetConfig.CONF.set(TweetConfig.PHONE_NUMBER, new Long(867 - 5309)).build()).getInstance(Tweeter.class); tw.sendMessage(); } @@ -80,7 +80,7 @@ public class TestTweetExample { } @Override - public void sendSMS(String msg, long phoneNumber) { + public void sendSMS(final String msg, final long phoneNumber) { if (phoneNumber != 867 - 5309) { throw new IllegalArgumentException("Unknown recipient"); } @@ -94,8 +94,8 @@ public class TestTweetExample { private final long phoneNumber; @Inject - public Tweeter(TweetFactory tw, SMS sms, - @Parameter(PhoneNumber.class) long phoneNumber) { + public Tweeter(final TweetFactory tw, final SMS sms, + @Parameter(PhoneNumber.class) final long phoneNumber) { this.tw = tw; this.sms = sms; this.phoneNumber = phoneNumber; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerByteArrayRoundtripTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerByteArrayRoundtripTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerByteArrayRoundtripTest.java index 496e71c..425ab10 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerByteArrayRoundtripTest.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerByteArrayRoundtripTest.java @@ -27,14 +27,15 @@ import org.apache.reef.tang.test.RoundTripTest; */ public final class AvroConfigurationSerializerByteArrayRoundtripTest extends RoundTripTest { @Override - public Configuration roundTrip(Configuration configuration) throws Exception { + public Configuration roundTrip(final Configuration configuration) throws Exception { final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); final byte[] theBytes = serializer.toByteArray(configuration); return serializer.fromByteArray(theBytes); } @Override - public Configuration roundTrip(Configuration configuration, final ClassHierarchy classHierarchy) throws Exception { + public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) + throws Exception { final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); final byte[] theBytes = serializer.toByteArray(configuration); return serializer.fromByteArray(theBytes, classHierarchy); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerFileRoundtripTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerFileRoundtripTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerFileRoundtripTest.java index 0c4d6c4..3458175 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerFileRoundtripTest.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerFileRoundtripTest.java @@ -29,7 +29,7 @@ import java.io.File; */ public final class AvroConfigurationSerializerFileRoundtripTest extends RoundTripTest { @Override - public Configuration roundTrip(Configuration configuration) throws Exception { + public Configuration roundTrip(final Configuration configuration) throws Exception { final File tempFile = java.io.File.createTempFile("TangTest", "avroconf"); final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); serializer.toFile(configuration, tempFile); @@ -39,7 +39,8 @@ public final class AvroConfigurationSerializerFileRoundtripTest extends RoundTri } @Override - public Configuration roundTrip(Configuration configuration, final ClassHierarchy classHierarchy) throws Exception { + public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) + throws Exception { final File tempFile = java.io.File.createTempFile("TangTest", "avroconf"); final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); serializer.toFile(configuration, tempFile); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerTextFileRoundtripTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerTextFileRoundtripTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerTextFileRoundtripTest.java index 962c076..3d52662 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerTextFileRoundtripTest.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerTextFileRoundtripTest.java @@ -29,7 +29,7 @@ import java.io.File; */ public final class AvroConfigurationSerializerTextFileRoundtripTest extends RoundTripTest { @Override - public Configuration roundTrip(Configuration configuration) throws Exception { + public Configuration roundTrip(final Configuration configuration) throws Exception { final File tempFile = File.createTempFile("TangTest", "avroconf"); final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); serializer.toTextFile(configuration, tempFile); @@ -39,7 +39,8 @@ public final class AvroConfigurationSerializerTextFileRoundtripTest extends Roun } @Override - public Configuration roundTrip(Configuration configuration, final ClassHierarchy classHierarchy) throws Exception { + public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) + throws Exception { final File tempFile = File.createTempFile("TangTest", "avroconf"); final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer(); serializer.toTextFile(configuration, tempFile); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java index 3e432fd..32226a7 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java @@ -128,11 +128,11 @@ public class TestConfigurationModule { // Here we set some configuration values. In true tang style, // you won't be able to set them more than once ConfigurationModule's // implementation is complete. - Configuration c = MyConfigurationModule.CONF + final Configuration c = MyConfigurationModule.CONF .set(MyConfigurationModule.THE_FOO, FooImpl.class) .set(MyConfigurationModule.FOO_NESS, "" + 12) .build(); - Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); + final Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); Assert.assertEquals(f.getFooness(), 12); } @@ -141,11 +141,11 @@ public class TestConfigurationModule { // Here we set some configuration values. In true tang style, // you won't be able to set them more than once ConfigurationModule's // implementation is complete. - Configuration c = MyConfigurationModule.CONF + final Configuration c = MyConfigurationModule.CONF .set(MyConfigurationModule.THE_FOO, FooImpl.class) .set(MyConfigurationModule.FOO_NESS, "" + 12) .build(); - Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); + final Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); Assert.assertEquals(f.getFooness(), 12); final File tempFile = File.createTempFile("TangTest", ".avroconf"); @@ -158,10 +158,10 @@ public class TestConfigurationModule { @Test public void omitOptionalTest() throws BindException, InjectionException { // Optional is optional. - Configuration c = MyConfigurationModule.CONF + final Configuration c = MyConfigurationModule.CONF .set(MyConfigurationModule.THE_FOO, FooImpl.class) .build(); - Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); + final Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); Assert.assertEquals(f.getFooness(), 42); } @@ -173,7 +173,7 @@ public class TestConfigurationModule { MyConfigurationModule.CONF .set(MyConfigurationModule.FOO_NESS, "" + 12) .build(); - } catch (ExceptionInInitializerError e) { + } catch (final ExceptionInInitializerError e) { throw e.getCause(); } } @@ -185,9 +185,8 @@ public class TestConfigurationModule { try { // Java's classloader semantics cause it to load a class when executing the // first line that references the class in question. - @SuppressWarnings("unused") - Object o = MyMissingBindConfigurationModule.BAD_CONF; - } catch (ExceptionInInitializerError e) { + @SuppressWarnings("unused") final Object o = MyMissingBindConfigurationModule.BAD_CONF; + } catch (final ExceptionInInitializerError e) { throw e.getCause(); } } @@ -210,12 +209,12 @@ public class TestConfigurationModule { // Here we set some configuration values. In true tang style, // you won't be able to set them more than once ConfigurationModule's // implementation is complete. - Configuration c = MultiBindConfigurationModule.CONF + final Configuration c = MultiBindConfigurationModule.CONF .set(MultiBindConfigurationModule.THE_FOO, FooImpl.class) .set(MultiBindConfigurationModule.FOO_NESS, "" + 12) .build(); - Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); - Foo g = (Foo) Tang.Factory.getTang().newInjector(c).getInstance(Object.class); + final Foo f = Tang.Factory.getTang().newInjector(c).getInstance(Foo.class); + final Foo g = (Foo) Tang.Factory.getTang().newInjector(c).getInstance(Object.class); Assert.assertEquals(f.getFooness(), 12); Assert.assertEquals(g.getFooness(), 12); Assert.assertFalse(f == g); @@ -229,7 +228,7 @@ public class TestConfigurationModule { try { // Pass in something from the wrong module, watch it fail. MultiBindConfigurationModule.CONF.set(MyConfigurationModule.THE_FOO, FooImpl.class); - } catch (ExceptionInInitializerError e) { + } catch (final ExceptionInInitializerError e) { throw e.getCause(); } } @@ -242,50 +241,50 @@ public class TestConfigurationModule { try { // Pass in something from the wrong module, watch it fail. new MyConfigurationModule().bindImplementation(Object.class, MultiBindConfigurationModule.THE_FOO); - } catch (ExceptionInInitializerError e) { + } catch (final ExceptionInInitializerError e) { throw e.getCause(); } } @Test public void singletonTest() throws BindException, InjectionException { - Configuration c = new MyConfigurationModule() + final Configuration c = new MyConfigurationModule() .bindImplementation(Foo.class, MyConfigurationModule.THE_FOO) .bindNamedParameter(Fooness.class, MyConfigurationModule.FOO_NESS) .build() .set(MyConfigurationModule.THE_FOO, FooImpl.class) .build(); - Injector i = Tang.Factory.getTang().newInjector(c); + final Injector i = Tang.Factory.getTang().newInjector(c); Assert.assertTrue(i.getInstance(Foo.class) == i.getInstance(Foo.class)); } @Test public void immutablilityTest() throws BindException, InjectionException { // builder methods return copies; the original module is immutable - ConfigurationModule builder1 = MyConfigurationModule.CONF + final ConfigurationModule builder1 = MyConfigurationModule.CONF .set(MyConfigurationModule.THE_FOO, FooImpl.class); Assert.assertFalse(builder1 == MyConfigurationModule.CONF); - Configuration config1 = builder1.build(); + final Configuration config1 = builder1.build(); // reusable - Configuration config2 = MyConfigurationModule.CONF + final Configuration config2 = MyConfigurationModule.CONF .set(MyConfigurationModule.THE_FOO, FooAltImpl.class) .build(); // instantiation of each just to be sure everything is fine in this situation - Injector i1 = Tang.Factory.getTang().newInjector(config1); - Injector i2 = Tang.Factory.getTang().newInjector(config2); + final Injector i1 = Tang.Factory.getTang().newInjector(config1); + final Injector i2 = Tang.Factory.getTang().newInjector(config2); Assert.assertEquals(42, i1.getInstance(Foo.class).getFooness()); Assert.assertEquals(7, i2.getInstance(Foo.class).getFooness()); } @Test public void setParamTest() throws BindException, InjectionException { - Configuration c = SetConfigurationModule.CONF + final Configuration c = SetConfigurationModule.CONF .set(SetConfigurationModule.P, "a") .set(SetConfigurationModule.P, "b") .build(); - Set<String> s = Tang.Factory.getTang().newInjector(c).getNamedInstance(SetName.class); + final Set<String> s = Tang.Factory.getTang().newInjector(c).getNamedInstance(SetName.class); Assert.assertEquals(s.size(), 2); Assert.assertTrue(s.contains("a")); Assert.assertTrue(s.contains("b")); @@ -293,14 +292,14 @@ public class TestConfigurationModule { @Test public void setClassTest() throws BindException, InjectionException { - Configuration c = SetClassConfigurationModule.CONF + final Configuration c = SetClassConfigurationModule.CONF .set(SetClassConfigurationModule.P, SubA.class) .set(SetClassConfigurationModule.P, SubB.class) .build(); - Set<Super> s = Tang.Factory.getTang().newInjector(c).getNamedInstance(SetClass.class); + final Set<Super> s = Tang.Factory.getTang().newInjector(c).getNamedInstance(SetClass.class); Assert.assertEquals(2, s.size()); boolean sawA = false, sawB = false; - for (Super sup : s) { + for (final Super sup : s) { if (sup instanceof SubA) { sawA = true; } else if (sup instanceof SubB) { @@ -314,16 +313,16 @@ public class TestConfigurationModule { @Test public void setClassRoundTripTest() throws BindException, InjectionException { - Configuration c = SetClassConfigurationModule.CONF + final Configuration c = SetClassConfigurationModule.CONF .set(SetClassConfigurationModule.P, SubA.class) .set(SetClassConfigurationModule.P, SubB.class) .build(); - ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); ConfigurationFile.addConfiguration(cb, ConfigurationFile.toConfigurationString(c)); - Set<Super> s = Tang.Factory.getTang().newInjector(cb.build()).getNamedInstance(SetClass.class); + final Set<Super> s = Tang.Factory.getTang().newInjector(cb.build()).getNamedInstance(SetClass.class); Assert.assertEquals(2, s.size()); boolean sawA = false, sawB = false; - for (Super sup : s) { + for (final Super sup : s) { if (sup instanceof SubA) { sawA = true; } else if (sup instanceof SubB) { @@ -342,7 +341,7 @@ public class TestConfigurationModule { @Test(expected = ClassHierarchyException.class) public void errorOnSetMerge() throws BindException, InjectionException { - ConfigurationModuleBuilder b = new ConfigurationModuleBuilder() { + final ConfigurationModuleBuilder b = new ConfigurationModuleBuilder() { }; b.merge(StaticTimeSet.CONF); } @@ -356,7 +355,7 @@ public class TestConfigurationModule { private final int fooness; @Inject - FooImpl(@Parameter(Fooness.class) int fooness) { + FooImpl(@Parameter(Fooness.class) final int fooness) { this.fooness = fooness; } @@ -370,7 +369,7 @@ public class TestConfigurationModule { private final int fooness; @Inject - FooAltImpl(@Parameter(Fooness.class) int fooness) { + FooAltImpl(@Parameter(Fooness.class) final int fooness) { this.fooness = fooness; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java index ed859a5..8df60ca 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java @@ -61,7 +61,7 @@ public class TestClassHierarchy { serializer = Tang.Factory.getTang().newInjector().getInstance(ClassHierarchySerializer.class); } - public String s(Class<?> c) { + public String s(final Class<?> c) { return ReflectionUtilities.getFullName(c); } @@ -71,28 +71,28 @@ public class TestClassHierarchy { Node n = null; try { n = ns.getNode("java"); - } catch (NameResolutionException e) { + } catch (final NameResolutionException e) { } Assert.assertNull(n); try { n = ns.getNode("java.lang"); - } catch (NameResolutionException e) { + } catch (final NameResolutionException e) { } Assert.assertNull(n); Assert.assertNotNull(ns.getNode("java.lang.String")); try { ns.getNode("com.microsoft"); Assert.fail("Didn't get expected exception"); - } catch (NameResolutionException e) { + } catch (final NameResolutionException e) { } } @Test public void testSimpleConstructors() throws NameResolutionException { - ClassNode<?> cls = (ClassNode<?>) ns.getNode(s(SimpleConstructors.class)); + final ClassNode<?> cls = (ClassNode<?>) ns.getNode(s(SimpleConstructors.class)); Assert.assertTrue(cls.getChildren().size() == 0); - ConstructorDef<?>[] def = cls.getInjectableConstructors(); + final ConstructorDef<?>[] def = cls.getInjectableConstructors(); Assert.assertEquals(3, def.length); } @@ -304,23 +304,23 @@ public class TestClassHierarchy { @Test public void testRoundTripInnerClassNames() throws ClassNotFoundException, NameResolutionException { - Node n = ns.getNode(s(Nested.Inner.class)); + final Node n = ns.getNode(s(Nested.Inner.class)); Class.forName(n.getFullName()); } @Test public void testRoundTripAnonInnerClassNames() throws ClassNotFoundException, NameResolutionException { - Node n = ns.getNode(s(AnonNested.x.getClass())); - Node m = ns.getNode(s(AnonNested.y.getClass())); + final Node n = ns.getNode(s(AnonNested.x.getClass())); + final Node m = ns.getNode(s(AnonNested.y.getClass())); Assert.assertNotSame(n.getFullName(), m.getFullName()); - Class<?> c = Class.forName(n.getFullName()); - Class<?> d = Class.forName(m.getFullName()); + final Class<?> c = Class.forName(n.getFullName()); + final Class<?> d = Class.forName(m.getFullName()); Assert.assertNotSame(c, d); } @Test public void testUnitIsInjectable() throws InjectionException, NameResolutionException { - ClassNode<?> n = (ClassNode<?>) ns.getNode(s(OuterUnitTH.class)); + final ClassNode<?> n = (ClassNode<?>) ns.getNode(s(OuterUnitTH.class)); Assert.assertTrue(n.isUnit()); Assert.assertTrue(n.isInjectionCandidate()); } @@ -394,21 +394,21 @@ class SimpleConstructors { } @Inject - public SimpleConstructors(int x) { + public SimpleConstructors(final int x) { } - public SimpleConstructors(String x) { + public SimpleConstructors(final String x) { } @Inject - public SimpleConstructors(int x, String y) { + public SimpleConstructors(final int x, final String y) { } } class NamedParameterConstructors { @Inject - public NamedParameterConstructors(String x, @Parameter(X.class) String y) { + public NamedParameterConstructors(final String x, @Parameter(X.class) final String y) { } @NamedParameter() @@ -418,7 +418,7 @@ class NamedParameterConstructors { class RepeatConstructorArg { @Inject - public RepeatConstructorArg(int x, int y) { + public RepeatConstructorArg(final int x, final int y) { } } @@ -427,7 +427,7 @@ class A { class RepeatConstructorArgClasses { @Inject - public RepeatConstructorArgClasses(A x, A y) { + public RepeatConstructorArgClasses(final A x, final A y) { } } @@ -445,7 +445,7 @@ class LeafRepeatedConstructorArgClasses { static class C { @Inject - C(A.AA a, B.AA b) { + C(final A.AA a, final B.AA b) { } } } @@ -460,15 +460,15 @@ class BB implements Name<A> { class NamedRepeatConstructorArgClasses { @Inject - public NamedRepeatConstructorArgClasses(@Parameter(AA.class) A x, - @Parameter(BB.class) A y) { + public NamedRepeatConstructorArgClasses(@Parameter(AA.class) final A x, + @Parameter(BB.class) final A y) { } } class DocumentedLocalNamedParameter { @Inject - public DocumentedLocalNamedParameter(@Parameter(Foo.class) String s) { + public DocumentedLocalNamedParameter(@Parameter(Foo.class) final String s) { } @NamedParameter(doc = "doc stuff", default_value = "some value") @@ -479,7 +479,7 @@ class DocumentedLocalNamedParameter { class NamedParameterTypeMismatch { @Inject - public NamedParameterTypeMismatch(@Parameter(Foo.class) String s) { + public NamedParameterTypeMismatch(@Parameter(Foo.class) final String s) { } @NamedParameter(doc = "doc.stuff", default_value = "1") @@ -512,7 +512,7 @@ class AnnotatedNameMultipleInterfaces implements Name<Object>, I1 { @NamedParameter() final class NameWithConstructor implements Name<Object> { - private NameWithConstructor(int i) { + private NameWithConstructor(final int i) { } } @@ -577,7 +577,7 @@ class GenericTorture12 implements Name<List<List<String>>> { class InjectNonStaticLocalArgClass { @Inject - InjectNonStaticLocalArgClass(NonStaticLocal x) { + InjectNonStaticLocalArgClass(final NonStaticLocal x) { } class NonStaticLocal { @@ -587,7 +587,7 @@ class InjectNonStaticLocalArgClass { class InjectNonStaticLocalType { class NonStaticLocal { @Inject - NonStaticLocal(NonStaticLocal x) { + NonStaticLocal(final NonStaticLocal x) { } } } @@ -655,6 +655,6 @@ class SomeName implements Name<Integer> { } class NonInjectableParam { - public NonInjectableParam(@Parameter(SomeName.class) int i) { + public NonInjectableParam(@Parameter(SomeName.class) final int i) { } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/TestClassHierarchyRoundTrip.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/TestClassHierarchyRoundTrip.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/TestClassHierarchyRoundTrip.java index 3b340f1..376d066 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/TestClassHierarchyRoundTrip.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/TestClassHierarchyRoundTrip.java @@ -44,7 +44,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { serializer.toFile(ns, file); ns = serializer.fromFile(file); file.delete(); - } catch (IOException e) { + } catch (final IOException e) { Assert.fail(String.format("IOException when serialize/deserialize the ClassHierarchy", e)); } } @@ -57,7 +57,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { serializer.toTextFile(ns, textFile); ns = serializer.fromTextFile(textFile); textFile.delete(); - } catch (IOException e) { + } catch (final IOException e) { Assert.fail(String.format("IOException when serialize/deserialize the ClassHierarchy", e)); } } @@ -67,7 +67,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { TangImpl.reset(); try { ns = serializer.fromByteArray(serializer.toByteArray(ns)); - } catch (IOException e) { + } catch (final IOException e) { Assert.fail(String.format("IOException when serialize/deserialize the ClassHierarchy", e)); } } @@ -77,7 +77,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { TangImpl.reset(); try { ns = serializer.fromString(serializer.toString(ns)); - } catch (IOException e) { + } catch (final IOException e) { Assert.fail(String.format("IOException when serialize/deserialize the ClassHierarchy", e)); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java index e644ebb..30ca285 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java @@ -50,7 +50,7 @@ public class TestConfigurationBuilder { private final String str; @Inject - NamedParamterNoDefault(@Parameter(NamedString.class) String str) { + NamedParamterNoDefault(@Parameter(NamedString.class) final String str) { this.str = str; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java index a521f47..5c97ab4 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java @@ -42,9 +42,9 @@ public class TestParameterParser { @Test public void testParameterParser() throws BindException { - ParameterParser p = new ParameterParser(); + final ParameterParser p = new ParameterParser(); p.addParser(FooParser.class); - Foo f = p.parse(Foo.class, "woot"); + final Foo f = p.parse(Foo.class, "woot"); Assert.assertEquals(f.s, "woot"); } @@ -52,35 +52,35 @@ public class TestParameterParser { public void testUnregisteredParameterParser() throws BindException { thrown.expect(UnsupportedOperationException.class); thrown.expectMessage("Don't know how to parse a org.apache.reef.tang.implementation.java.TestParameterParser$Foo"); - ParameterParser p = new ParameterParser(); + final ParameterParser p = new ParameterParser(); //p.addParser(FooParser.class); - Foo f = p.parse(Foo.class, "woot"); + final Foo f = p.parse(Foo.class, "woot"); Assert.assertEquals(f.s, "woot"); } @Test public void testReturnSubclass() throws BindException { - ParameterParser p = new ParameterParser(); + final ParameterParser p = new ParameterParser(); p.addParser(BarParser.class); - Bar f = (Bar) p.parse(Foo.class, "woot"); + final Bar f = (Bar) p.parse(Foo.class, "woot"); Assert.assertEquals(f.s, "woot"); } @Test public void testGoodMerge() throws BindException { - ParameterParser old = new ParameterParser(); + final ParameterParser old = new ParameterParser(); old.addParser(BarParser.class); - ParameterParser nw = new ParameterParser(); + final ParameterParser nw = new ParameterParser(); nw.mergeIn(old); nw.parse(Foo.class, "woot"); } @Test public void testGoodMerge2() throws BindException { - ParameterParser old = new ParameterParser(); + final ParameterParser old = new ParameterParser(); old.addParser(BarParser.class); - ParameterParser nw = new ParameterParser(); + final ParameterParser nw = new ParameterParser(); nw.addParser(BarParser.class); nw.mergeIn(old); nw.parse(Foo.class, "woot"); @@ -93,9 +93,9 @@ public class TestParameterParser { "org.apache.reef.tang.implementation.java.TestParameterParser$Foo I have a: " + "org.apache.reef.tang.implementation.java.TestParameterParser$FooParser the other instance has a: " + "org.apache.reef.tang.implementation.java.TestParameterParser$BarParser"); - ParameterParser old = new ParameterParser(); + final ParameterParser old = new ParameterParser(); old.addParser(BarParser.class); - ParameterParser nw = new ParameterParser(); + final ParameterParser nw = new ParameterParser(); nw.addParser(FooParser.class); nw.mergeIn(old); } @@ -103,24 +103,24 @@ public class TestParameterParser { @SuppressWarnings("unchecked") @Test public void testEndToEnd() throws BindException, InjectionException { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(BarParser.class); + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(BarParser.class); cb.bindNamedParameter(SomeNamedFoo.class, "hdfs://woot"); - ILikeBars ilb = tang.newInjector(cb.build()).getInstance(ILikeBars.class); + final ILikeBars ilb = tang.newInjector(cb.build()).getInstance(ILikeBars.class); Assert.assertNotNull(ilb); } @SuppressWarnings("unchecked") @Test public void testDelegatingParser() throws BindException, InjectionException, ClassNotFoundException { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(TypeParser.class); + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(TypeParser.class); JavaConfigurationBuilder cb2 = tang.newConfigurationBuilder(cb.build()); cb2.bind(ReflectionUtilities.getFullName(ParseName.class), "a"); - ParseableType t = tang.newInjector(cb2.build()).getNamedInstance(ParseName.class); + final ParseableType t = tang.newInjector(cb2.build()).getNamedInstance(ParseName.class); Assert.assertTrue(t instanceof ParseTypeA); cb2 = tang.newConfigurationBuilder(cb.build()); @@ -136,7 +136,7 @@ public class TestParameterParser { private final Foo foo; @Inject - public FooParser(String s) { + public FooParser(final String s) { this.foo = new Foo(s); } @@ -150,7 +150,7 @@ public class TestParameterParser { private final Bar bar; @Inject - public BarParser(String s) { + public BarParser(final String s) { this.bar = new Bar(s); } @@ -163,13 +163,13 @@ public class TestParameterParser { private static class Foo { public final String s; - public Foo(String s) { + public Foo(final String s) { this.s = s; } } private static class Bar extends Foo { - public Bar(String s) { + public Bar(final String s) { super(s); } } @@ -180,8 +180,8 @@ public class TestParameterParser { private static class ILikeBars { @Inject - ILikeBars(@Parameter(SomeNamedFoo.class) Foo bar) { - Bar b = (Bar) bar; + ILikeBars(@Parameter(SomeNamedFoo.class) final Foo bar) { + final Bar b = (Bar) bar; Assert.assertEquals(b.s, "hdfs://woot"); } } @@ -201,7 +201,7 @@ public class TestParameterParser { ParseableType instance; @Inject - public TypeParser(String s) { + public TypeParser(final String s) { if (s.equals("a")) { instance = new ParseTypeA(); } @@ -234,14 +234,14 @@ public class TestParameterParser { private static class NeedsA { @Inject - public NeedsA(@Parameter(ParseNameA.class) ParseableType a) { + public NeedsA(@Parameter(ParseNameA.class) final ParseableType a) { Assert.assertTrue(a instanceof ParseTypeA); } } private static class NeedsB { @Inject - public NeedsB(@Parameter(ParseNameB.class) ParseTypeB b) { + public NeedsB(@Parameter(ParseNameB.class) final ParseTypeB b) { Assert.assertTrue(b instanceof ParseTypeB); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java index 18b6e86..d3f83b4 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java @@ -34,7 +34,7 @@ final class AnInterfaceImplementation implements AnInterface { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -42,7 +42,7 @@ final class AnInterfaceImplementation implements AnInterface { return false; } - AnInterfaceImplementation that = (AnInterfaceImplementation) o; + final AnInterfaceImplementation that = (AnInterfaceImplementation) o; if (aMagicNumber != that.aMagicNumber) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java index 4e2789a..a19c7e3 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java @@ -35,7 +35,7 @@ final class CyclicDependency { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -43,7 +43,7 @@ final class CyclicDependency { return false; } - CyclicDependency that = (CyclicDependency) o; + final CyclicDependency that = (CyclicDependency) o; if (!one.equals(that.one)) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java index 1c56a6e..370efde 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java @@ -32,7 +32,7 @@ final class CyclicDependencyClassOne { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -40,7 +40,7 @@ final class CyclicDependencyClassOne { return false; } - CyclicDependencyClassOne that = (CyclicDependencyClassOne) o; + final CyclicDependencyClassOne that = (CyclicDependencyClassOne) o; if (!other.equals(that.other)) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java index 8823f97..b7f6e5f 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java @@ -29,12 +29,12 @@ final class CyclicDependencyClassTwo { private final InjectionFuture<CyclicDependencyClassOne> other; @Inject - CyclicDependencyClassTwo(InjectionFuture<CyclicDependencyClassOne> other) { + CyclicDependencyClassTwo(final InjectionFuture<CyclicDependencyClassOne> other) { this.other = other; } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java index c0e9392..d4f863f 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java @@ -29,7 +29,7 @@ final class InjectableClass { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -37,7 +37,7 @@ final class InjectableClass { return false; } - InjectableClass that = (InjectableClass) o; + final InjectableClass that = (InjectableClass) o; if (magicNumber != that.magicNumber) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplOne.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplOne.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplOne.java index e494aef..5a71538 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplOne.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplOne.java @@ -34,13 +34,13 @@ public class ListInterfaceImplOne implements ListInterface { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } else if (obj == null || obj.getClass() != getClass()) { return false; } else { - ListInterfaceImplOne one = (ListInterfaceImplOne) obj; + final ListInterfaceImplOne one = (ListInterfaceImplOne) obj; if (one.magicNumber != magicNumber) { return false; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplTwo.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplTwo.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplTwo.java index 0024c1b..2781a4c 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplTwo.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListInterfaceImplTwo.java @@ -33,13 +33,13 @@ public class ListInterfaceImplTwo implements ListInterface { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } else if (obj == null || obj.getClass() != getClass()) { return false; } else { - ListInterfaceImplTwo two = (ListInterfaceImplTwo) obj; + final ListInterfaceImplTwo two = (ListInterfaceImplTwo) obj; if (Double.compare(two.magicNumber, magicNumber) != 0) { return false; } @@ -49,7 +49,7 @@ public class ListInterfaceImplTwo implements ListInterface { @Override public int hashCode() { - long temp = Double.doubleToLongBits(magicNumber); + final long temp = Double.doubleToLongBits(magicNumber); return (int) (temp ^ (temp >>> 32)); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java index b93ead5..dedc3d9 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java @@ -43,7 +43,7 @@ final class ListOfBaseTypes { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -51,7 +51,7 @@ final class ListOfBaseTypes { return false; } - ListOfBaseTypes that = (ListOfBaseTypes) o; + final ListOfBaseTypes that = (ListOfBaseTypes) o; if (!doubles.equals(that.doubles)) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java index fb8e826..651f12f 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java @@ -33,7 +33,7 @@ public class ListOfImplementations { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -41,7 +41,7 @@ public class ListOfImplementations { return false; } - ListOfImplementations that = (ListOfImplementations) o; + final ListOfImplementations that = (ListOfImplementations) o; if (!theInstances.equals(that.theInstances)) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java index efd4c07..72d14ba 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java @@ -49,7 +49,7 @@ final class RootImplementation implements RootInterface { @Parameter(TestConfiguration.StringHandler.class) final Handler<String> stringHandler, @Parameter(TestConfiguration.IntegerHandler.class) final Handler<Integer> integerHandler, @Parameter(TestConfiguration.NamedParameterInteger.class) final int anInt, - @Parameter(TestConfiguration.NamedParameterDouble.class) double aDouble, + @Parameter(TestConfiguration.NamedParameterDouble.class) final double aDouble, final UnitClass unit, final AnInterface anInterface, final InjectableClass injectableClass, @@ -57,7 +57,7 @@ final class RootImplementation implements RootInterface { final SetOfBaseTypes setOfBaseTypes, final ListOfImplementations listOfImplementations, final ListOfBaseTypes listOfBaseTypes, - CyclicDependency cyclicDependency) { + final CyclicDependency cyclicDependency) { this.requiredString = requiredString; this.optionalString = optionalString; this.unit = unit; @@ -114,7 +114,7 @@ final class RootImplementation implements RootInterface { @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -122,7 +122,7 @@ final class RootImplementation implements RootInterface { return false; } - RootImplementation that = (RootImplementation) o; + final RootImplementation that = (RootImplementation) o; if (Double.compare(that.aDouble, aDouble) != 0) { return false; @@ -175,7 +175,7 @@ final class RootImplementation implements RootInterface { @Override public int hashCode() { int result; - long temp; + final long temp; result = requiredString != null ? requiredString.hashCode() : 0; result = 31 * result + (optionalString != null ? optionalString.hashCode() : 0); result = 31 * result + (unit != null ? unit.hashCode() : 0); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java index cc2a474..1f38947 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java @@ -49,13 +49,13 @@ public class RootImplementationWithoutList implements RootInterface { @Parameter(TestConfigurationWithoutList.StringHandler.class) final Handler<String> stringHandler, @Parameter(TestConfigurationWithoutList.IntegerHandler.class) final Handler<Integer> integerHandler, @Parameter(TestConfigurationWithoutList.NamedParameterInteger.class) final int anInt, - @Parameter(TestConfigurationWithoutList.NamedParameterDouble.class) double aDouble, + @Parameter(TestConfigurationWithoutList.NamedParameterDouble.class) final double aDouble, final UnitClass unit, final AnInterface anInterface, final InjectableClass injectableClass, final SetOfImplementations setOfImplementations, final SetOfBaseTypes setOfBaseTypes, - CyclicDependency cyclicDependency) { + final CyclicDependency cyclicDependency) { this.requiredString = requiredString; this.optionalString = optionalString; @@ -108,7 +108,7 @@ public class RootImplementationWithoutList implements RootInterface { @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -116,7 +116,7 @@ public class RootImplementationWithoutList implements RootInterface { return false; } - RootImplementationWithoutList that = (RootImplementationWithoutList) o; + final RootImplementationWithoutList that = (RootImplementationWithoutList) o; if (Double.compare(that.aDouble, aDouble) != 0) { return false; @@ -162,7 +162,7 @@ public class RootImplementationWithoutList implements RootInterface { @Override public int hashCode() { int result; - long temp; + final long temp; result = requiredString != null ? requiredString.hashCode() : 0; result = 31 * result + (optionalString != null ? optionalString.hashCode() : 0); result = 31 * result + (unit != null ? unit.hashCode() : 0); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java index 8bef85c..067b50d 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java @@ -38,7 +38,7 @@ final class SetInterfaceImplOne implements SetInterface { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -46,7 +46,7 @@ final class SetInterfaceImplOne implements SetInterface { return false; } - SetInterfaceImplOne that = (SetInterfaceImplOne) o; + final SetInterfaceImplOne that = (SetInterfaceImplOne) o; if (magicNumber != that.magicNumber) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java index fb0c14e..2174a50 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java @@ -35,7 +35,7 @@ final class SetInterfaceImplTwo implements SetInterface { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -43,7 +43,7 @@ final class SetInterfaceImplTwo implements SetInterface { return false; } - SetInterfaceImplTwo that = (SetInterfaceImplTwo) o; + final SetInterfaceImplTwo that = (SetInterfaceImplTwo) o; if (Double.compare(that.magicNumber, magicNumber) != 0) { return false; @@ -54,7 +54,7 @@ final class SetInterfaceImplTwo implements SetInterface { @Override public int hashCode() { - long temp = Double.doubleToLongBits(magicNumber); + final long temp = Double.doubleToLongBits(magicNumber); return (int) (temp ^ (temp >>> 32)); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java index fa405c0..5b3c93e 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java @@ -46,7 +46,7 @@ final class SetOfBaseTypes { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -54,7 +54,7 @@ final class SetOfBaseTypes { return false; } - SetOfBaseTypes that = (SetOfBaseTypes) o; + final SetOfBaseTypes that = (SetOfBaseTypes) o; if (!doubles.equals(that.doubles)) { return false; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java index 75b067f..034d1e3 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java @@ -33,7 +33,7 @@ final class SetOfImplementations { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -41,7 +41,7 @@ final class SetOfImplementations { return false; } - SetOfImplementations that = (SetOfImplementations) o; + final SetOfImplementations that = (SetOfImplementations) o; if (!theInstances.equals(that.theInstances)) { return false;
