diff options
author | ronshapiro <ronshapiro@google.com> | 2016-02-11 11:46:44 -0800 |
---|---|---|
committer | cgruber <cgruber@google.com> | 2016-03-04 10:57:18 -0800 |
commit | 5cffa70d9b4eabf804288466e1a4caae827feb8a (patch) | |
tree | e1de7d8373e4d9ba1c369ac05f72845065f5dc24 /factory/src/test | |
parent | e617667fc0a6431961b39a0ed23c69883311ba81 (diff) | |
download | auto-5cffa70d9b4eabf804288466e1a4caae827feb8a.tar.gz |
Convert @AutoFactory to use JavaPoet.
In the process, convert all value types to @AutoValue to allow for an easier transition for later implementing the passing of annotations to generated factories.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=114460941
Diffstat (limited to 'factory/src/test')
21 files changed, 125 insertions, 69 deletions
diff --git a/factory/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java b/factory/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java index 802b1278..870992ea 100644 --- a/factory/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java +++ b/factory/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java @@ -19,7 +19,10 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class ClassUsingQualifierWithArgsFactory { private final Provider<String> providedDepAProvider; diff --git a/factory/src/test/resources/expected/ConstructorAnnotatedFactory.java b/factory/src/test/resources/expected/ConstructorAnnotatedFactory.java index 741d4190..3c393bd7 100644 --- a/factory/src/test/resources/expected/ConstructorAnnotatedFactory.java +++ b/factory/src/test/resources/expected/ConstructorAnnotatedFactory.java @@ -19,26 +19,29 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class ConstructorAnnotatedFactory { private final Provider<Object> objProvider; - + @Inject ConstructorAnnotatedFactory(Provider<Object> objProvider) { this.objProvider = objProvider; } - + ConstructorAnnotated create() { return new ConstructorAnnotated(); } - + ConstructorAnnotated create(String s) { return new ConstructorAnnotated(s); } - + ConstructorAnnotated create(int i) { return new ConstructorAnnotated(objProvider.get(), i); } - + ConstructorAnnotated create(char c) { return new ConstructorAnnotated(objProvider.get(), c); } diff --git a/factory/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java b/factory/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java index e5017abd..bcbfdd54 100644 --- a/factory/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java +++ b/factory/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java @@ -19,10 +19,13 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) class ConstructorAnnotatedNonFinalFactory { private final Provider<Object> objProvider; - + @Inject ConstructorAnnotatedNonFinalFactory(Provider<Object> objProvider) { this.objProvider = objProvider; } @@ -34,11 +37,11 @@ class ConstructorAnnotatedNonFinalFactory { ConstructorAnnotatedNonFinal create(String s) { return new ConstructorAnnotatedNonFinal(s); } - + ConstructorAnnotatedNonFinal create(int i) { return new ConstructorAnnotatedNonFinal(objProvider.get(), i); } - + ConstructorAnnotatedNonFinal create(char c) { return new ConstructorAnnotatedNonFinal(objProvider.get(), c); } diff --git a/factory/src/test/resources/expected/CustomNamedFactory.java b/factory/src/test/resources/expected/CustomNamedFactory.java index 01f3ac1b..965bfb1b 100644 --- a/factory/src/test/resources/expected/CustomNamedFactory.java +++ b/factory/src/test/resources/expected/CustomNamedFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class CustomNamedFactory { @Inject CustomNamedFactory() {} - + SimpleClass create() { return new SimpleClass(); } diff --git a/factory/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java b/factory/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java index 119bb57f..899abcd5 100644 --- a/factory/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java +++ b/factory/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class FactoryExtendingAbstractClassFactory extends FactoryExtendingAbstractClass.AbstractFactory { @Inject FactoryExtendingAbstractClassFactory() {} - + FactoryExtendingAbstractClass create() { return new FactoryExtendingAbstractClass(); } diff --git a/factory/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java b/factory/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java index 3c5ffc32..02905a4c 100644 --- a/factory/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java +++ b/factory/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java @@ -17,15 +17,17 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -import tests.FactoryImplementingCreateMethod.FactoryInterfaceWithCreateMethod; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") -public final class FactoryImplementingCreateMethod_ConcreteClassFactory implements - FactoryInterfaceWithCreateMethod { +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) +public final class FactoryImplementingCreateMethod_ConcreteClassFactory + implements FactoryImplementingCreateMethod.FactoryInterfaceWithCreateMethod { @Inject public FactoryImplementingCreateMethod_ConcreteClassFactory() {} - + public FactoryImplementingCreateMethod.ConcreteClass create() { return new FactoryImplementingCreateMethod.ConcreteClass(); } diff --git a/factory/src/test/resources/expected/FactoryImplementingGenericInterfaceExtension.java b/factory/src/test/resources/expected/FactoryImplementingGenericInterfaceExtension.java index 3c4d5572..50b5aa9d 100644 --- a/factory/src/test/resources/expected/FactoryImplementingGenericInterfaceExtension.java +++ b/factory/src/test/resources/expected/FactoryImplementingGenericInterfaceExtension.java @@ -19,11 +19,12 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -import tests.FactoryImplementingGenericInterfaceExtension.MyFactory; - -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class FactoryImplementingGenericInterfaceExtensionFactory - implements MyFactory { + implements FactoryImplementingGenericInterfaceExtension.MyFactory { private final Provider<String> sProvider; @Inject FactoryImplementingGenericInterfaceExtensionFactory(Provider<String> sProvider) { diff --git a/factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java b/factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java index fc3a8936..82a9297b 100644 --- a/factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java +++ b/factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java @@ -19,36 +19,35 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -import tests.MixedDepsImplementingInterfaces.FromInt; -import tests.MixedDepsImplementingInterfaces.FromObject; -import tests.MixedDepsImplementingInterfaces.MarkerA; -import tests.MixedDepsImplementingInterfaces.MarkerB; - /** * @author Gregory Kick */ -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class MixedDepsImplementingInterfacesFactory - implements FromInt, FromObject, MarkerA, MarkerB { + implements MixedDepsImplementingInterfaces.FromInt, MixedDepsImplementingInterfaces.FromObject, + MixedDepsImplementingInterfaces.MarkerA, MixedDepsImplementingInterfaces.MarkerB { private final Provider<String> sProvider; - + @Inject MixedDepsImplementingInterfacesFactory(Provider<String> sProvider) { this.sProvider = sProvider; } - + MixedDepsImplementingInterfaces create(int i) { return new MixedDepsImplementingInterfaces(sProvider.get(), i); } - + MixedDepsImplementingInterfaces create(Object o) { return new MixedDepsImplementingInterfaces(o); } - + @Override public MixedDepsImplementingInterfaces fromInt(int i) { return create(i); } - + @Override public MixedDepsImplementingInterfaces fromObject(Object o) { return create(o); } -}
\ No newline at end of file +} diff --git a/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java b/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java index 33fd6e12..ceb450b5 100644 --- a/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java +++ b/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java @@ -17,10 +17,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -import tests.MultipleFactoriesImplementingInterface.Base.Factory; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") -final class MultipleFactoriesImplementingInterface_ClassAFactory implements Factory { +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) +final class MultipleFactoriesImplementingInterface_ClassAFactory + implements MultipleFactoriesImplementingInterface.Base.Factory { @Inject MultipleFactoriesImplementingInterface_ClassAFactory() {} diff --git a/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java b/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java index 077c4224..ed20a912 100644 --- a/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java +++ b/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java @@ -17,10 +17,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -import tests.MultipleFactoriesImplementingInterface.Base.Factory; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") -final class MultipleFactoriesImplementingInterface_ClassBFactory implements Factory { +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) +final class MultipleFactoriesImplementingInterface_ClassBFactory + implements MultipleFactoriesImplementingInterface.Base.Factory { @Inject MultipleFactoriesImplementingInterface_ClassBFactory() {} diff --git a/factory/src/test/resources/expected/NestedClasses_CustomNamedFactory.java b/factory/src/test/resources/expected/NestedClasses_CustomNamedFactory.java index ccf23100..0859e2c8 100644 --- a/factory/src/test/resources/expected/NestedClasses_CustomNamedFactory.java +++ b/factory/src/test/resources/expected/NestedClasses_CustomNamedFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class NestedClasses_CustomNamedFactory { @Inject NestedClasses_CustomNamedFactory() {} - + NestedClasses.SimpleNestedClassWithCustomFactory create() { return new NestedClasses.SimpleNestedClassWithCustomFactory(); } diff --git a/factory/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java b/factory/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java index 21a96199..2c2b5340 100644 --- a/factory/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java +++ b/factory/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class NestedClasses_SimpleNestedClassFactory { @Inject NestedClasses_SimpleNestedClassFactory() {} - + NestedClasses.SimpleNestedClass create() { return new NestedClasses.SimpleNestedClass(); } diff --git a/factory/src/test/resources/expected/PublicClassFactory.java b/factory/src/test/resources/expected/PublicClassFactory.java index 20aa41bf..a2e091bd 100644 --- a/factory/src/test/resources/expected/PublicClassFactory.java +++ b/factory/src/test/resources/expected/PublicClassFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) public final class PublicClassFactory { @Inject public PublicClassFactory() {} - + public PublicClass create() { return new PublicClass(); } diff --git a/factory/src/test/resources/expected/SimpleClassFactory.java b/factory/src/test/resources/expected/SimpleClassFactory.java index 0400be24..7900935c 100644 --- a/factory/src/test/resources/expected/SimpleClassFactory.java +++ b/factory/src/test/resources/expected/SimpleClassFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class SimpleClassFactory { @Inject SimpleClassFactory() {} - + SimpleClass create() { return new SimpleClass(); } diff --git a/factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java b/factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java index 561d6109..8029e7ff 100644 --- a/factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java +++ b/factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java @@ -15,14 +15,17 @@ */ package tests; +import java.util.RandomAccess; import javax.annotation.Generated; import javax.inject.Inject; -import java.util.RandomAccess; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class SimpleClassImplementingMarkerFactory implements RandomAccess { @Inject SimpleClassImplementingMarkerFactory() {} - + SimpleClassImplementingMarker create() { return new SimpleClassImplementingMarker(); } diff --git a/factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java b/factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java index bc9568df..26ace62f 100644 --- a/factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java +++ b/factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java @@ -17,12 +17,15 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -import tests.SimpleClassImplementingSimpleInterface.SimpleInterface; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") -final class SimpleClassImplementingSimpleInterfaceFactory implements SimpleInterface { +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) +final class SimpleClassImplementingSimpleInterfaceFactory + implements SimpleClassImplementingSimpleInterface.SimpleInterface { @Inject SimpleClassImplementingSimpleInterfaceFactory() {} - + SimpleClassImplementingSimpleInterface create() { return new SimpleClassImplementingSimpleInterface(); } diff --git a/factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java b/factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java index 4658e54a..5d84d024 100644 --- a/factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java +++ b/factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java @@ -19,15 +19,18 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class SimpleClassMixedDepsFactory { private final Provider<String> providedDepAProvider; - + @Inject SimpleClassMixedDepsFactory( @AQualifier Provider<String> providedDepAProvider) { this.providedDepAProvider = providedDepAProvider; } - + SimpleClassMixedDeps create(String depB) { return new SimpleClassMixedDeps(providedDepAProvider.get(), depB); } diff --git a/factory/src/test/resources/expected/SimpleClassNonFinalFactory.java b/factory/src/test/resources/expected/SimpleClassNonFinalFactory.java index ec5c8fb8..853382ff 100644 --- a/factory/src/test/resources/expected/SimpleClassNonFinalFactory.java +++ b/factory/src/test/resources/expected/SimpleClassNonFinalFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) class SimpleClassNonFinalFactory { @Inject SimpleClassNonFinalFactory() {} - + SimpleClassNonFinal create() { return new SimpleClassNonFinal(); } diff --git a/factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java b/factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java index d9888a5b..b944fd5e 100644 --- a/factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java +++ b/factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java @@ -18,10 +18,13 @@ package tests; import javax.annotation.Generated; import javax.inject.Inject; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class SimpleClassPassedDepsFactory { @Inject SimpleClassPassedDepsFactory() {} - + SimpleClassPassedDeps create(String depA, String depB) { return new SimpleClassPassedDeps(depA, depB); } diff --git a/factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java b/factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java index e35d2f7e..d2959657 100644 --- a/factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java +++ b/factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java @@ -19,13 +19,16 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class SimpleClassProvidedDepsFactory { private final Provider<Integer> providedPrimitiveAProvider; private final Provider<Integer> providedPrimitiveBProvider; private final Provider<String> providedDepAProvider; private final Provider<String> providedDepBProvider; - + @Inject SimpleClassProvidedDepsFactory( @AQualifier Provider<Integer> providedPrimitiveAProvider, @@ -37,7 +40,7 @@ final class SimpleClassProvidedDepsFactory { this.providedDepAProvider = providedDepAProvider; this.providedDepBProvider = providedDepBProvider; } - + SimpleClassProvidedDeps create() { return new SimpleClassProvidedDeps( providedPrimitiveAProvider.get(), diff --git a/factory/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java b/factory/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java index a2399e8f..5e83d15d 100644 --- a/factory/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java +++ b/factory/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java @@ -19,7 +19,10 @@ import javax.annotation.Generated; import javax.inject.Inject; import javax.inject.Provider; -@Generated("com.google.auto.factory.processor.AutoFactoryProcessor") +@Generated( + value = "com.google.auto.factory.processor.AutoFactoryProcessor", + comments = "https://github.com/google/auto/tree/master/factory" +) final class SimpleClassProvidedProviderDepsFactory { private final Provider<String> providedDepAProvider; private final Provider<String> providedDepBProvider; |