Remove the deprecated ApplicationComponent.

RELNOTES=Removes the deprecated ApplicationComponent.
PiperOrigin-RevId: 355956593

4 files changed, 4 insertions, 28 deletions

diff --git a/java/dagger/hilt/processor/internal/ClassNames.java b/java/dagger/hilt/processor/internal/ClassNames.java
index 776eb59f4..234ea7b45 100644
--- a/java/dagger/hilt/processor/internal/ClassNames.java
+++ b/java/dagger/hilt/processor/internal/ClassNames.java
@@ -167,8 +167,6 @@ public final class ClassNames {
   public static final ClassName ARRAYS = get("java.util", "Arrays");
 
   // Standard components
-  public static final ClassName LEGACY_APPLICATION_COMPONENT =
-      get("dagger.hilt.android.components", "ApplicationComponent");
   public static final ClassName SINGLETON_COMPONENT =
       get("dagger.hilt.components", "SingletonComponent");
   public static final ClassName ACTIVITY_COMPONENT =
diff --git a/java/dagger/hilt/processor/internal/Components.java b/java/dagger/hilt/processor/internal/Components.java
index 9ea7e64e7..661dd8a9b 100644
--- a/java/dagger/hilt/processor/internal/Components.java
+++ b/java/dagger/hilt/processor/internal/Components.java
@@ -93,19 +93,16 @@ public final class Components {
             || Processors.hasAnnotation(element, ClassNames.TEST_INSTALL_IN));
 
     ImmutableSet<TypeElement> components =
+        ImmutableSet.copyOf(
             Processors.hasAnnotation(element, ClassNames.INSTALL_IN)
                 ? Processors.getAnnotationClassValues(
                     elements,
                     Processors.getAnnotationMirror(element, ClassNames.INSTALL_IN),
-                    "value").stream()
-                        .map(component -> mapComponents(elements, component))
-                        .collect(toImmutableSet())
+                    "value")
                 : Processors.getAnnotationClassValues(
                     elements,
                     Processors.getAnnotationMirror(element, ClassNames.TEST_INSTALL_IN),
-                    "components").stream()
-                        .map(component -> mapComponents(elements, component))
-                        .collect(toImmutableSet());
+                    "components"));
 
     ImmutableSet<TypeElement> undefinedComponents =
         components.stream()
@@ -121,16 +118,5 @@ public final class Components {
     return components.stream().map(ClassName::get).collect(toImmutableSet());
   }
 
-  // Temporary hack while ApplicationComponent is renamed to SingletonComponent
-  private static TypeElement mapComponents(Elements elements, TypeElement element) {
-    if (ClassNames.LEGACY_APPLICATION_COMPONENT.equals(ClassName.get(element))) {
-      TypeElement singletonComponent =
-          elements.getTypeElement(ClassNames.SINGLETON_COMPONENT.canonicalName());
-      Preconditions.checkState(singletonComponent != null);
-      return singletonComponent;
-    }
-    return element;
-  }
-
   private Components() {}
 }
diff --git a/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java b/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java
index d943faf72..23ed148c0 100644
--- a/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java
+++ b/java/dagger/hilt/processor/internal/aggregateddeps/ComponentDependencies.java
@@ -243,7 +243,7 @@ public abstract class ComponentDependencies {
       // processor since new processors should convert to the new SingletonComponent when generating
       // the metadata class.
       if (descriptor.component().equals(ClassNames.SINGLETON_COMPONENT)) {
-        builder.put(ClassNames.LEGACY_APPLICATION_COMPONENT.toString(), descriptor);
+        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 fde80265b..aa69e40e1 100644
--- a/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java
+++ b/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java
@@ -61,13 +61,6 @@ final class DefineComponentMetadatas {
   }
 
   private DefineComponentMetadata get(Element element, LinkedHashSet<Element> childPath) {
-    // This is a temporary hack to map the old ApplicationComponent to the new SingletonComponent
-    if (element.getKind().equals(ElementKind.INTERFACE)
-        && asType(element).getQualifiedName()
-            .contentEquals(ClassNames.LEGACY_APPLICATION_COMPONENT.toString())) {
-      element = asTypeElement(asType(element).getInterfaces().get(0));
-    }
-
     if (!metadatas.containsKey(element)) {
       metadatas.put(element, getUncached(element, childPath));
     }
@@ -159,7 +152,6 @@ final class DefineComponentMetadatas {
 
     ProcessorErrors.checkState(
         ClassName.get(parent).equals(ClassNames.DEFINE_COMPONENT_NO_PARENT)
-            || ClassName.get(parent).equals(ClassNames.LEGACY_APPLICATION_COMPONENT)
             || Processors.hasAnnotation(parent, ClassNames.DEFINE_COMPONENT),
         component,
         "@DefineComponent %s, references a type not annotated with @DefineComponent: %s",