[XPoet Migration]: Remove workaround to control @OVERRIDES ordering.

This CL removes the workaround that lets us control the ordering of the `@Overrides` annotation and updates the golden files. This workaround was initially used just to avoid causing changes to our golden files while the migration was in progress, but it's being removed now that the migration is nearing completion.

RELNOTES=N/A
PiperOrigin-RevId: 752395970

Author: bcorso

dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentCreatorImplementationFactory.java

@@ -250,7 +250,7 @@ private XFunSpec noopSetterMethod(ComponentRequirement requirement) {
       XFunSpecs.Builder builder = setterMethodBuilder(requirement);
       XParameterSpec parameter = getOnlyElement(builder.getParameters());
       builder
-          .addAnnotation(Deprecated.class)
+          .addAnnotation(XTypeNames.DEPRECATED)
           .addJavadoc(
               "@deprecated This module is declared, but an instance is not used in the component. "
                   + "This method is a no-op. For more, see https://dagger.dev/unused-modules.\n")

dagger-compiler/main/java/dagger/internal/codegen/writing/ComponentImplementation.java

@@ -1042,8 +1042,8 @@ private void addConstructorAndInitializationMethods() {
     private void addCancellationListenerImplementation() {
       XFunSpecs.Builder methodBuilder =
           methodBuilder(CANCELLATION_LISTENER_METHOD_NAME)
+              .isOverride(true)
               .addModifiers(PUBLIC)
-              .addAnnotation(Override.class)
               .addParameter(MAY_INTERRUPT_IF_RUNNING_PARAM);
 
       // Reversing should order cancellations starting from entry points and going down to leaves

dagger-compiler/main/java/dagger/internal/codegen/writing/DependencyMethodProviderCreationExpression.java

@@ -104,7 +104,7 @@ public XCodeBlock creationExpression() {
             compilerOptions);
     XFunSpecs.Builder getMethod =
         methodBuilder("get")
-            .addAnnotation(Override.class)
+            .isOverride(true)
             .addModifiers(PUBLIC)
             .returns(returnType)
             .addStatement("return %L", invocation)

dagger-compiler/main/java/dagger/internal/codegen/writing/FactoryGenerator.java

@@ -279,11 +279,11 @@ private XFunSpec getMethod(ContributionBinding binding, FactoryFields factoryFie
                             parameter.getType().asTypeName())));
     XTypeName providedTypeName = providedTypeName(binding);
     XFunSpecs.Builder getMethod =
-        methodBuilder("get").addModifiers(PUBLIC).addParameters(assistedParameters.values());
+        methodBuilder("get")
+            .addModifiers(PUBLIC)
+            .isOverride(factoryTypeName(binding).isPresent())
+            .addParameters(assistedParameters.values());
 
-    if (factoryTypeName(binding).isPresent()) {
-      getMethod.addAnnotation(Override.class);
-    }
     XCodeBlock invokeNewInstance =
         ProvisionMethod.invoke(
             binding,

dagger-compiler/main/java/dagger/internal/codegen/writing/MembersInjectorGenerator.java

@@ -315,7 +315,7 @@ private XFunSpec injectMembersMethod(
             dependencyCodeBlocks::get);
     return methodBuilder("injectMembers")
         .addModifiers(PUBLIC)
-        .addAnnotation(Override.class)
+        .isOverride(true)
         .addParameter("instance", instanceType.asTypeName())
         .addCode(invokeInjectionSites)
         .build();

dagger-compiler/main/java/dagger/internal/codegen/writing/ProducerFactoryGenerator.java

@@ -222,7 +222,7 @@ private XFunSpec staticCreateMethod(ProductionBinding binding, FactoryFields fac
   public XFunSpec collectDependenciesMethod(
       ProductionBinding binding, FactoryFields factoryFields) {
     XFunSpecs.Builder methodBuilder =
-        methodBuilder("collectDependencies").addAnnotation(Override.class).addModifiers(PROTECTED);
+        methodBuilder("collectDependencies").isOverride(true).addModifiers(PROTECTED);
     ImmutableList<DependencyRequest> asyncDependencies = asyncDependencies(binding);
     switch (asyncDependencies.size()) {
       case 0:
@@ -292,7 +292,7 @@ private XFunSpec callProducesMethod(ProductionBinding binding, FactoryFields fac
     XFunSpecs.Builder methodBuilder =
         methodBuilder("callProducesMethod")
             .returns(listenableFutureOf(contributedTypeName))
-            .addAnnotation(Override.class)
+            .isOverride(true)
             .addModifiers(PUBLIC)
             .addExceptions(asMethod(binding.bindingElement().get()).getThrownTypes())
             .addParameter(parameter);

dagger-compiler/main/java/dagger/internal/codegen/writing/SwitchingProviders.java

@@ -201,9 +201,9 @@ private ImmutableList<XFunSpec> getMethods() {
         // The case amount does not exceed MAX_CASES_PER_SWITCH, so no need for extra get methods.
         return ImmutableList.of(
             methodBuilder("get")
+                .isOverride(true)
                 .addModifiers(PUBLIC)
                 .addAnnotation(suppressWarnings(UNCHECKED))
-                .addAnnotation(Override.class)
                 .returns(typeVariable)
                 .addCode(getOnlyElement(switchCodeBlockPartitions))
                 .build());
@@ -212,8 +212,8 @@ private ImmutableList<XFunSpec> getMethods() {
       // This is the main public "get" method that will route to private getter methods.
       XFunSpecs.Builder routerMethod =
           methodBuilder("get")
+              .isOverride(true)
               .addModifiers(PUBLIC)
-              .addAnnotation(Override.class)
               .returns(typeVariable)
               .beginControlFlow("switch (id / %L)", MAX_CASES_PER_SWITCH);
 

dagger-compiler/main/java/dagger/internal/codegen/xprocessing/XFunSpecs.java

@@ -38,8 +38,6 @@
 import androidx.room.compiler.processing.XType;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeVariableName;
 import com.squareup.kotlinpoet.KModifier;
@@ -75,7 +73,7 @@ public static Builder overridingWithoutParameters(
     Builder builder =
         // We're overriding the method so we have to use the jvm name here.
         methodBuilder(method.getJvmName())
-            .addAnnotation(Override.class)
+            .isOverride(true)
             .addAnnotationNames(nullability.nonTypeUseNullableAnnotations())
             .addTypeVariables(methodType.getTypeVariables())
             .varargs(method.isVarArgs())
@@ -115,8 +113,8 @@ private static enum Kind {
     private XTypeName returnType = null;
     private final List<XCodeBlock> javadocs = new ArrayList<>();
     private final List<XParameterSpec> parameters = new ArrayList<>();
+    private final List<XAnnotationSpec> annotations = new ArrayList<>();
     // For now, we use a Object to allow for both XPoet and JavaPoet types.
-    private final List<Object> annotations = new ArrayList<>();
     private final List<Object> typeVariableNames = new ArrayList<>();
     private final List<Object> exceptionNames = new ArrayList<>();
 
@@ -280,18 +278,6 @@ public Builder addAnnotations(Collection<XAnnotationSpec> annotations) {
       return this;
     }
 
-    /**
-     * Adds the given annotations to the method.
-     *
-     * @deprecated Use {@link #addAnnotation(XAnnotationSpec)} instead.
-     */
-    @Deprecated
-    @CanIgnoreReturnValue
-    public Builder addJavaAnnotations(Collection<AnnotationSpec> annotations) {
-      annotations.forEach(this::addAnnotation);
-      return this;
-    }
-
     /** Adds the given annotation names to the method. */
     @CanIgnoreReturnValue
     public Builder addAnnotationNames(Collection<XClassName> annotationNames) {
@@ -305,42 +291,15 @@ public Builder addAnnotation(XAnnotation annotation) {
       return addAnnotation(XAnnotationSpecs.of(annotation));
     }
 
-    /** Adds the given annotation to the method. */
-    @CanIgnoreReturnValue
-    public Builder addAnnotation(XAnnotationSpec annotation) {
-      annotations.add(annotation);
-      return this;
-    }
-
     /** Adds the given annotation name to the method. */
     @CanIgnoreReturnValue
     public Builder addAnnotation(XClassName annotationName) {
       return addAnnotation(XAnnotationSpec.of(annotationName));
     }
 
-    /**
-     * Adds the given annotation to the method.
-     *
-     * @deprecated Use {@link #addAnnotation(XClassName)} instead.
-     */
-    @Deprecated
-    @CanIgnoreReturnValue
-    public Builder addAnnotation(Class<?> clazz) {
-      if (clazz.equals(Override.class)) {
-        isOverride(true);
-      }
-      addAnnotation(AnnotationSpec.builder(ClassName.get(clazz)).build());
-      return this;
-    }
-
-    /**
-     * Adds the given annotation to the method.
-     *
-     * @deprecated Use {@link #addAnnotation(XAnnotationSpec)} instead.
-     */
-    @Deprecated
+    /** Adds the given annotation to the method. */
     @CanIgnoreReturnValue
-    public Builder addAnnotation(AnnotationSpec annotation) {
+    public Builder addAnnotation(XAnnotationSpec annotation) {
       annotations.add(annotation);
       return this;
     }
@@ -505,12 +464,6 @@ public XFunSpec build() {
                   isOpen,
                   isOverride,
                   /* addJavaNullabilityAnnotation= */ false);
-          // If the override annotation exists, remove it from the builder and it will be added
-          // with the other annotations to avoid unnecessary diffs during the migration.
-          AnnotationSpec overrideAnnotation = AnnotationSpec.builder(Override.class).build();
-          if (annotations.contains(overrideAnnotation)) {
-            toJavaPoet(builder).annotations.remove(overrideAnnotation);
-          }
           break;
         case CONSTRUCTOR:
           checkState(name == null);
@@ -570,15 +523,7 @@ public XFunSpec build() {
         }
       }
 
-      for (Object annotation : annotations) {
-        if (annotation instanceof XAnnotationSpec) {
-          builder.addAnnotation((XAnnotationSpec) annotation);
-        } else if (annotation instanceof AnnotationSpec) {
-          toJavaPoet(builder).addAnnotation((AnnotationSpec) annotation);
-        } else {
-          throw new AssertionError("Unexpected annotation class: " + annotation.getClass());
-        }
-      }
+      annotations.forEach(builder::addAnnotation);
 
       for (Object exceptionName : exceptionNames) {
         if (exceptionName instanceof XTypeName) {

dagger-compiler/main/java/dagger/internal/codegen/xprocessing/XTypeNames.kt

@@ -16,12 +16,9 @@
 
 package dagger.internal.codegen.xprocessing
 
-import androidx.room.compiler.codegen.XAnnotationSpec
 import androidx.room.compiler.codegen.XClassName
 import androidx.room.compiler.codegen.XTypeName
 import androidx.room.compiler.codegen.box
-import androidx.room.compiler.codegen.compat.XConverters.toJavaPoet
-import androidx.room.compiler.codegen.compat.XConverters.toKotlinPoet
 import androidx.room.compiler.codegen.compat.XConverters.toXPoet
 import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.ClassName
@@ -99,6 +96,7 @@ object XTypeNames {
   @JvmField val SET_BUILDER = XClassName.get("dagger.internal", "SetBuilder")
   @JvmField val SET_FACTORY = XClassName.get("dagger.internal", "SetFactory")
   @JvmField val SINGLE_CHECK = XClassName.get("dagger.internal", "SingleCheck")
+  @JvmField val WEAK = XClassName.get("dagger.internal", "Weak")
   @JvmField val LAZY = XClassName.get("dagger", "Lazy")
 
   // Dagger Producers classnames
@@ -169,6 +167,13 @@ object XTypeNames {
   @JvmField val RUNTIME_EXCEPTION = XClassName.get("java.lang", "RuntimeException")
   @JvmField
   val UNSUPPORTED_OPERATION_EXCEPTION = XClassName.get("java.lang", "UnsupportedOperationException")
+  @JvmField
+  val DEPRECATED = toXPoet(
+    ClassName.get("java.lang", "Deprecated"),
+    com.squareup.kotlinpoet.ClassName("kotlin", "Deprecated")
+  )
+  @JvmField val CAN_IGNORE_RETURN_VALUE =
+   XClassName.get("com.google.errorprone.annotations", "CanIgnoreReturnValue")
 
   @JvmField val KOTLIN_METADATA = XClassName.get("kotlin", "Metadata")
   @JvmField val IMMUTABLE_MAP = XClassName.get("com.google.common.collect", "ImmutableMap")

javatests/dagger/internal/codegen/goldens/AssistedFactoryTest_assistedParamConflictsWithComponentFieldName_successfulyDeduped_FAST_INIT_MODE_test.DaggerTestComponent

@@ -74,8 +74,8 @@ final class DaggerTestComponent {
         this.id = id;
       }
 
-      @SuppressWarnings("unchecked")
       @Override
+      @SuppressWarnings("unchecked")
       public T get() {
         switch (id) {
           case 0: // test.FooFactory