Changing to aggregating type and enable by default.

imeszaros · imeszaros · commit fac8cad9e768 · 2020-07-20T09:49:17.000+02:00
diff --git a/docs/asciidoc/mvc-api.adoc b/docs/asciidoc/mvc-api.adoc
@@ -66,21 +66,6 @@ To create a new MVC project open the `jooby` console and type:
 The <<getting-started, jooby console>> takes care of all configuration steps required by the
 annotation processing tool.
 
-Using Gradle? You may enable incremental annotation processing support:
-
-.build.gradle
-[source, groovy, role = "secondary", subs="verbatim,attributes"]
-----
-tasks.withType(JavaCompile) {
-    options.compilerArgs += [
-        '-parameters',
-        '-Ajooby.incremental=true'
-    ]
-}
-----
-
-This will cause however – due to technical a limitation – that generated classes will be loaded with reflection instead of the `ServiceLoader`.
-
 === Registration
 
 Mvc routes need to be registered (no classpath scanning). Registration is done from your application
diff --git a/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java b/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java
@@ -74,7 +74,7 @@ public class JoobyProcessor extends AbstractProcessor {
 
     if (incremental) {
       // enables incremental annotation processing support in Gradle
-      options.add("org.gradle.annotation.processing.isolating");
+      options.add("org.gradle.annotation.processing.aggregating");
     }
 
     return options;
@@ -93,7 +93,7 @@ public class JoobyProcessor extends AbstractProcessor {
     this.processingEnv = processingEnvironment;
 
     debug = boolOpt(processingEnv, OPT_DEBUG, false);
-    incremental = boolOpt(processingEnv, OPT_INCREMENTAL, false);
+    incremental = boolOpt(processingEnv, OPT_INCREMENTAL, true);
 
     debug("Incremental annotation processing is turned %s.", incremental ? "ON" : "OFF");
   }
@@ -193,7 +193,7 @@ private void build(Filer filer) throws Exception {
       }
     }
 
-    List<String> moduleList = new ArrayList<>();
+    Map<TypeElement, String> modules = new LinkedHashMap<>();
     for (Map.Entry<TypeElement, List<HandlerCompiler>> entry : classes.entrySet()) {
       TypeElement type = entry.getKey();
       String typeName = typeUtils.erasure(type.asType()).toString();
@@ -204,14 +204,10 @@ private void build(Filer filer) throws Exception {
       onClass(moduleClass, moduleBin);
       writeClass(filer.createClassFile(moduleClass, type), moduleBin);
 
-      moduleList.add(moduleClass);
+      modules.put(type, moduleClass);
     }
 
-    if (!incremental) {
-      // writing resource files would prevent incremental annotation processing in Gradle:
-      // https://docs.gradle.org/5.0/userguide/java_plugin.html#sec:incremental_annotation_processing
-      doServices(filer, moduleList);
-    }
+    doServices(filer, modules);
   }
 
   private String signature(ExecutableElement method) {
@@ -244,12 +240,14 @@ private void debug(String format, Object... args) {
     }
   }
 
