diff options
author | Brad Corso <bcorso@google.com> | 2020-12-29 10:55:57 -0800 |
---|---|---|
committer | Dagger Team <dagger-dev+copybara@google.com> | 2020-12-29 10:57:37 -0800 |
commit | 6fca7a39bdad393504d9162cdd74ed4a7c20b6d3 (patch) | |
tree | f4cde0fdd055837a8c8ada7371f6d42ee5a94835 /java/dagger/hilt | |
parent | b90de0f1f2f34f16519710778a4711b8d89ce49e (diff) | |
download | dagger2-6fca7a39bdad393504d9162cdd74ed4a7c20b6d3.tar.gz |
Rename ClassNames.APPLICATION_COMPONENT to SINGLETON_COMPONENT
RELNOTES=N/A
PiperOrigin-RevId: 349443733
Diffstat (limited to 'java/dagger/hilt')
10 files changed, 12 insertions, 12 deletions
diff --git a/java/dagger/hilt/android/processor/internal/AndroidClassNames.java b/java/dagger/hilt/android/processor/internal/AndroidClassNames.java index e1b8a78fe..915ae519f 100644 --- a/java/dagger/hilt/android/processor/internal/AndroidClassNames.java +++ b/java/dagger/hilt/android/processor/internal/AndroidClassNames.java @@ -61,7 +61,7 @@ public final class AndroidClassNames { public static final ClassName OPTIONAL_INJECT = get("dagger.hilt.android.migration", "OptionalInject"); - public static final ClassName APPLICATION_COMPONENT = + public static final ClassName SINGLETON_COMPONENT = get("dagger.hilt.components", "SingletonComponent"); public static final ClassName ACTIVITY_COMPONENT = get("dagger.hilt.android.components", "ActivityComponent"); diff --git a/java/dagger/hilt/android/processor/internal/androidentrypoint/AndroidEntryPointMetadata.java b/java/dagger/hilt/android/processor/internal/androidentrypoint/AndroidEntryPointMetadata.java index 72365dbd3..e5868f861 100644 --- a/java/dagger/hilt/android/processor/internal/androidentrypoint/AndroidEntryPointMetadata.java +++ b/java/dagger/hilt/android/processor/internal/androidentrypoint/AndroidEntryPointMetadata.java @@ -382,7 +382,7 @@ public abstract class AndroidEntryPointMetadata { private static final class Type { private static final Type APPLICATION = new Type( - AndroidClassNames.APPLICATION_COMPONENT, + AndroidClassNames.SINGLETON_COMPONENT, AndroidType.APPLICATION, AndroidClassNames.APPLICATION_COMPONENT_MANAGER, null); @@ -394,7 +394,7 @@ public abstract class AndroidEntryPointMetadata { CodeBlock.of("this")); private static final Type BROADCAST_RECEIVER = new Type( - AndroidClassNames.APPLICATION_COMPONENT, + AndroidClassNames.SINGLETON_COMPONENT, AndroidType.BROADCAST_RECEIVER, AndroidClassNames.BROADCAST_RECEIVER_COMPONENT_MANAGER, null); diff --git a/java/dagger/hilt/android/processor/internal/androidentrypoint/ApplicationGenerator.java b/java/dagger/hilt/android/processor/internal/androidentrypoint/ApplicationGenerator.java index 6fb4e0062..f16e06dee 100644 --- a/java/dagger/hilt/android/processor/internal/androidentrypoint/ApplicationGenerator.java +++ b/java/dagger/hilt/android/processor/internal/androidentrypoint/ApplicationGenerator.java @@ -108,7 +108,7 @@ public final class ApplicationGenerator { private TypeSpec creatorType() { ClassName component = ComponentNames.generatedComponent( - metadata.elementClassName(), AndroidClassNames.APPLICATION_COMPONENT); + metadata.elementClassName(), AndroidClassNames.SINGLETON_COMPONENT); return TypeSpec.anonymousClassBuilder("") .addSuperinterface(AndroidClassNames.COMPONENT_SUPPLIER) .addMethod( diff --git a/java/dagger/hilt/android/processor/internal/bindvalue/BindValueGenerator.java b/java/dagger/hilt/android/processor/internal/bindvalue/BindValueGenerator.java index a2d5211cd..108a15dd9 100644 --- a/java/dagger/hilt/android/processor/internal/bindvalue/BindValueGenerator.java +++ b/java/dagger/hilt/android/processor/internal/bindvalue/BindValueGenerator.java @@ -73,7 +73,7 @@ final class BindValueGenerator { .addAnnotation(Module.class) .addAnnotation( Components.getInstallInAnnotationSpec( - ImmutableSet.of(ClassNames.APPLICATION_COMPONENT))) + ImmutableSet.of(ClassNames.SINGLETON_COMPONENT))) .addMethod(providesTestMethod()); Processors.addGeneratedAnnotation(builder, env, getClass()); diff --git a/java/dagger/hilt/processor/internal/ClassNames.java b/java/dagger/hilt/processor/internal/ClassNames.java index fbd633cb6..de32055a0 100644 --- a/java/dagger/hilt/processor/internal/ClassNames.java +++ b/java/dagger/hilt/processor/internal/ClassNames.java @@ -164,7 +164,7 @@ public final class ClassNames { public static final ClassName ARRAYS = get("java.util", "Arrays"); // Standard components - public static final ClassName APPLICATION_COMPONENT = + public static final ClassName SINGLETON_COMPONENT = get("dagger.hilt.components", "SingletonComponent"); public static final ClassName ACTIVITY_COMPONENT = get("dagger.hilt.android.components", "ActivityComponent"); diff --git a/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java b/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java index 8064219a1..dfee360a3 100644 --- a/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java +++ b/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java @@ -228,7 +228,7 @@ public final class ComponentDependencies { // Technically, this is only needed for backwards compatibility with libraries using the old // processor since new processors should convert to the new SingletonComponent when generating // the metadata class. - if (descriptor.component().equals(ClassNames.APPLICATION_COMPONENT)) { + if (descriptor.component().equals(ClassNames.SINGLETON_COMPONENT)) { builder.put("dagger.hilt.android.components.ApplicationComponent", descriptor); } builder.put(descriptor.component().toString(), descriptor); diff --git a/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java b/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java index 7694e833b..aa69e40e1 100644 --- a/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java +++ b/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java @@ -165,7 +165,7 @@ final class DefineComponentMetadatas { ProcessorErrors.checkState( parentComponent.isPresent() - || ClassName.get(component).equals(ClassNames.APPLICATION_COMPONENT), + || ClassName.get(component).equals(ClassNames.SINGLETON_COMPONENT), component, "@DefineComponent %s is missing a parent declaration.\n" + "Please declare the parent, for example: @DefineComponent(parent =" diff --git a/java/dagger/hilt/processor/internal/root/RootMetadata.java b/java/dagger/hilt/processor/internal/root/RootMetadata.java index d7123415f..3dc7164c0 100644 --- a/java/dagger/hilt/processor/internal/root/RootMetadata.java +++ b/java/dagger/hilt/processor/internal/root/RootMetadata.java @@ -143,7 +143,7 @@ public final class RootMetadata { for (ComponentDescriptor componentDescriptor : componentTree.getComponentDescriptors()) { ClassName componentName = componentDescriptor.component(); for (TypeElement extraModule : modulesThatDaggerCannotConstruct(componentName)) { - if (root.type().isTestRoot() && !componentName.equals(ClassNames.APPLICATION_COMPONENT)) { + if (root.type().isTestRoot() && !componentName.equals(ClassNames.SINGLETON_COMPONENT)) { env.getMessager() .printMessage( Diagnostic.Kind.ERROR, diff --git a/java/dagger/hilt/processor/internal/root/TestComponentDataGenerator.java b/java/dagger/hilt/processor/internal/root/TestComponentDataGenerator.java index 641193eb7..c9e8cfb5b 100644 --- a/java/dagger/hilt/processor/internal/root/TestComponentDataGenerator.java +++ b/java/dagger/hilt/processor/internal/root/TestComponentDataGenerator.java @@ -101,9 +101,9 @@ public final class TestComponentDataGenerator { TypeElement testElement = rootMetadata.testRootMetadata().testElement(); ClassName component = ComponentNames.generatedComponent( - ClassName.get(testElement), ClassNames.APPLICATION_COMPONENT); + ClassName.get(testElement), ClassNames.SINGLETON_COMPONENT); ImmutableSet<TypeElement> daggerRequiredModules = - rootMetadata.modulesThatDaggerCannotConstruct(ClassNames.APPLICATION_COMPONENT); + rootMetadata.modulesThatDaggerCannotConstruct(ClassNames.SINGLETON_COMPONENT); ImmutableSet<TypeElement> hiltRequiredModules = daggerRequiredModules.stream() .filter(module -> !canBeConstructedByHilt(module, testElement)) diff --git a/java/dagger/hilt/processor/internal/root/TestInjectorGenerator.java b/java/dagger/hilt/processor/internal/root/TestInjectorGenerator.java index 623f880bc..90c190543 100644 --- a/java/dagger/hilt/processor/internal/root/TestInjectorGenerator.java +++ b/java/dagger/hilt/processor/internal/root/TestInjectorGenerator.java @@ -51,7 +51,7 @@ public final class TestInjectorGenerator { .addMember( "value", "$T.class", - ClassNames.APPLICATION_COMPONENT) + ClassNames.SINGLETON_COMPONENT) .build()) .addModifiers(Modifier.PUBLIC) .addSuperinterface( |