diff options
Diffstat (limited to 'javatests/dagger/internal/codegen')
109 files changed, 335 insertions, 328 deletions
diff --git a/javatests/dagger/internal/codegen/FrameworkFieldTest.java b/javatests/dagger/internal/codegen/FrameworkFieldTest.java index be495d79b..ba5b88f8c 100644 --- a/javatests/dagger/internal/codegen/FrameworkFieldTest.java +++ b/javatests/dagger/internal/codegen/FrameworkFieldTest.java @@ -24,6 +24,7 @@ import static dagger.internal.codegen.javapoet.TypeNames.providerOf; import com.google.testing.compile.CompilationRule; import com.squareup.javapoet.ClassName; +import com.squareup.javapoet.ParameterizedTypeName; import dagger.internal.codegen.binding.FrameworkField; import javax.inject.Inject; import org.junit.Before; @@ -47,16 +48,20 @@ public class FrameworkFieldTest { } @Test public void frameworkType() { - assertThat(FrameworkField.create(PROVIDER, xTypeName, "test").type()) + assertThat(FrameworkField.create(ParameterizedTypeName.get(PROVIDER, xTypeName), "test").type()) .isEqualTo(providerOf(xTypeName)); - assertThat(FrameworkField.create(MEMBERS_INJECTOR, xTypeName, "test").type()) + assertThat( + FrameworkField.create(ParameterizedTypeName.get(MEMBERS_INJECTOR, xTypeName), "test") + .type()) .isEqualTo(membersInjectorOf(xTypeName)); } @Test public void nameSuffix() { - assertThat(FrameworkField.create(PROVIDER, xTypeName, "foo").name()) + assertThat(FrameworkField.create(ParameterizedTypeName.get(PROVIDER, xTypeName), "foo").name()) .isEqualTo("fooProvider"); - assertThat(FrameworkField.create(PROVIDER, xTypeName, "fooProvider").name()) + assertThat( + FrameworkField.create(ParameterizedTypeName.get(PROVIDER, xTypeName), "fooProvider") + .name()) .isEqualTo("fooProvider"); } diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent index 20f38ddd0..1dc3731de 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_DEFAULT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooProvider = Foo_Factory.create(Bar_Factory.create()); - this.fooFactoryProvider = FooFactory_Impl.create(fooProvider); + this.fooFactoryProvider = FooFactory_Impl.createFactoryProvider(fooProvider); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent index c76a5fbdd..2b7fd7dd9 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,9 +1,9 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent index 7b22b0018..5e232098e 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -57,7 +57,7 @@ final class DaggerTestComponent { this.fooFactoryProvider = new DelegateFactory<>(); this.barProvider = Bar_Factory.create(fooFactoryProvider); this.fooProvider = Foo_Factory.create(barProvider); - DelegateFactory.setDelegate(fooFactoryProvider, FooFactory_Impl.create(fooProvider)); + DelegateFactory.setDelegate(fooFactoryProvider, FooFactory_Impl.createFactoryProvider(fooProvider)); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent index 48f517401..9d274ee88 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactoryCycle_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent index 20f38ddd0..1dc3731de 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_DEFAULT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooProvider = Foo_Factory.create(Bar_Factory.create()); - this.fooFactoryProvider = FooFactory_Impl.create(fooProvider); + this.fooFactoryProvider = FooFactory_Impl.createFactoryProvider(fooProvider); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent index 72f16729c..dad9b81cc 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testAssistedFactory_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,9 +1,9 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent index 4e5de7ad7..8c3febe03 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_DEFAULT_MODE_test.DaggerMyComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -55,7 +55,7 @@ final class DaggerMyComponent { @SuppressWarnings("unchecked") private void initialize() { this.myAssistedClassProvider = MyAssistedClass_Factory.create(Baz_Factory.create()); - this.mySubcomponentAssistedFactoryProvider = MySubcomponentAssistedFactory_Impl.create(myAssistedClassProvider); + this.mySubcomponentAssistedFactoryProvider = MySubcomponentAssistedFactory_Impl.createFactoryProvider(myAssistedClassProvider); } @Override @@ -80,7 +80,7 @@ final class DaggerMyComponent { @SuppressWarnings("unchecked") private void initialize() { this.myAssistedClassProvider = MyAssistedClass_Factory.create(Baz_Factory.create()); - this.myComponentAssistedFactoryProvider = MyComponentAssistedFactory_Impl.create(myAssistedClassProvider); + this.myComponentAssistedFactoryProvider = MyComponentAssistedFactory_Impl.createFactoryProvider(myAssistedClassProvider); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent index 315ebc43c..c3ff04960 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testMultipleAssistedFactoryInDifferentComponents_FAST_INIT_MODE_test.DaggerMyComponent @@ -1,9 +1,9 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent index da1f53e75..49ca94f50 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_DEFAULT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -52,7 +52,7 @@ final class DaggerTestComponent { @SuppressWarnings("unchecked") private void initialize() { this.fooProvider = Foo_Factory.create(); - this.fooFactoryProvider = FooFactory_Impl.create(fooProvider); + this.fooFactoryProvider = FooFactory_Impl.createFactoryProvider(fooProvider); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent index a56b3e084..1c1014d01 100644 --- a/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_testParameterizedAssistParam_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,9 +1,9 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent index a3127fbf0..907c44dc0 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_DEFAULT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent index bb09e8b6e..a6dcfd18b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_arrayComponentDependency_FAST_INIT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent index eb9476a7b..9d190e568 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_DEFAULT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent index 7a97ba515..a287b3a0e 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentDependency_FAST_INIT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent index e32f689d6..93991fa36 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_DEFAULT_MODE_test.DaggerSimpleComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.InstanceFactory; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -59,7 +59,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SimpleComponent> selfProvider() { + public javax.inject.Provider<SimpleComponent> selfProvider() { return simpleComponentProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent index 4f9289e45..8e3e2692f 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentInjection_FAST_INIT_MODE_test.DaggerSimpleComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.InstanceFactory; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -59,7 +59,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SimpleComponent> selfProvider() { + public javax.inject.Provider<SimpleComponent> selfProvider() { return simpleComponentProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent index 1d5bc09cb..0f527b83b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_DEFAULT_MODE_test.DaggerParent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent index af0cdb92e..b64571460 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentMethodInChildCallsComponentMethodInParent_FAST_INIT_MODE_test.DaggerParent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent index 76f413869..227861301 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_DEFAULT_MODE_test.DaggerSimpleComponent @@ -3,8 +3,8 @@ package test; import dagger.Lazy; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -65,7 +65,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SomeInjectableType> someInjectableTypeProvider() { + public javax.inject.Provider<SomeInjectableType> someInjectableTypeProvider() { return someInjectableTypeProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent index 20d695da5..c639d30f5 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_componentWithScope_FAST_INIT_MODE_test.DaggerSimpleComponent @@ -3,8 +3,8 @@ package test; import dagger.Lazy; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -65,7 +65,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SomeInjectableType> someInjectableTypeProvider() { + public javax.inject.Provider<SomeInjectableType> someInjectableTypeProvider() { return someInjectableTypeProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent index b8284979d..5c703f1e1 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_DEFAULT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import pkg1.A; import pkg1.AComponent; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent index 99a7e4271..0cb77ec60 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_dependencyNameCollision_FAST_INIT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import pkg1.A; import pkg1.AComponent; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent index 755b402f9..6e03f68ec 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_DEFAULT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent index 6ce1e2451..b4d65253a 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_primitiveComponentDependency_FAST_INIT_MODE_test.DaggerBComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent index f26d8a5bb..43e67a221 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_DEFAULT_MODE_test.DaggerParent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent index 5edc873ff..a63363616 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_privateMethodUsedOnlyInChildDoesNotUseQualifiedThis_FAST_INIT_MODE_test.DaggerParent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent index 19c4c90bf..3f46d70e6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_DEFAULT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent index 0af158555..f7fb49313 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_providerComponentType_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent index d92a70e85..76ff2823e 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerSimpleComponent @@ -3,8 +3,8 @@ package test; import dagger.Lazy; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -65,7 +65,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SomeInjectableType> someInjectableTypeProvider() { + public javax.inject.Provider<SomeInjectableType> someInjectableTypeProvider() { return someInjectableTypeProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent index 98c9ea783..a67f5e29b 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import test.sub.TestComponentBase_Dep_Factory; import test.sub.TestComponentBase_ProtectedType_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent index 441b713d4..7efcca34d 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentProtectedTypeTest_componentAccessesProtectedType_succeeds_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import test.sub.TestComponentBase_Dep_Factory; import test.sub.TestComponentBase_ProtectedType_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent index 78ff25e66..5745e81c9 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_DEFAULT_MODE_test.DaggerTestComponent @@ -2,10 +2,10 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import dagger.internal.SetFactory; import java.util.Set; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -72,7 +72,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> dependsOnMultibinding() { + public javax.inject.Provider<Object> dependsOnMultibinding() { return reliesOnMultibindingProvider; } } @@ -99,7 +99,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> dependsOnMultibinding() { + public javax.inject.Provider<Object> dependsOnMultibinding() { return reliesOnMultibindingProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent index 5eb16adf8..11e09d156 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentRequirementFieldTest_componentRequirementNeededInFactoryCreationOfSubcomponent_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableSet; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Set; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -73,7 +73,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> dependsOnMultibinding() { + public javax.inject.Provider<Object> dependsOnMultibinding() { return reliesOnMultibindingProvider; } @@ -127,7 +127,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> dependsOnMultibinding() { + public javax.inject.Provider<Object> dependsOnMultibinding() { return reliesOnMultibindingProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent index d5a2af096..3aa359ea8 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent @@ -3,8 +3,8 @@ package dagger.internal.codegen; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -81,17 +81,17 @@ final class DaggerTestComponent { } @Override - public Provider<Binding1> providerBinding1() { + public javax.inject.Provider<Binding1> providerBinding1() { return binding1Provider; } @Override - public Provider<Binding2> providerBinding2() { + public javax.inject.Provider<Binding2> providerBinding2() { return binding2Provider; } @Override - public Provider<Binding3> providerBinding3() { + public javax.inject.Provider<Binding3> providerBinding3() { return testComponentImpl.testComponentImplShard.binding3Provider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent index e09bb44be..42805ad73 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreatedWithDependencies_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent @@ -3,8 +3,8 @@ package dagger.internal.codegen; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; import dagger.internal.Preconditions; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -81,17 +81,17 @@ final class DaggerTestComponent { } @Override - public Provider<Binding1> providerBinding1() { + public javax.inject.Provider<Binding1> providerBinding1() { return binding1Provider; } @Override - public Provider<Binding2> providerBinding2() { + public javax.inject.Provider<Binding2> providerBinding2() { return binding2Provider; } @Override - public Provider<Binding3> providerBinding3() { + public javax.inject.Provider<Binding3> providerBinding3() { return testComponentImpl.testComponentImplShard.binding3Provider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent index de033d5dc..d72266523 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent @@ -3,8 +3,8 @@ package dagger.internal.codegen; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -98,37 +98,37 @@ final class DaggerTestComponent { } @Override - public Provider<Binding1> providerBinding1() { + public javax.inject.Provider<Binding1> providerBinding1() { return testComponentImpl.testComponentImplShard2.binding1Provider; } @Override - public Provider<Binding2> providerBinding2() { + public javax.inject.Provider<Binding2> providerBinding2() { return testComponentImpl.testComponentImplShard.binding2Provider; } @Override - public Provider<Binding3> providerBinding3() { + public javax.inject.Provider<Binding3> providerBinding3() { return testComponentImpl.testComponentImplShard.binding3Provider; } @Override - public Provider<Binding4> providerBinding4() { + public javax.inject.Provider<Binding4> providerBinding4() { return testComponentImpl.testComponentImplShard.binding4Provider; } @Override - public Provider<Binding5> providerBinding5() { + public javax.inject.Provider<Binding5> providerBinding5() { return testComponentImpl.testComponentImplShard.binding5Provider; } @Override - public Provider<Binding6> providerBinding6() { + public javax.inject.Provider<Binding6> providerBinding6() { return binding6Provider; } @Override - public Provider<Binding7> providerBinding7() { + public javax.inject.Provider<Binding7> providerBinding7() { return binding7Provider; } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent index 81056e24f..588a26111 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent @@ -3,8 +3,8 @@ package dagger.internal.codegen; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -98,37 +98,37 @@ final class DaggerTestComponent { } @Override - public Provider<Binding1> providerBinding1() { + public javax.inject.Provider<Binding1> providerBinding1() { return testComponentImpl.testComponentImplShard2.binding1Provider; } @Override - public Provider<Binding2> providerBinding2() { + public javax.inject.Provider<Binding2> providerBinding2() { return testComponentImpl.testComponentImplShard.binding2Provider; } @Override - public Provider<Binding3> providerBinding3() { + public javax.inject.Provider<Binding3> providerBinding3() { return testComponentImpl.testComponentImplShard.binding3Provider; } @Override - public Provider<Binding4> providerBinding4() { + public javax.inject.Provider<Binding4> providerBinding4() { return testComponentImpl.testComponentImplShard.binding4Provider; } @Override - public Provider<Binding5> providerBinding5() { + public javax.inject.Provider<Binding5> providerBinding5() { return testComponentImpl.testComponentImplShard.binding5Provider; } @Override - public Provider<Binding6> providerBinding6() { + public javax.inject.Provider<Binding6> providerBinding6() { return binding6Provider; } @Override - public Provider<Binding7> providerBinding7() { + public javax.inject.Provider<Binding7> providerBinding7() { return binding7Provider; } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent index 86b5db46d..35ede527c 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_DEFAULT_MODE_dagger.internal.codegen.DaggerTestComponent @@ -2,8 +2,8 @@ package dagger.internal.codegen; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -77,17 +77,17 @@ final class DaggerTestComponent { } @Override - public Provider<Binding1> providerBinding1() { + public javax.inject.Provider<Binding1> providerBinding1() { return binding1Provider; } @Override - public Provider<Binding2> providerBinding2() { + public javax.inject.Provider<Binding2> providerBinding2() { return binding2Provider; } @Override - public Provider<Binding3> providerBinding3() { + public javax.inject.Provider<Binding3> providerBinding3() { return testSubcomponentImpl.testSubcomponentImplShard.binding3Provider; } } diff --git a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent index 5a675bae8..1049977a6 100644 --- a/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/ComponentShardTest_testNewShardSubcomponentCreated_FAST_INIT_MODE_dagger.internal.codegen.DaggerTestComponent @@ -2,8 +2,8 @@ package dagger.internal.codegen; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -77,17 +77,17 @@ final class DaggerTestComponent { } @Override - public Provider<Binding1> providerBinding1() { + public javax.inject.Provider<Binding1> providerBinding1() { return binding1Provider; } @Override - public Provider<Binding2> providerBinding2() { + public javax.inject.Provider<Binding2> providerBinding2() { return binding2Provider; } @Override - public Provider<Binding3> providerBinding3() { + public javax.inject.Provider<Binding3> providerBinding3() { return testSubcomponentImpl.testSubcomponentImplShard.binding3Provider; } diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent index d92a70e85..76ff2823e 100644 --- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testCmdLineOptionEnabledPrecedesAnnotationDisabled_test.DaggerSimpleComponent @@ -3,8 +3,8 @@ package test; import dagger.Lazy; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -65,7 +65,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SomeInjectableType> someInjectableTypeProvider() { + public javax.inject.Provider<SomeInjectableType> someInjectableTypeProvider() { return someInjectableTypeProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent index d92a70e85..76ff2823e 100644 --- a/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/DaggerProcessingOptionsTest_testFastInitEnabledFromAnnotationSucceeded_test.DaggerSimpleComponent @@ -3,8 +3,8 @@ package test; import dagger.Lazy; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -65,7 +65,7 @@ final class DaggerSimpleComponent { } @Override - public Provider<SomeInjectableType> someInjectableTypeProvider() { + public javax.inject.Provider<SomeInjectableType> someInjectableTypeProvider() { return someInjectableTypeProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent index 87f55ab41..5cac6ce4d 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.Subtype_Factory; import other.Supertype; diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent index 06e4298ff..ee87e0351 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castNeeded_rawTypes_Provider_get_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.Subtype_Factory; import other.Supertype; diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent index 6bdd833da..dda65b874 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_DEFAULT_MODE_test.DaggerTestComponent @@ -46,7 +46,7 @@ final class DaggerTestComponent { @Override public Provider<CharSequence> charSequence() { - return ((Provider) TestModule_ProvideStringFactory.create()); + return ((dagger.internal.Provider) TestModule_ProvideStringFactory.create()); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent index f186b844c..b5494f344 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_castedToRawType_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -53,7 +53,7 @@ final class DaggerTestComponent { } @Override - public Provider<CharSequence> charSequence() { + public javax.inject.Provider<CharSequence> charSequence() { return ((Provider) provideStringProvider); } @@ -63,7 +63,7 @@ final class DaggerTestComponent { } @Override - public Provider<String> namedString() { + public javax.inject.Provider<String> namedString() { return provideStringProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent index 578eaf46f..e98925e23 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_DEFAULT_MODE_test.DaggerTestComponent @@ -46,12 +46,12 @@ final class DaggerTestComponent { @Override public Provider<CharSequence> charSequence() { - return ((Provider) TestModule_ProvideStringFactory.create()); + return ((dagger.internal.Provider) TestModule_ProvideStringFactory.create()); } @Override public Provider<Object> object() { - return ((Provider) TestModule_ProvideStringFactory.create()); + return ((dagger.internal.Provider) TestModule_ProvideStringFactory.create()); } } } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent index 310f8a1d8..00012762b 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_doubleBinds_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -53,12 +53,12 @@ final class DaggerTestComponent { } @Override - public Provider<CharSequence> charSequence() { + public javax.inject.Provider<CharSequence> charSequence() { return ((Provider) provideStringProvider); } @Override - public Provider<Object> object() { + public javax.inject.Provider<Object> object() { return ((Provider) provideStringProvider); } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider index 193724a41..f2043f661 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_DEFAULT_MODE_test.DaggerRequestsSubtypeAsProvider @@ -48,7 +48,7 @@ final class DaggerRequestsSubtypeAsProvider { @Override public Provider<Supertype> supertypeProvider() { - return ((Provider) Subtype_Factory.create()); + return ((dagger.internal.Provider) Subtype_Factory.create()); } } } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider index 0d3233a98..137a98d3a 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_inlineFactoryOfInacessibleType_FAST_INIT_MODE_test.DaggerRequestsSubtypeAsProvider @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.Subtype_Factory; import other.Supertype; @@ -56,7 +56,7 @@ final class DaggerRequestsSubtypeAsProvider { } @Override - public Provider<Supertype> supertypeProvider() { + public javax.inject.Provider<Supertype> supertypeProvider() { return subtypeProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent index b1c1c2c87..3743b5c96 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.Subtype_Factory; import other.UsesSupertype; import other.UsesSupertype_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent index e076a1dc6..460550ae5 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_noCast_rawTypes_Provider_get_toInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.Subtype_Factory; import other.UsesSupertype; import other.UsesSupertype_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent index 149a5fe68..492cfcb2f 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_DEFAULT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -58,7 +58,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> object() { + public javax.inject.Provider<Object> object() { return bindStringProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent index 09600ed69..832a83080 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_providerWhenBindsScopeGreaterThanDependencyScope_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -58,7 +58,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> object() { + public javax.inject.Provider<Object> object() { return bindStringProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent index 61f28ddf7..772f290bb 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_DEFAULT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent index 323f241f2..095596880 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toDoubleCheck_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent index ccbf8fc06..112948e87 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_DEFAULT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent index 1b7c50552..c1775b63a 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toSingleCheck_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent index 227bed0a8..097f1acea 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_DEFAULT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent index dea546e94..500b4579f 100644 --- a/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/DelegateRequestRepresentationTest_toUnscoped_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.internal.SingleCheck; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent index cb7a35d2c..194275af3 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_DEFAULT_MODE_test.DaggerSimpleComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent index 94c174c71..92822a55c 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_scopedBinding_onlyUsedInSubcomponent_FAST_INIT_MODE_test.DaggerSimpleComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent index 32382c8cf..b3662e51c 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_DEFAULT_MODE_test.DaggerSimpleComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent index 381eeebf9..152ecdd2f 100644 --- a/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ElidedFactoriesTest_simpleComponent_injectsProviderOf_dependsOnScoped_FAST_INIT_MODE_test.DaggerSimpleComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_JAVA7_MODE_test.DaggerTestComponent index 9e10117e4..def1244dc 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_JAVA7_MODE_test.DaggerTestComponent @@ -3,8 +3,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; @@ -71,4 +71,4 @@ final class DaggerTestComponent { return OtherEntryPoint_Factory.newInstance(fooImpl()); } } -}
\ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent index 9c2506681..df4e53b6a 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_MODE_test.DaggerTestComponent @@ -3,8 +3,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent index 9642f3381..836ddbdc6 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent @@ -3,8 +3,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; @@ -93,4 +93,4 @@ final class DaggerTestComponent { } } } -}
\ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent index a18b8a4c4..cfe84a52e 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,8 +3,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_JAVA7_MODE_test.DaggerTestComponent index e377365d4..b92d68e2c 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_JAVA7_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; +import dagger.internal.Provider; import javax.annotation.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; @@ -67,4 +67,4 @@ final class DaggerTestComponent { return OtherEntryPoint_Factory.newInstance(fooImpl()); } } -}
\ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent index c1345ad1c..4e663c8ac 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent index c6db8da9b..45aac8a6a 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; +import dagger.internal.Provider; import javax.annotation.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; @@ -89,4 +89,4 @@ final class DaggerTestComponent { } } } -}
\ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent index 8e2e95981..5e4e1811b 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DelegateFactory; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; import other.OtherEntryPoint; import other.OtherEntryPoint_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_JAVA7_MODE_test.DaggerTestComponent index d39656c9b..d964156bb 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_JAVA7_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; @DaggerGenerated @@ -59,4 +59,4 @@ final class DaggerTestComponent { return bindProvider.get(); } } -}
\ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent index 73dda53a9..40fa32728 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; @DaggerGenerated diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent index 7c0c68df2..0697fe79e 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; @DaggerGenerated @@ -85,4 +85,4 @@ final class DaggerTestComponent { } } } -}
\ No newline at end of file +} diff --git a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent index 84ae12fed..a2a46234b 100644 --- a/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/InaccessibleTypeBindsTest_scopedInaccessibleTypeBound_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.FooImpl_Factory; @DaggerGenerated diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent index 88153bcb5..f3a76f55e 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.MapProviderFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -66,7 +66,7 @@ final class DaggerTestComponent { private Provider<Handler> provideLoginHandlerProvider; - private Provider<Map<PathEnum, Provider<Handler>>> mapOfPathEnumAndProviderOfHandlerProvider; + private Provider mapOfPathEnumAndProviderOfHandlerProvider; private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { @@ -83,7 +83,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<PathEnum, Provider<Handler>>> dispatcher() { + public javax.inject.Provider<Map<PathEnum, javax.inject.Provider<Handler>>> dispatcher() { return mapOfPathEnumAndProviderOfHandlerProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent index ac0e74e19..4321b6cad 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithEnumKey_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -70,7 +70,7 @@ final class DaggerTestComponent { private Provider<Handler> provideLoginHandlerProvider; - private Provider<Map<PathEnum, Provider<Handler>>> mapOfPathEnumAndProviderOfHandlerProvider; + private Provider mapOfPathEnumAndProviderOfHandlerProvider; private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; @@ -88,7 +88,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<PathEnum, Provider<Handler>>> dispatcher() { + public javax.inject.Provider<Map<PathEnum, javax.inject.Provider<Handler>>> dispatcher() { return mapOfPathEnumAndProviderOfHandlerProvider; } @@ -107,7 +107,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map<test.PathEnum,javax.inject.Provider<test.Handler>> - return (T) ImmutableMap.<PathEnum, Provider<Handler>>of(PathEnum.ADMIN, testComponentImpl.provideAdminHandlerProvider, PathEnum.LOGIN, testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.<PathEnum, javax.inject.Provider<Handler>>of(PathEnum.ADMIN, testComponentImpl.provideAdminHandlerProvider, PathEnum.LOGIN, testComponentImpl.provideLoginHandlerProvider); case 1: // java.util.Map<test.PathEnum,javax.inject.Provider<test.Handler>> test.MapModuleOne#provideAdminHandler return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent index 1d9618dd2..849d90529 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; import dagger.internal.MapFactory; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; import mapkeys.MapKeys; import mapkeys.MapModule; import mapkeys.MapModule_ClassKeyFactory; @@ -84,7 +84,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<Class<?>, Integer>> classKeyProvider() { + public javax.inject.Provider<Map<Class<?>, Integer>> classKeyProvider() { return mapOfClassOfAndIntegerProvider; } @@ -94,7 +94,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> inaccessibleEnumProvider() { + public javax.inject.Provider<Object> inaccessibleEnumProvider() { return mapOfPackagePrivateEnumAndIntegerProvider; } @@ -104,7 +104,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<MapKeys.ComplexKey, Integer>> complexKeyProvider() { + public javax.inject.Provider<Map<MapKeys.ComplexKey, Integer>> complexKeyProvider() { return mapOfComplexKeyAndIntegerProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent index 1d9618dd2..849d90529 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithInaccessibleKeys_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; import dagger.internal.MapFactory; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; import mapkeys.MapKeys; import mapkeys.MapModule; import mapkeys.MapModule_ClassKeyFactory; @@ -84,7 +84,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<Class<?>, Integer>> classKeyProvider() { + public javax.inject.Provider<Map<Class<?>, Integer>> classKeyProvider() { return mapOfClassOfAndIntegerProvider; } @@ -94,7 +94,7 @@ final class DaggerTestComponent { } @Override - public Provider<Object> inaccessibleEnumProvider() { + public javax.inject.Provider<Object> inaccessibleEnumProvider() { return mapOfPackagePrivateEnumAndIntegerProvider; } @@ -104,7 +104,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<MapKeys.ComplexKey, Integer>> complexKeyProvider() { + public javax.inject.Provider<Map<MapKeys.ComplexKey, Integer>> complexKeyProvider() { return mapOfComplexKeyAndIntegerProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent index b2e7cf5fd..056ff5afe 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.MapFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -83,7 +83,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<PathEnum, Handler>> dispatcher() { + public javax.inject.Provider<Map<PathEnum, Handler>> dispatcher() { return mapOfPathEnumAndHandlerProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent index 4e898edfa..ae80b854b 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithNonProviderValue_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -82,7 +82,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<PathEnum, Handler>> dispatcher() { + public javax.inject.Provider<Map<PathEnum, Handler>> dispatcher() { return mapOfPathEnumAndHandlerProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent index 0b463f566..e353cdbd8 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.MapProviderFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -66,7 +66,7 @@ final class DaggerTestComponent { private Provider<Handler> provideLoginHandlerProvider; - private Provider<Map<String, Provider<Handler>>> mapOfStringAndProviderOfHandlerProvider; + private Provider mapOfStringAndProviderOfHandlerProvider; private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { @@ -83,7 +83,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<String, Provider<Handler>>> dispatcher() { + public javax.inject.Provider<Map<String, javax.inject.Provider<Handler>>> dispatcher() { return mapOfStringAndProviderOfHandlerProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent index 65513bb7e..4e83239d0 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithStringKey_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -70,7 +70,7 @@ final class DaggerTestComponent { private Provider<Handler> provideLoginHandlerProvider; - private Provider<Map<String, Provider<Handler>>> mapOfStringAndProviderOfHandlerProvider; + private Provider mapOfStringAndProviderOfHandlerProvider; private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; @@ -88,7 +88,7 @@ final class DaggerTestComponent { } @Override - public Provider<Map<String, Provider<Handler>>> dispatcher() { + public javax.inject.Provider<Map<String, javax.inject.Provider<Handler>>> dispatcher() { return mapOfStringAndProviderOfHandlerProvider; } @@ -107,7 +107,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map<java.lang.String,javax.inject.Provider<test.Handler>> - return (T) ImmutableMap.<String, Provider<Handler>>of("Admin", testComponentImpl.provideAdminHandlerProvider, "Login", testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.<String, javax.inject.Provider<Handler>>of("Admin", testComponentImpl.provideAdminHandlerProvider, "Login", testComponentImpl.provideLoginHandlerProvider); case 1: // java.util.Map<java.lang.String,javax.inject.Provider<test.Handler>> test.MapModuleOne#provideAdminHandler return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent index 47847a7dc..5611344d9 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.MapProviderFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -66,7 +66,7 @@ final class DaggerTestComponent { private Provider<Handler> provideLoginHandlerProvider; - private Provider<Map<WrappedClassKey, Provider<Handler>>> mapOfWrappedClassKeyAndProviderOfHandlerProvider; + private Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider; private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { @@ -83,7 +83,8 @@ final class DaggerTestComponent { } @Override - public Provider<Map<WrappedClassKey, Provider<Handler>>> dispatcher() { + public javax.inject.Provider<Map<WrappedClassKey, javax.inject.Provider<Handler>>> dispatcher( + ) { return mapOfWrappedClassKeyAndProviderOfHandlerProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent index 3180571c2..2b87e633b 100644 --- a/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapBindingComponentProcessorTest_mapBindingsWithWrappedKey_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -70,7 +70,7 @@ final class DaggerTestComponent { private Provider<Handler> provideLoginHandlerProvider; - private Provider<Map<WrappedClassKey, Provider<Handler>>> mapOfWrappedClassKeyAndProviderOfHandlerProvider; + private Provider mapOfWrappedClassKeyAndProviderOfHandlerProvider; private TestComponentImpl(MapModuleOne mapModuleOneParam, MapModuleTwo mapModuleTwoParam) { this.mapModuleOne = mapModuleOneParam; @@ -88,7 +88,8 @@ final class DaggerTestComponent { } @Override - public Provider<Map<WrappedClassKey, Provider<Handler>>> dispatcher() { + public javax.inject.Provider<Map<WrappedClassKey, javax.inject.Provider<Handler>>> dispatcher( + ) { return mapOfWrappedClassKeyAndProviderOfHandlerProvider; } @@ -107,7 +108,7 @@ final class DaggerTestComponent { public T get() { switch (id) { case 0: // java.util.Map<test.WrappedClassKey,javax.inject.Provider<test.Handler>> - return (T) ImmutableMap.<WrappedClassKey, Provider<Handler>>of(WrappedClassKeyCreator.createWrappedClassKey(Integer.class), testComponentImpl.provideAdminHandlerProvider, WrappedClassKeyCreator.createWrappedClassKey(Long.class), testComponentImpl.provideLoginHandlerProvider); + return (T) ImmutableMap.<WrappedClassKey, javax.inject.Provider<Handler>>of(WrappedClassKeyCreator.createWrappedClassKey(Integer.class), testComponentImpl.provideAdminHandlerProvider, WrappedClassKeyCreator.createWrappedClassKey(Long.class), testComponentImpl.provideLoginHandlerProvider); case 1: // java.util.Map<test.WrappedClassKey,javax.inject.Provider<test.Handler>> test.MapModuleOne#provideAdminHandler return (T) MapModuleOne_ProvideAdminHandlerFactory.provideAdminHandler(testComponentImpl.mapModuleOne); diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent index 0010e588c..1db8ff8df 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,10 +2,10 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.MapBuilder; +import dagger.internal.Provider; import java.util.Collections; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -70,8 +70,8 @@ final class DaggerTestComponent { } @Override - public Map<String, Provider<String>> providerStrings() { - return Collections.<String, Provider<String>>emptyMap(); + public Map<String, javax.inject.Provider<String>> providerStrings() { + return Collections.<String, javax.inject.Provider<String>>emptyMap(); } @Override @@ -80,8 +80,8 @@ final class DaggerTestComponent { } @Override - public Map<Integer, Provider<Integer>> providerInts() { - return Collections.<Integer, Provider<Integer>>singletonMap(0, provideIntProvider); + public Map<Integer, javax.inject.Provider<Integer>> providerInts() { + return Collections.<Integer, javax.inject.Provider<Integer>>singletonMap(0, provideIntProvider); } @Override @@ -90,8 +90,8 @@ final class DaggerTestComponent { } @Override - public Map<Long, Provider<Long>> providerLongs() { - return MapBuilder.<Long, Provider<Long>>newMapBuilder(3).put(0L, provideLong0Provider).put(1L, provideLong1Provider).put(2L, provideLong2Provider).build(); + public Map<Long, javax.inject.Provider<Long>> providerLongs() { + return MapBuilder.<Long, javax.inject.Provider<Long>>newMapBuilder(3).put(0L, provideLong0Provider).put(1L, provideLong1Provider).put(2L, provideLong2Provider).build(); } private static final class SwitchingProvider<T> implements Provider<T> { diff --git a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent index e99a9639e..97cb73481 100644 --- a/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MapRequestRepresentationWithGuavaTest_mapBindings_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import com.google.common.collect.ImmutableMap; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import java.util.Map; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -69,8 +69,8 @@ final class DaggerTestComponent { } @Override - public Map<Long, Provider<Long>> providerLongs() { - return ImmutableMap.<Long, Provider<Long>>builderWithExpectedSize(6).put(0L, testComponentImpl.provideLong0Provider).put(1L, testComponentImpl.provideLong1Provider).put(2L, testComponentImpl.provideLong2Provider).put(3L, provideLong3Provider).put(4L, provideLong4Provider).put(5L, provideLong5Provider).build(); + public Map<Long, javax.inject.Provider<Long>> providerLongs() { + return ImmutableMap.<Long, javax.inject.Provider<Long>>builderWithExpectedSize(6).put(0L, testComponentImpl.provideLong0Provider).put(1L, testComponentImpl.provideLong1Provider).put(2L, testComponentImpl.provideLong2Provider).put(3L, provideLong3Provider).put(4L, provideLong4Provider).put(5L, provideLong5Provider).build(); } private static final class SwitchingProvider<T> implements Provider<T> { @@ -136,8 +136,8 @@ final class DaggerTestComponent { } @Override - public Map<String, Provider<String>> providerStrings() { - return ImmutableMap.<String, Provider<String>>of(); + public Map<String, javax.inject.Provider<String>> providerStrings() { + return ImmutableMap.<String, javax.inject.Provider<String>>of(); } @Override @@ -146,8 +146,8 @@ final class DaggerTestComponent { } @Override - public Map<Integer, Provider<Integer>> providerInts() { - return ImmutableMap.<Integer, Provider<Integer>>of(0, provideIntProvider); + public Map<Integer, javax.inject.Provider<Integer>> providerInts() { + return ImmutableMap.<Integer, javax.inject.Provider<Integer>>of(0, provideIntProvider); } @Override @@ -156,8 +156,8 @@ final class DaggerTestComponent { } @Override - public Map<Long, Provider<Long>> providerLongs() { - return ImmutableMap.<Long, Provider<Long>>of(0L, provideLong0Provider, 1L, provideLong1Provider, 2L, provideLong2Provider); + public Map<Long, javax.inject.Provider<Long>> providerLongs() { + return ImmutableMap.<Long, javax.inject.Provider<Long>>of(0L, provideLong0Provider, 1L, provideLong1Provider, 2L, provideLong2Provider); } @Override diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent index f8228a181..e322e4276 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.errorprone.annotations.CanIgnoreReturnValue; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import java.util.List; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.InaccessiblesModule_InaccessiblesFactory; import other.UsesInaccessibles; import other.UsesInaccessibles_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent index fd1c93050..ee997892a 100644 --- a/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/MembersInjectionTest_accessibleRawType_ofInaccessibleType_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.errorprone.annotations.CanIgnoreReturnValue; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import java.util.List; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.InaccessiblesModule_InaccessiblesFactory; import other.UsesInaccessibles; import other.UsesInaccessibles_Factory; diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_JAVA7_MODE_test.DaggerTestComponent index 9636b1a62..24a86c515 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_DEFAULT_JAVA7_MODE_test.DaggerTestComponent @@ -57,7 +57,7 @@ final class DaggerTestComponent { @Override public Optional<Provider<Lazy<Maybe>>> providerOfLazyOfMaybe() { - return Optional.of(ProviderOfLazy.create(Maybe_MaybeModule_ProvideMaybeFactory.create())); + return (Optional) Optional.of(ProviderOfLazy.create(Maybe_MaybeModule_ProvideMaybeFactory.create())); } @Override @@ -67,7 +67,7 @@ final class DaggerTestComponent { @Override public Optional<Provider<Lazy<DefinitelyNot>>> providerOfLazyOfDefinitelyNot() { - return Optional.<Provider<Lazy<DefinitelyNot>>>absent(); + return (Optional) Optional.<Provider<Lazy<DefinitelyNot>>>absent(); } } } diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent index 88631be0e..06503d984 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.base.Optional; import dagger.Lazy; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import dagger.internal.ProviderOfLazy; import javax.annotation.Generated; -import javax.inject.Provider; import other.DefinitelyNot; import other.Maybe; import other.Maybe_MaybeModule_ProvideMaybeFactory; @@ -64,8 +64,8 @@ final class DaggerTestComponent { } @Override - public Optional<Provider<Lazy<Maybe>>> providerOfLazyOfMaybe() { - return Optional.of(ProviderOfLazy.create(provideMaybeProvider)); + public Optional<javax.inject.Provider<Lazy<Maybe>>> providerOfLazyOfMaybe() { + return (Optional) Optional.of(ProviderOfLazy.create(provideMaybeProvider)); } @Override @@ -74,8 +74,8 @@ final class DaggerTestComponent { } @Override - public Optional<Provider<Lazy<DefinitelyNot>>> providerOfLazyOfDefinitelyNot() { - return Optional.<Provider<Lazy<DefinitelyNot>>>absent(); + public Optional<javax.inject.Provider<Lazy<DefinitelyNot>>> providerOfLazyOfDefinitelyNot() { + return (Optional) Optional.<javax.inject.Provider<Lazy<DefinitelyNot>>>absent(); } private static final class SwitchingProvider<T> implements Provider<T> { diff --git a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent index bc2d8aa72..54068ac6b 100644 --- a/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/OptionalBindingRequestFulfillmentTest_inlinedOptionalBindings_FAST_INIT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import com.google.common.base.Optional; import dagger.Lazy; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import dagger.internal.ProviderOfLazy; import javax.annotation.processing.Generated; -import javax.inject.Provider; import other.DefinitelyNot; import other.Maybe; import other.Maybe_MaybeModule_ProvideMaybeFactory; @@ -64,7 +64,7 @@ final class DaggerTestComponent { } @Override - public Optional<Provider<Lazy<Maybe>>> providerOfLazyOfMaybe() { + public Optional<javax.inject.Provider<Lazy<Maybe>>> providerOfLazyOfMaybe() { return Optional.of(ProviderOfLazy.create(provideMaybeProvider)); } @@ -74,7 +74,7 @@ final class DaggerTestComponent { } @Override - public Optional<Provider<Lazy<DefinitelyNot>>> providerOfLazyOfDefinitelyNot() { + public Optional<javax.inject.Provider<Lazy<DefinitelyNot>>> providerOfLazyOfDefinitelyNot() { return Optional.absent(); } diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent index 11af50c5f..8be0f98b0 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_DEFAULT_MODE_test.DaggerParent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.producers.internal.CancellationListener; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent index 5d0b797d5..cf5ae455e 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_productionScope_injectConstructor_FAST_INIT_MODE_test.DaggerParent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import dagger.producers.internal.CancellationListener; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent index d55cd3735..6123ca470 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_DEFAULT_MODE_test.DaggerTestClass_SimpleComponent @@ -5,6 +5,7 @@ import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; import dagger.internal.InstanceFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import dagger.internal.SetFactory; import dagger.producers.Producer; import dagger.producers.internal.CancellationListener; @@ -12,7 +13,6 @@ import dagger.producers.internal.Producers; import dagger.producers.monitoring.ProductionComponentMonitor; import java.util.concurrent.Executor; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent index 9ad6e6fa2..cf9c52436 100644 --- a/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent +++ b/javatests/dagger/internal/codegen/goldens/ProductionComponentProcessorTest_simpleComponent_FAST_INIT_MODE_test.DaggerTestClass_SimpleComponent @@ -5,6 +5,7 @@ import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; import dagger.internal.InstanceFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import dagger.internal.SetFactory; import dagger.producers.Producer; import dagger.producers.internal.CancellationListener; @@ -12,7 +13,6 @@ import dagger.producers.internal.Producers; import dagger.producers.monitoring.ProductionComponentMonitor; import java.util.concurrent.Executor; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent index b05b85f06..007872810 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_DEFAULT_MODE_test.DaggerParentComponent @@ -3,8 +3,8 @@ package test; import com.google.errorprone.annotations.CanIgnoreReturnValue; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent index 6311a200c..36c5032d1 100644 --- a/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent +++ b/javatests/dagger/internal/codegen/goldens/SubcomponentValidationTest_delegateFactoryNotCreatedForSubcomponentWhenProviderExistsInParent_FAST_INIT_MODE_test.DaggerParentComponent @@ -3,8 +3,8 @@ package test; import com.google.errorprone.annotations.CanIgnoreReturnValue; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent index e0230e0c7..95ce23a3c 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_DEFAULT_MODE_test.DaggerTestComponent @@ -4,8 +4,8 @@ import dagger.MembersInjector; import dagger.internal.DaggerGenerated; import dagger.internal.InstanceFactory; import dagger.internal.MembersInjectors; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -56,7 +56,7 @@ final class DaggerTestComponent { } @Override - public Provider<MembersInjector<Foo>> providerOfMembersInjector() { + public javax.inject.Provider<MembersInjector<Foo>> providerOfMembersInjector() { return fooMembersInjectorProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent index e0230e0c7..95ce23a3c 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_memberInjectors_FAST_INIT_MODE_test.DaggerTestComponent @@ -4,8 +4,8 @@ import dagger.MembersInjector; import dagger.internal.DaggerGenerated; import dagger.internal.InstanceFactory; import dagger.internal.MembersInjectors; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -56,7 +56,7 @@ final class DaggerTestComponent { } @Override - public Provider<MembersInjector<Foo>> providerOfMembersInjector() { + public javax.inject.Provider<MembersInjector<Foo>> providerOfMembersInjector() { return fooMembersInjectorProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent index 904fb4aea..dd50b770e 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_DEFAULT_MODE_test.DaggerTestComponent @@ -3,9 +3,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.InstanceFactory; import dagger.internal.Preconditions; +import dagger.internal.Provider; import java.util.Optional; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -94,12 +94,12 @@ final class DaggerTestComponent { } @Override - public Provider<Optional<Present>> providerOfOptionalOfPresent() { + public javax.inject.Provider<Optional<Present>> providerOfOptionalOfPresent() { return optionalOfPresentProvider; } @Override - public Provider<Optional<Absent>> providerOfOptionalOfAbsent() { + public javax.inject.Provider<Optional<Absent>> providerOfOptionalOfAbsent() { return optionalOfAbsentProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent index 1e46fdee1..26462e468 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_optionals_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,9 +2,9 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.InstanceFactory; +import dagger.internal.Provider; import java.util.Optional; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -73,12 +73,12 @@ final class DaggerTestComponent { } @Override - public Provider<Optional<Present>> providerOfOptionalOfPresent() { + public javax.inject.Provider<Optional<Present>> providerOfOptionalOfPresent() { return optionalOfPresentProvider; } @Override - public Provider<Optional<Absent>> providerOfOptionalOfAbsent() { + public javax.inject.Provider<Optional<Absent>> providerOfOptionalOfAbsent() { return optionalOfAbsentProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent index d3f68be07..e7c8b4f65 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_DEFAULT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -54,12 +54,12 @@ final class DaggerTestComponent { } @Override - public Provider<Object> objectProvider() { + public javax.inject.Provider<Object> objectProvider() { return ((Provider) cProvider); } @Override - public Provider<CharSequence> charSequenceProvider() { + public javax.inject.Provider<CharSequence> charSequenceProvider() { return cProvider; } } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent index 440def076..b8603ec1a 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_scopedBinds_FAST_INIT_MODE_test.DaggerTestComponent @@ -2,8 +2,8 @@ package test; import dagger.internal.DaggerGenerated; import dagger.internal.DoubleCheck; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -57,12 +57,12 @@ final class DaggerTestComponent { } @Override - public Provider<Object> objectProvider() { + public javax.inject.Provider<Object> objectProvider() { return ((Provider) cProvider); } @Override - public Provider<CharSequence> charSequenceProvider() { + public javax.inject.Provider<CharSequence> charSequenceProvider() { return cProvider; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent index c2bcf9116..39ded9383 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_switchingProviderTest_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -358,507 +358,507 @@ final class DaggerTestComponent { } @Override - public Provider<Binding0> getBinding0Provider() { + public javax.inject.Provider<Binding0> getBinding0Provider() { return binding0Provider; } @Override - public Provider<Binding1> getBinding1Provider() { + public javax.inject.Provider<Binding1> getBinding1Provider() { return binding1Provider; } @Override - public Provider<Binding2> getBinding2Provider() { + public javax.inject.Provider<Binding2> getBinding2Provider() { return binding2Provider; } @Override - public Provider<Binding3> getBinding3Provider() { + public javax.inject.Provider<Binding3> getBinding3Provider() { return binding3Provider; } @Override - public Provider<Binding4> getBinding4Provider() { + public javax.inject.Provider<Binding4> getBinding4Provider() { return binding4Provider; } @Override - public Provider<Binding5> getBinding5Provider() { + public javax.inject.Provider<Binding5> getBinding5Provider() { return binding5Provider; } @Override - public Provider<Binding6> getBinding6Provider() { + public javax.inject.Provider<Binding6> getBinding6Provider() { return binding6Provider; } @Override - public Provider<Binding7> getBinding7Provider() { + public javax.inject.Provider<Binding7> getBinding7Provider() { return binding7Provider; } @Override - public Provider<Binding8> getBinding8Provider() { + public javax.inject.Provider<Binding8> getBinding8Provider() { return binding8Provider; } @Override - public Provider<Binding9> getBinding9Provider() { + public javax.inject.Provider<Binding9> getBinding9Provider() { return binding9Provider; } @Override - public Provider<Binding10> getBinding10Provider() { + public javax.inject.Provider<Binding10> getBinding10Provider() { return binding10Provider; } @Override - public Provider<Binding11> getBinding11Provider() { + public javax.inject.Provider<Binding11> getBinding11Provider() { return binding11Provider; } @Override - public Provider<Binding12> getBinding12Provider() { + public javax.inject.Provider<Binding12> getBinding12Provider() { return binding12Provider; } @Override - public Provider<Binding13> getBinding13Provider() { + public javax.inject.Provider<Binding13> getBinding13Provider() { return binding13Provider; } @Override - public Provider<Binding14> getBinding14Provider() { + public javax.inject.Provider<Binding14> getBinding14Provider() { return binding14Provider; } @Override - public Provider<Binding15> getBinding15Provider() { + public javax.inject.Provider<Binding15> getBinding15Provider() { return binding15Provider; } @Override - public Provider<Binding16> getBinding16Provider() { + public javax.inject.Provider<Binding16> getBinding16Provider() { return binding16Provider; } @Override - public Provider<Binding17> getBinding17Provider() { + public javax.inject.Provider<Binding17> getBinding17Provider() { return binding17Provider; } @Override - public Provider<Binding18> getBinding18Provider() { + public javax.inject.Provider<Binding18> getBinding18Provider() { return binding18Provider; } @Override - public Provider<Binding19> getBinding19Provider() { + public javax.inject.Provider<Binding19> getBinding19Provider() { return binding19Provider; } @Override - public Provider<Binding20> getBinding20Provider() { + public javax.inject.Provider<Binding20> getBinding20Provider() { return binding20Provider; } @Override - public Provider<Binding21> getBinding21Provider() { + public javax.inject.Provider<Binding21> getBinding21Provider() { return binding21Provider; } @Override - public Provider<Binding22> getBinding22Provider() { + public javax.inject.Provider<Binding22> getBinding22Provider() { return binding22Provider; } @Override - public Provider<Binding23> getBinding23Provider() { + public javax.inject.Provider<Binding23> getBinding23Provider() { return binding23Provider; } @Override - public Provider<Binding24> getBinding24Provider() { + public javax.inject.Provider<Binding24> getBinding24Provider() { return binding24Provider; } @Override - public Provider<Binding25> getBinding25Provider() { + public javax.inject.Provider<Binding25> getBinding25Provider() { return binding25Provider; } @Override - public Provider<Binding26> getBinding26Provider() { + public javax.inject.Provider<Binding26> getBinding26Provider() { return binding26Provider; } @Override - public Provider<Binding27> getBinding27Provider() { + public javax.inject.Provider<Binding27> getBinding27Provider() { return binding27Provider; } @Override - public Provider<Binding28> getBinding28Provider() { + public javax.inject.Provider<Binding28> getBinding28Provider() { return binding28Provider; } @Override - public Provider<Binding29> getBinding29Provider() { + public javax.inject.Provider<Binding29> getBinding29Provider() { return binding29Provider; } @Override - public Provider<Binding30> getBinding30Provider() { + public javax.inject.Provider<Binding30> getBinding30Provider() { return binding30Provider; } @Override - public Provider<Binding31> getBinding31Provider() { + public javax.inject.Provider<Binding31> getBinding31Provider() { return binding31Provider; } @Override - public Provider<Binding32> getBinding32Provider() { + public javax.inject.Provider<Binding32> getBinding32Provider() { return binding32Provider; } @Override - public Provider<Binding33> getBinding33Provider() { + public javax.inject.Provider<Binding33> getBinding33Provider() { return binding33Provider; } @Override - public Provider<Binding34> getBinding34Provider() { + public javax.inject.Provider<Binding34> getBinding34Provider() { return binding34Provider; } @Override - public Provider<Binding35> getBinding35Provider() { + public javax.inject.Provider<Binding35> getBinding35Provider() { return binding35Provider; } @Override - public Provider<Binding36> getBinding36Provider() { + public javax.inject.Provider<Binding36> getBinding36Provider() { return binding36Provider; } @Override - public Provider<Binding37> getBinding37Provider() { + public javax.inject.Provider<Binding37> getBinding37Provider() { return binding37Provider; } @Override - public Provider<Binding38> getBinding38Provider() { + public javax.inject.Provider<Binding38> getBinding38Provider() { return binding38Provider; } @Override - public Provider<Binding39> getBinding39Provider() { + public javax.inject.Provider<Binding39> getBinding39Provider() { return binding39Provider; } @Override - public Provider<Binding40> getBinding40Provider() { + public javax.inject.Provider<Binding40> getBinding40Provider() { return binding40Provider; } @Override - public Provider<Binding41> getBinding41Provider() { + public javax.inject.Provider<Binding41> getBinding41Provider() { return binding41Provider; } @Override - public Provider<Binding42> getBinding42Provider() { + public javax.inject.Provider<Binding42> getBinding42Provider() { return binding42Provider; } @Override - public Provider<Binding43> getBinding43Provider() { + public javax.inject.Provider<Binding43> getBinding43Provider() { return binding43Provider; } @Override - public Provider<Binding44> getBinding44Provider() { + public javax.inject.Provider<Binding44> getBinding44Provider() { return binding44Provider; } @Override - public Provider<Binding45> getBinding45Provider() { + public javax.inject.Provider<Binding45> getBinding45Provider() { return binding45Provider; } @Override - public Provider<Binding46> getBinding46Provider() { + public javax.inject.Provider<Binding46> getBinding46Provider() { return binding46Provider; } @Override - public Provider<Binding47> getBinding47Provider() { + public javax.inject.Provider<Binding47> getBinding47Provider() { return binding47Provider; } @Override - public Provider<Binding48> getBinding48Provider() { + public javax.inject.Provider<Binding48> getBinding48Provider() { return binding48Provider; } @Override - public Provider<Binding49> getBinding49Provider() { + public javax.inject.Provider<Binding49> getBinding49Provider() { return binding49Provider; } @Override - public Provider<Binding50> getBinding50Provider() { + public javax.inject.Provider<Binding50> getBinding50Provider() { return binding50Provider; } @Override - public Provider<Binding51> getBinding51Provider() { + public javax.inject.Provider<Binding51> getBinding51Provider() { return binding51Provider; } @Override - public Provider<Binding52> getBinding52Provider() { + public javax.inject.Provider<Binding52> getBinding52Provider() { return binding52Provider; } @Override - public Provider<Binding53> getBinding53Provider() { + public javax.inject.Provider<Binding53> getBinding53Provider() { return binding53Provider; } @Override - public Provider<Binding54> getBinding54Provider() { + public javax.inject.Provider<Binding54> getBinding54Provider() { return binding54Provider; } @Override - public Provider<Binding55> getBinding55Provider() { + public javax.inject.Provider<Binding55> getBinding55Provider() { return binding55Provider; } @Override - public Provider<Binding56> getBinding56Provider() { + public javax.inject.Provider<Binding56> getBinding56Provider() { return binding56Provider; } @Override - public Provider<Binding57> getBinding57Provider() { + public javax.inject.Provider<Binding57> getBinding57Provider() { return binding57Provider; } @Override - public Provider<Binding58> getBinding58Provider() { + public javax.inject.Provider<Binding58> getBinding58Provider() { return binding58Provider; } @Override - public Provider<Binding59> getBinding59Provider() { + public javax.inject.Provider<Binding59> getBinding59Provider() { return binding59Provider; } @Override - public Provider<Binding60> getBinding60Provider() { + public javax.inject.Provider<Binding60> getBinding60Provider() { return binding60Provider; } @Override - public Provider<Binding61> getBinding61Provider() { + public javax.inject.Provider<Binding61> getBinding61Provider() { return binding61Provider; } @Override - public Provider<Binding62> getBinding62Provider() { + public javax.inject.Provider<Binding62> getBinding62Provider() { return binding62Provider; } @Override - public Provider<Binding63> getBinding63Provider() { + public javax.inject.Provider<Binding63> getBinding63Provider() { return binding63Provider; } @Override - public Provider<Binding64> getBinding64Provider() { + public javax.inject.Provider<Binding64> getBinding64Provider() { return binding64Provider; } @Override - public Provider<Binding65> getBinding65Provider() { + public javax.inject.Provider<Binding65> getBinding65Provider() { return binding65Provider; } @Override - public Provider<Binding66> getBinding66Provider() { + public javax.inject.Provider<Binding66> getBinding66Provider() { return binding66Provider; } @Override - public Provider<Binding67> getBinding67Provider() { + public javax.inject.Provider<Binding67> getBinding67Provider() { return binding67Provider; } @Override - public Provider<Binding68> getBinding68Provider() { + public javax.inject.Provider<Binding68> getBinding68Provider() { return binding68Provider; } @Override - public Provider<Binding69> getBinding69Provider() { + public javax.inject.Provider<Binding69> getBinding69Provider() { return binding69Provider; } @Override - public Provider<Binding70> getBinding70Provider() { + public javax.inject.Provider<Binding70> getBinding70Provider() { return binding70Provider; } @Override - public Provider<Binding71> getBinding71Provider() { + public javax.inject.Provider<Binding71> getBinding71Provider() { return binding71Provider; } @Override - public Provider<Binding72> getBinding72Provider() { + public javax.inject.Provider<Binding72> getBinding72Provider() { return binding72Provider; } @Override - public Provider<Binding73> getBinding73Provider() { + public javax.inject.Provider<Binding73> getBinding73Provider() { return binding73Provider; } @Override - public Provider<Binding74> getBinding74Provider() { + public javax.inject.Provider<Binding74> getBinding74Provider() { return binding74Provider; } @Override - public Provider<Binding75> getBinding75Provider() { + public javax.inject.Provider<Binding75> getBinding75Provider() { return binding75Provider; } @Override - public Provider<Binding76> getBinding76Provider() { + public javax.inject.Provider<Binding76> getBinding76Provider() { return binding76Provider; } @Override - public Provider<Binding77> getBinding77Provider() { + public javax.inject.Provider<Binding77> getBinding77Provider() { return binding77Provider; } @Override - public Provider<Binding78> getBinding78Provider() { + public javax.inject.Provider<Binding78> getBinding78Provider() { return binding78Provider; } @Override - public Provider<Binding79> getBinding79Provider() { + public javax.inject.Provider<Binding79> getBinding79Provider() { return binding79Provider; } @Override - public Provider<Binding80> getBinding80Provider() { + public javax.inject.Provider<Binding80> getBinding80Provider() { return binding80Provider; } @Override - public Provider<Binding81> getBinding81Provider() { + public javax.inject.Provider<Binding81> getBinding81Provider() { return binding81Provider; } @Override - public Provider<Binding82> getBinding82Provider() { + public javax.inject.Provider<Binding82> getBinding82Provider() { return binding82Provider; } @Override - public Provider<Binding83> getBinding83Provider() { + public javax.inject.Provider<Binding83> getBinding83Provider() { return binding83Provider; } @Override - public Provider<Binding84> getBinding84Provider() { + public javax.inject.Provider<Binding84> getBinding84Provider() { return binding84Provider; } @Override - public Provider<Binding85> getBinding85Provider() { + public javax.inject.Provider<Binding85> getBinding85Provider() { return binding85Provider; } @Override - public Provider<Binding86> getBinding86Provider() { + public javax.inject.Provider<Binding86> getBinding86Provider() { return binding86Provider; } @Override - public Provider<Binding87> getBinding87Provider() { + public javax.inject.Provider<Binding87> getBinding87Provider() { return binding87Provider; } @Override - public Provider<Binding88> getBinding88Provider() { + public javax.inject.Provider<Binding88> getBinding88Provider() { return binding88Provider; } @Override - public Provider<Binding89> getBinding89Provider() { + public javax.inject.Provider<Binding89> getBinding89Provider() { return binding89Provider; } @Override - public Provider<Binding90> getBinding90Provider() { + public javax.inject.Provider<Binding90> getBinding90Provider() { return binding90Provider; } @Override - public Provider<Binding91> getBinding91Provider() { + public javax.inject.Provider<Binding91> getBinding91Provider() { return binding91Provider; } @Override - public Provider<Binding92> getBinding92Provider() { + public javax.inject.Provider<Binding92> getBinding92Provider() { return binding92Provider; } @Override - public Provider<Binding93> getBinding93Provider() { + public javax.inject.Provider<Binding93> getBinding93Provider() { return binding93Provider; } @Override - public Provider<Binding94> getBinding94Provider() { + public javax.inject.Provider<Binding94> getBinding94Provider() { return binding94Provider; } @Override - public Provider<Binding95> getBinding95Provider() { + public javax.inject.Provider<Binding95> getBinding95Provider() { return binding95Provider; } @Override - public Provider<Binding96> getBinding96Provider() { + public javax.inject.Provider<Binding96> getBinding96Provider() { return binding96Provider; } @Override - public Provider<Binding97> getBinding97Provider() { + public javax.inject.Provider<Binding97> getBinding97Provider() { return binding97Provider; } @Override - public Provider<Binding98> getBinding98Provider() { + public javax.inject.Provider<Binding98> getBinding98Provider() { return binding98Provider; } @Override - public Provider<Binding99> getBinding99Provider() { + public javax.inject.Provider<Binding99> getBinding99Provider() { return binding99Provider; } @Override - public Provider<Binding100> getBinding100Provider() { + public javax.inject.Provider<Binding100> getBinding100Provider() { return binding100Provider; } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent index 00679b417..939d6cda1 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_DEFAULT_MODE_test.DaggerTestComponent @@ -46,12 +46,12 @@ final class DaggerTestComponent { @Override public Provider<Object> objectProvider() { - return ((Provider) TestModule_SFactory.create()); + return ((dagger.internal.Provider) TestModule_SFactory.create()); } @Override public Provider<CharSequence> charSequenceProvider() { - return ((Provider) TestModule_SFactory.create()); + return ((dagger.internal.Provider) TestModule_SFactory.create()); } } } diff --git a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent index 2970ba6f6..f0d4e0d61 100644 --- a/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent +++ b/javatests/dagger/internal/codegen/goldens/SwitchingProviderTest_unscopedBinds_FAST_INIT_MODE_test.DaggerTestComponent @@ -1,8 +1,8 @@ package test; import dagger.internal.DaggerGenerated; +import dagger.internal.Provider; import javax.annotation.processing.Generated; -import javax.inject.Provider; @DaggerGenerated @Generated( @@ -53,12 +53,12 @@ final class DaggerTestComponent { } @Override - public Provider<Object> objectProvider() { + public javax.inject.Provider<Object> objectProvider() { return ((Provider) sProvider); } @Override - public Provider<CharSequence> charSequenceProvider() { + public javax.inject.Provider<CharSequence> charSequenceProvider() { return ((Provider) sProvider); } diff --git a/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java b/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java index cc4f5a155..b430dcda4 100644 --- a/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java +++ b/javatests/dagger/internal/codegen/kotlin/KspComponentProcessorTest.java @@ -230,8 +230,8 @@ public final class KspComponentProcessorTest { "package test;", "", "import dagger.internal.DaggerGenerated;", + "import dagger.internal.Provider;", "import javax.annotation.processing.Generated;", - "import javax.inject.Provider;", "", "@DaggerGenerated", "@Generated(", @@ -283,7 +283,7 @@ public final class KspComponentProcessorTest { " }", "", " @Override", - " public Provider<Foo> foo() {", + " public javax.inject.Provider<Foo> foo() {", " return fooProvider;", " }", " }", |