1 files changed, 13 insertions, 19 deletions

diff --git a/java/dagger/hilt/processor/internal/aliasof/AliasOfPropagatedDataGenerator.java b/java/dagger/hilt/processor/internal/aliasof/AliasOfPropagatedDataGenerator.java
index 2ccb5cfbd..1d7edf285 100644
--- a/java/dagger/hilt/processor/internal/aliasof/AliasOfPropagatedDataGenerator.java
+++ b/java/dagger/hilt/processor/internal/aliasof/AliasOfPropagatedDataGenerator.java
@@ -17,43 +17,37 @@
 package dagger.hilt.processor.internal.aliasof;
 
 import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
 import dagger.hilt.processor.internal.ClassNames;
 import dagger.hilt.processor.internal.Processors;
 import java.io.IOException;
 import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
 
 /** Generates resource files for {@link dagger.hilt.migration.AliasOf}. */
 final class AliasOfPropagatedDataGenerator {
 
   private final ProcessingEnvironment processingEnv;
-  private final Element aliasScope;
-  private final Element defineComponentScope;
+  private final TypeElement aliasScope;
+  private final TypeElement defineComponentScope;
 
   AliasOfPropagatedDataGenerator(
-      ProcessingEnvironment processingEnv, Element aliasScope, Element defineComponentScope) {
+      ProcessingEnvironment processingEnv,
+      TypeElement aliasScope,
+      TypeElement defineComponentScope) {
     this.processingEnv = processingEnv;
     this.aliasScope = aliasScope;
     this.defineComponentScope = defineComponentScope;
   }
 
   void generate() throws IOException {
-    TypeSpec.Builder generator =
-        TypeSpec.classBuilder(Processors.getFullEnclosedName(aliasScope))
-            .addOriginatingElement(aliasScope)
-            .addAnnotation(
-                AnnotationSpec.builder(ClassNames.ALIAS_OF_PROPAGATED_DATA)
+    Processors.generateAggregatingClass(
+        ClassNames.ALIAS_OF_PROPAGATED_DATA_PACKAGE,
+        AnnotationSpec.builder(ClassNames.ALIAS_OF_PROPAGATED_DATA)
                     .addMember("defineComponentScope", "$T.class", defineComponentScope)
                     .addMember("alias", "$T.class", aliasScope)
-                    .build())
-            .addJavadoc("Generated class for aggregating scope aliases. \n");
-
-    Processors.addGeneratedAnnotation(generator, processingEnv, getClass());
-
-    JavaFile.builder(ClassNames.ALIAS_OF_PROPAGATED_DATA_PACKAGE, generator.build())
-        .build()
-        .writeTo(processingEnv.getFiler());
+                    .build(),
+        aliasScope,
+        getClass(),
+        processingEnv);
   }
 }