Remove dependency on JSR 305 annotations

Fixes #880 Closes #882 RELNOTES=Remove dependency on JSR 305 annotations ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=178784068
google · Dec 14, 2017 · 02de197 · 02de197
1 parent 4e74fce
commit 02de197
Show file tree

Hide file tree

Showing 25 changed files with 130 additions and 94 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -73,8 +73,8 @@ maven_jar(
 
 maven_jar(
     name = "com_google_auto_auto_common",
-    artifact = "com.google.auto:auto-common:0.8",
-    sha1 = "c6f7af0e57b9d69d81b05434ef9f3c5610d498c4",
+    artifact = "com.google.auto:auto-common:0.9",
+    sha1 = "766dd79e7e81cfefec890ffd6d63aa2807538def",
 )
 
 maven_jar(

diff --git a/java/dagger/android/BUILD b/java/dagger/android/BUILD
@@ -38,7 +38,6 @@ android_library(
         "//:dagger_with_compiler",
         "//third_party:auto_value",
         "//third_party:error_prone_annotations",
-        "//third_party:jsr305_annotations",
         "@androidsdk//com.android.support:support-annotations-25.0.0",
     ],
 )

diff --git a/java/dagger/android/support/BUILD b/java/dagger/android/support/BUILD
@@ -33,7 +33,6 @@ android_library(
         "//:dagger_with_compiler",
         "//java/dagger/android",
         "//third_party:error_prone_annotations",
-        "//third_party:jsr305_annotations",
         "@androidsdk//com.android.support:appcompat-v7-25.0.0",
         "@androidsdk//com.android.support:support-annotations-25.0.0",
         "@androidsdk//com.android.support:support-fragment-25.0.0",

diff --git a/java/dagger/grpc/server/BUILD b/java/dagger/grpc/server/BUILD
@@ -37,7 +37,6 @@ java_library(
         "//third_party:grpc_netty",
         "//third_party:grpc_protobuf",
         "//third_party:guava",
-        "//third_party:jsr305_annotations",
         "//third_party:jsr330_inject",
         "//third_party:protobuf",
     ],

diff --git a/java/dagger/internal/codegen/BUILD b/java/dagger/internal/codegen/BUILD
@@ -46,7 +46,6 @@ CODEGEN_SHARED_DEPS = [
     "//third_party:javapoet",
     "@local_jdk//:lib/tools.jar",
     "//third_party:jsr250_annotations",
-    "//third_party:jsr305_annotations",
     "//third_party:jsr330_inject",
     "//java/dagger:core",
     "//java/dagger/producers",

diff --git a/java/dagger/internal/codegen/ForwardingNetwork.java b/java/dagger/internal/codegen/ForwardingNetwork.java
@@ -25,7 +25,6 @@
 import com.google.common.graph.Network;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nullable;
 
 /** A {@link Network} that delegates all methods to another instance. */
 // TODO(dpb): Move to com.google.common.graph.
@@ -148,7 +147,7 @@ public Optional<E> edgeConnecting(N nodeU, N nodeV) {
   }
 
   @SuppressWarnings("MissingOverride") // Until Guava 23.0
-  @Nullable
+  // @Nullable // TODO(ronshapiro): replace with the checker framework?
   public E edgeConnectingOrNull(N nodeU, N nodeV) {
     return delegate().edgeConnectingOrNull(nodeU, nodeV);
   }

diff --git a/java/dagger/internal/codegen/SourceFileGenerator.java b/java/dagger/internal/codegen/SourceFileGenerator.java
@@ -16,6 +16,7 @@
 
 package dagger.internal.codegen;
 
+import static com.google.auto.common.GeneratedAnnotations.generatedAnnotation;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.Throwables;
@@ -24,7 +25,6 @@
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.TypeSpec;
 import java.util.Optional;
-import javax.annotation.Generated;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
 import javax.lang.model.element.Element;
@@ -40,18 +40,12 @@
 abstract class SourceFileGenerator<T> {
   private static final String GENERATED_COMMENTS = "https://google.github.io/dagger";
 
-  private static final AnnotationSpec GENERATED =
-      AnnotationSpec.builder(Generated.class)
-          .addMember("value", "$S", "dagger.internal.codegen.ComponentProcessor")
-          .addMember("comments", "$S", GENERATED_COMMENTS)
-          .build();
-
   private final Filer filer;
-  private final boolean generatedAnnotationAvailable;
+  private final Elements elements;
 
   SourceFileGenerator(Filer filer, Elements elements) {
     this.filer = checkNotNull(filer);
-    generatedAnnotationAvailable = elements.getTypeElement("javax.annotation.Generated") != null;
+    this.elements = checkNotNull(elements);
   }
 
   /**
@@ -86,13 +80,19 @@ void generate(T input) throws SourceFileGenerationException {
 
   private JavaFile buildJavaFile(
       ClassName generatedTypeName, TypeSpec.Builder typeSpecBuilder) {
-    if (generatedAnnotationAvailable) {
-      typeSpecBuilder.addAnnotation(GENERATED);
-    }
+    Optional<AnnotationSpec> generatedAnnotation =
+        generatedAnnotation(elements)
+            .map(
+                annotation ->
+                    AnnotationSpec.builder(ClassName.get(annotation))
+                        .addMember("value", "$S", "dagger.internal.codegen.ComponentProcessor")
+                        .addMember("comments", "$S", GENERATED_COMMENTS)
+                        .build());
+    generatedAnnotation.ifPresent(typeSpecBuilder::addAnnotation);
     JavaFile.Builder javaFileBuilder =
         JavaFile.builder(generatedTypeName.packageName(), typeSpecBuilder.build())
             .skipJavaLangImports(true);
-    if (!generatedAnnotationAvailable) {
+    if (!generatedAnnotation.isPresent()) {
       javaFileBuilder.addFileComment("Generated by Dagger ($L).", GENERATED_COMMENTS);
     }
     return javaFileBuilder.build();

diff --git a/javatests/dagger/internal/codegen/ComponentBuilderTest.java b/javatests/dagger/internal/codegen/ComponentBuilderTest.java
@@ -19,6 +19,7 @@
 import static com.google.testing.compile.CompilationSubject.assertThat;
 import static dagger.internal.codegen.Compilers.daggerCompiler;
 import static dagger.internal.codegen.GeneratedLines.GENERATED_ANNOTATION;
+import static dagger.internal.codegen.GeneratedLines.IMPORT_GENERATED_ANNOTATION;
 
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.JavaFileObjects;
@@ -217,7 +218,7 @@ public void testIgnoresModulesNotInApi() {
             "package test;",
             "",
             "import dagger.internal.Preconditions;",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerTestComponent implements TestComponent {",
@@ -406,7 +407,7 @@ public void testBuilderBindsInstanceNoCreateGenerated() {
             "package test;",
             "",
             "import dagger.internal.Preconditions;",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerSimpleComponent implements SimpleComponent {",

diff --git a/javatests/dagger/internal/codegen/ComponentProcessorTest.java b/javatests/dagger/internal/codegen/ComponentProcessorTest.java
@@ -22,6 +22,7 @@
 import static dagger.internal.codegen.CompilerMode.DEFAULT_MODE;
 import static dagger.internal.codegen.CompilerMode.EXPERIMENTAL_ANDROID_MODE;
 import static dagger.internal.codegen.GeneratedLines.GENERATED_ANNOTATION;
+import static dagger.internal.codegen.GeneratedLines.IMPORT_GENERATED_ANNOTATION;
 
 import com.google.auto.common.MoreElements;
 import com.google.common.base.Joiner;
@@ -284,7 +285,7 @@ public void componentWithInvalidModule() {
                 "",
                 "import dagger.Lazy;",
                 "import dagger.internal.DoubleCheck;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "import javax.inject.Provider;",
                 "",
                 GENERATED_ANNOTATION,
@@ -548,7 +549,7 @@ public void componentWithInvalidModule() {
                 "package test;",
                 "",
                 "import dagger.internal.Preconditions;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestComponent implements TestComponent {",
@@ -751,7 +752,7 @@ public void componentWithAbstractModule() {
         "package test;",
         "",
         "import dagger.internal.Preconditions;",
-        "import javax.annotation.Generated;",
+        IMPORT_GENERATED_ANNOTATION,
         "",
         GENERATED_ANNOTATION,
         "public final class DaggerTestComponent implements TestComponent {",
@@ -935,7 +936,7 @@ public void subcomponentNotGeneratedIfNotUsedInGraph() {
             "package test;",
             "",
             "import dagger.internal.Preconditions;",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerParent implements Parent {",
@@ -1466,7 +1467,7 @@ public void testDefaultPackage() {
             "package test;",
             "",
             "import dagger.internal.Preconditions;",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerBComponent implements BComponent {",
@@ -1554,7 +1555,7 @@ public void testDefaultPackage() {
             .addLines(
                 "package test;",
                 "",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestComponent implements TestComponent {",
@@ -1635,7 +1636,7 @@ public void testDefaultPackage() {
             "test.DaggerSimpleComponent",
             "package test;",
             "",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerSimpleComponent implements SimpleComponent {",
@@ -2103,7 +2104,7 @@ public void unusedSubcomponents_dontResolveExtraBindingsInParentComponents() {
             "package test;",
             "",
             "import dagger.internal.Preconditions;",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerParent implements Parent {",

diff --git a/javatests/dagger/internal/codegen/DelegateBindingExpressionTest.java b/javatests/dagger/internal/codegen/DelegateBindingExpressionTest.java
@@ -21,6 +21,7 @@
 import static dagger.internal.codegen.CompilerMode.EXPERIMENTAL_ANDROID_MODE;
 import static dagger.internal.codegen.Compilers.daggerCompiler;
 import static dagger.internal.codegen.GeneratedLines.GENERATED_ANNOTATION;
+import static dagger.internal.codegen.GeneratedLines.IMPORT_GENERATED_ANNOTATION;
 
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.CompilationSubject;
@@ -553,7 +554,7 @@ public void castNeeded_rawTypes_Provider_get() {
                 "package test;",
                 "",
                 "import dagger.internal.DoubleCheck;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "import javax.inject.Provider;",
                 "import other.Subtype_Factory;",
                 "import other.Supertype;",

diff --git a/javatests/dagger/internal/codegen/ElidedFactoriesTest.java b/javatests/dagger/internal/codegen/ElidedFactoriesTest.java
@@ -19,6 +19,7 @@
 import static com.google.testing.compile.CompilationSubject.assertThat;
 import static dagger.internal.codegen.Compilers.daggerCompiler;
 import static dagger.internal.codegen.GeneratedLines.GENERATED_ANNOTATION;
+import static dagger.internal.codegen.GeneratedLines.IMPORT_GENERATED_ANNOTATION;
 
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.JavaFileObjects;
@@ -81,7 +82,7 @@ public void simpleComponent() {
             "test.DaggerSimpleComponent",
             "package test;",
             "",
-            "import javax.annotation.Generated;",
+            IMPORT_GENERATED_ANNOTATION,
             "",
             GENERATED_ANNOTATION,
             "public final class DaggerSimpleComponent implements SimpleComponent {",
@@ -180,7 +181,7 @@ public void simpleComponent_injectsProviderOf_dependsOnScoped() {
                 "package test;",
                 "",
                 "import dagger.internal.MemoizedSentinel;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "import javax.inject.Provider;",
                 "",
                 GENERATED_ANNOTATION,
@@ -244,7 +245,7 @@ public void simpleComponent_injectsProviderOf_dependsOnScoped() {
                 "package test;",
                 "",
                 "import dagger.internal.DoubleCheck;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "import javax.inject.Provider;",
                 "",
                 GENERATED_ANNOTATION,
@@ -355,7 +356,7 @@ public void scopedBinding_onlyUsedInSubcomponent() {
                 "package test;",
                 "",
                 "import dagger.internal.MemoizedSentinel;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerSimpleComponent implements SimpleComponent {",
@@ -414,7 +415,7 @@ public void scopedBinding_onlyUsedInSubcomponent() {
                 "package test;",
                 "",
                 "import dagger.internal.DoubleCheck;",
-                "import javax.annotation.Generated;",
+                IMPORT_GENERATED_ANNOTATION,
                 "import javax.inject.Provider;",
                 "",
                 GENERATED_ANNOTATION,

diff --git a/javatests/dagger/internal/codegen/GeneratedLines.java b/javatests/dagger/internal/codegen/GeneratedLines.java
@@ -25,9 +25,23 @@
  */
 public final class GeneratedLines {
   public static final String GENERATED_ANNOTATION =
-      "@Generated("
-          + "value = \"dagger.internal.codegen.ComponentProcessor\", "
-          + "comments = \"https://google.github.io/dagger\")";
+     "@Generated("
+        + "value = \"dagger.internal.codegen.ComponentProcessor\", "
+        + "comments = \"https://google.github.io/dagger\")";
+
+  public static final String IMPORT_GENERATED_ANNOTATION =
+      isBeforeJava9()
+          ? "import javax.annotation.Generated;"
+          : "import javax.annotation.processing.Generated;";
+
+  private static boolean isBeforeJava9() {
+    try {
+      Class.forName("java.lang.Module");
+      return false;
+    } catch (ClassNotFoundException e) {
+      return true;
+    }
+  }
 
   public static final CodeBlock NPE_FROM_PROVIDES_METHOD =
       stringLiteral(ErrorMessages.CANNOT_RETURN_NULL_FROM_NON_NULLABLE_PROVIDES_METHOD);