#24 - Support use of Java9+ javax.annotation.processing.Generated based on source version

Author: rbygrave

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>io.dinject</groupId>
   <artifactId>javalin-generator</artifactId>
-  <version>1.10-SNAPSHOT</version>
+  <version>1.11-SNAPSHOT</version>
 
   <parent>
     <groupId>org.avaje</groupId>

src/main/java/io/dinject/javalin/generator/Constants.java

@@ -11,7 +11,8 @@ class Constants {
   static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
 
   static final String SINGLETON = "javax.inject.Singleton";
-  static final String GENERATED = "javax.annotation.Generated";
+  static final String GENERATED_9 = "javax.annotation.processing.Generated";
+  static final String GENERATED_8 = "javax.annotation.Generated";
   static final String API_BUILDER = "io.javalin.apibuilder.ApiBuilder";
 
   static final String AT_GENERATED = "@Generated(\"io.dinject.javalin.generator\")";

src/main/java/io/dinject/javalin/generator/ControllerReader.java

@@ -59,8 +59,9 @@ class ControllerReader {
     this.interfaces = initInterfaces();
     this.interfaceMethods = initInterfaceMethods();
     this.roles = Util.findRoles(beanType);
-    if (ctx.isGeneratedAvailable()) {
-      importTypes.add(Constants.GENERATED);
+    final String generated = ctx.getGeneratedAnnotation();
+    if (generated != null) {
+      importTypes.add(generated);
     }
     if (ctx.isOpenApiAvailable()) {
       docHidden = initDocHidden();

src/main/java/io/dinject/javalin/generator/ProcessingContext.java

@@ -5,6 +5,7 @@
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
@@ -15,7 +16,8 @@
 import javax.tools.JavaFileObject;
 import java.io.IOException;
 
-import static io.dinject.javalin.generator.Constants.GENERATED;
+import static io.dinject.javalin.generator.Constants.GENERATED_8;
+import static io.dinject.javalin.generator.Constants.GENERATED_9;
 import static io.dinject.javalin.generator.Constants.JAVALIN3_CONTEXT;
 import static io.dinject.javalin.generator.Constants.OPENAPIDEFINITION;
 
@@ -25,7 +27,7 @@ public class ProcessingContext {
   private final Filer filer;
   private final Elements elements;
   private final Types types;
-  private final boolean generatedAvailable;
+  private final String generatedAnnotation;
   private final boolean openApiAvailable;
   private final boolean javalin3;
 
@@ -36,10 +38,18 @@ public class ProcessingContext {
     this.filer = env.getFiler();
     this.elements = env.getElementUtils();
     this.types = env.getTypeUtils();
-    this.generatedAvailable = isTypeAvailable(GENERATED);
     this.openApiAvailable = isTypeAvailable(OPENAPIDEFINITION);
     this.javalin3 = isTypeAvailable(JAVALIN3_CONTEXT);
     this.docContext = new DocContext(env, openApiAvailable);
+    boolean jdk8 = env.getSourceVersion().compareTo(SourceVersion.RELEASE_8) <= 0;
+    this.generatedAnnotation = generatedAnnotation(jdk8);
+  }
+
+  private String generatedAnnotation(boolean jdk8) {
+    if (jdk8) {
+      return isTypeAvailable(GENERATED_8) ? GENERATED_8 : null;
+    }
+    return isTypeAvailable(GENERATED_9) ? GENERATED_9 : null;
   }
 
   private boolean isTypeAvailable(String canonicalName) {
@@ -51,7 +61,11 @@ TypeElement getTypeElement(String canonicalName) {
   }
 
   boolean isGeneratedAvailable() {
-    return generatedAvailable;
+    return generatedAnnotation != null;
+  }
+
+  String getGeneratedAnnotation() {
+    return generatedAnnotation;
   }
 
   boolean isOpenApiAvailable() {