From b9413baa1084b5ceaad43685457d7a3ab4202bd6 Mon Sep 17 00:00:00 2001
From: Brad Corso <bcorso@google.com>
Date: Thu, 28 Jul 2022 11:25:25 -0700
Subject: [PATCH] Rollback of
 https://github.com/google/dagger/commit/2cce0be5e8d32ffd0cb0d73594b39f5aeea40c80

PiperOrigin-RevId: 463883860
---
 java/dagger/internal/codegen/writing/GwtCompatibility.java | 3 +--
 java/dagger/internal/codegen/writing/InjectionMethods.java | 4 ++--
 java/dagger/internal/codegen/xprocessing/XAnnotations.java | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/java/dagger/internal/codegen/writing/GwtCompatibility.java b/java/dagger/internal/codegen/writing/GwtCompatibility.java
index d67a93b7a8a..17eb8a5b87c 100644
--- a/java/dagger/internal/codegen/writing/GwtCompatibility.java
+++ b/java/dagger/internal/codegen/writing/GwtCompatibility.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import androidx.room.compiler.processing.JavaPoetExtKt;
 import androidx.room.compiler.processing.XAnnotation;
 import androidx.room.compiler.processing.XElement;
 import com.squareup.javapoet.AnnotationSpec;
@@ -39,7 +38,7 @@ static Optional<AnnotationSpec> gwtIncompatibleAnnotation(Binding binding) {
       Optional<AnnotationSpec> gwtIncompatible =
           element.getAllAnnotations().stream()
               .filter(GwtCompatibility::isGwtIncompatible)
-              .map(JavaPoetExtKt::toAnnotationSpec)
+              .map(XAnnotations::getAnnotationSpec)
               .findFirst();
       if (gwtIncompatible.isPresent()) {
         return gwtIncompatible;
diff --git a/java/dagger/internal/codegen/writing/InjectionMethods.java b/java/dagger/internal/codegen/writing/InjectionMethods.java
index 4da02cba8e6..60811936b95 100644
--- a/java/dagger/internal/codegen/writing/InjectionMethods.java
+++ b/java/dagger/internal/codegen/writing/InjectionMethods.java
@@ -52,7 +52,6 @@
 import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.lang.model.element.Modifier.STATIC;
 
-import androidx.room.compiler.processing.JavaPoetExtKt;
 import androidx.room.compiler.processing.XAnnotation;
 import androidx.room.compiler.processing.XConstructorElement;
 import androidx.room.compiler.processing.XExecutableElement;
@@ -79,6 +78,7 @@
 import dagger.internal.codegen.compileroption.CompilerOptions;
 import dagger.internal.codegen.extension.DaggerCollectors;
 import dagger.internal.codegen.javapoet.TypeNames;
+import dagger.internal.codegen.xprocessing.XAnnotations;
 import dagger.spi.model.DaggerAnnotation;
 import dagger.spi.model.DependencyRequest;
 import java.util.List;
@@ -434,7 +434,7 @@ private static MethodSpec fieldProxy(
                     .build())
             .addTypeVariables(typeVariableNames(enclosingType));
 
-    qualifier.map(JavaPoetExtKt::toAnnotationSpec).ifPresent(builder::addAnnotation);
+    qualifier.map(XAnnotations::getAnnotationSpec).ifPresent(builder::addAnnotation);
 
     boolean useObject = !isRawTypePubliclyAccessible(enclosingType.getType());
     UniqueNameSet parameterNameSet = new UniqueNameSet();
diff --git a/java/dagger/internal/codegen/xprocessing/XAnnotations.java b/java/dagger/internal/codegen/xprocessing/XAnnotations.java
index b02d30ad950..43729252ec3 100644
--- a/java/dagger/internal/codegen/xprocessing/XAnnotations.java
+++ b/java/dagger/internal/codegen/xprocessing/XAnnotations.java
@@ -21,6 +21,7 @@
 import androidx.room.compiler.processing.XAnnotation;
 import com.google.auto.common.AnnotationMirrors;
 import com.google.common.base.Equivalence;
+import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
 import java.util.Arrays;
 
@@ -28,6 +29,11 @@
 /** A utility class for {@link XAnnotation} helper methods. */
 public final class XAnnotations {
 
+  /** Returns the {@link AnnotationSpec} for the given annotation */
+  public static AnnotationSpec getAnnotationSpec(XAnnotation annotation) {
+    return AnnotationSpec.get(toJavac(annotation));
+  }
+
   /** Returns the string representation of the given annotation. */
   public static String toString(XAnnotation annotation) {
     return AnnotationMirrors.toString(toJavac(annotation));