-  private void doServices(Filer filer, List<String> moduleList) throws IOException {
+  private void doServices(Filer filer, Map<TypeElement, String> modules) throws IOException {
     String location = "META-INF/services/" + MvcFactory.class.getName();
+    Element[] originatingElements = modules.keySet().toArray(new Element[0]);
     debug("%s", location);
-    FileObject resource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", location);
+    FileObject resource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", location, originatingElements);
     StringBuilder content = new StringBuilder();
-    for (String classname : moduleList) {
+    for (Map.Entry<TypeElement, String> e : modules.entrySet()) {
+      String classname = e.getValue();
       debug("  %s", classname);
       content.append(classname).append(System.getProperty("line.separator"));
     }
diff --git a/modules/jooby-cli/src/main/resources/cli/build.gradle.hbs b/modules/jooby-cli/src/main/resources/cli/build.gradle.hbs
@@ -69,7 +69,7 @@ tasks.withType(JavaCompile) {
   options.compilerArgs += [
     '-parameters',
 {{#if apt}}
-    '-Ajooby.incremental=false',
+    '-Ajooby.incremental=true',
     '-Ajooby.debug=false'
 {{/if}}
   ]
@@ -80,7 +80,7 @@ tasks.withType(JavaCompile) {
 {{#if kapt}}
 kapt {
   arguments {
-    arg('jooby.incremental', false)
+    arg('jooby.incremental', true)
     arg('jooby.debug', false)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public class JoobyProcessor extends AbstractProcessor {`
`74`	`74`
`75`	`75`	`if (incremental) {`
`76`	`76`	`// enables incremental annotation processing support in Gradle`
`77`		`- options.add("org.gradle.annotation.processing.isolating");`
	`77`	`+ options.add("org.gradle.annotation.processing.aggregating");`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`return options;`
`@@ -93,7 +93,7 @@ public class JoobyProcessor extends AbstractProcessor {`
`93`	`93`	`this.processingEnv = processingEnvironment;`
`94`	`94`
`95`	`95`	`debug = boolOpt(processingEnv, OPT_DEBUG, false);`
`96`		`- incremental = boolOpt(processingEnv, OPT_INCREMENTAL, false);`
	`96`	`+ incremental = boolOpt(processingEnv, OPT_INCREMENTAL, true);`
`97`	`97`
`98`	`98`	`debug("Incremental annotation processing is turned %s.", incremental ? "ON" : "OFF");`
`99`	`99`	`}`
`@@ -193,7 +193,7 @@ private void build(Filer filer) throws Exception {`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`196`		`- List<String> moduleList = new ArrayList<>();`
	`196`	`+ Map<TypeElement, String> modules = new LinkedHashMap<>();`
`197`	`197`	`for (Map.Entry<TypeElement, List<HandlerCompiler>> entry : classes.entrySet()) {`
`198`	`198`	`TypeElement type = entry.getKey();`
`199`	`199`	`String typeName = typeUtils.erasure(type.asType()).toString();`
`@@ -204,14 +204,10 @@ private void build(Filer filer) throws Exception {`
`204`	`204`	`onClass(moduleClass, moduleBin);`
`205`	`205`	`writeClass(filer.createClassFile(moduleClass, type), moduleBin);`
`206`	`206`
`207`		`- moduleList.add(moduleClass);`
	`207`	`+ modules.put(type, moduleClass);`
`208`	`208`	`}`
`209`	`209`
`210`		`- if (!incremental) {`
`211`		`- // writing resource files would prevent incremental annotation processing in Gradle:`
`212`		`- // https://docs.gradle.org/5.0/userguide/java_plugin.html#sec:incremental_annotation_processing`
`213`		`- doServices(filer, moduleList);`
`214`		`- }`
	`210`	`+ doServices(filer, modules);`
`215`	`211`	`}`
`216`	`212`
`217`	`213`	`private String signature(ExecutableElement method) {`
`@@ -244,12 +240,14 @@ private void debug(String format, Object... args) {`
`244`	`240`	`}`
`245`	`241`	`}`
`246`	`242`
`247`		`- private void doServices(Filer filer, List<String> moduleList) throws IOException {`
	`243`	`+ private void doServices(Filer filer, Map<TypeElement, String> modules) throws IOException {`
`248`	`244`	`String location = "META-INF/services/" + MvcFactory.class.getName();`
	`245`	`+ Element[] originatingElements = modules.keySet().toArray(new Element[0]);`
`249`	`246`	`debug("%s", location);`
`250`		`- FileObject resource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", location);`
	`247`	`+ FileObject resource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", location, originatingElements);`
`251`	`248`	`StringBuilder content = new StringBuilder();`
`252`		`- for (String classname : moduleList) {`
	`249`	`+ for (Map.Entry<TypeElement, String> e : modules.entrySet()) {`
	`250`	`+ String classname = e.getValue();`
`253`	`251`	`debug(" %s", classname);`
`254`	`252`	`content.append(classname).append(System.getProperty("line.separator"));`
`255`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ tasks.withType(JavaCompile) {`
`69`	`69`	`options.compilerArgs += [`
`70`	`70`	`'-parameters',`
`71`	`71`	`{{#if apt}}`
`72`		`- '-Ajooby.incremental=false',`
	`72`	`+ '-Ajooby.incremental=true',`
`73`	`73`	`'-Ajooby.debug=false'`
`74`	`74`	`{{/if}}`
`75`	`75`	`]`
`@@ -80,7 +80,7 @@ tasks.withType(JavaCompile) {`
`80`	`80`	`{{#if kapt}}`
`81`	`81`	`kapt {`
`82`	`82`	`arguments {`
`83`		`- arg('jooby.incremental', false)`
	`83`	`+ arg('jooby.incremental', true)`
`84`	`84`	`arg('jooby.debug', false)`
`85`	`85`	`}`
`86`	`86`	`}`