Rollback of 2cce0be

PiperOrigin-RevId: 463883860
google · Jul 28, 2022 · b9413ba · b9413ba
1 parent 2cce0be
commit b9413ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -21,13 +21,19 @@
 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;
 
 // TODO(bcorso): Consider moving these methods into XProcessing library.
 /** 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));