Experimental support for incremental annotation processing with Gradle. TODO: services

imeszaros · imeszaros · commit 28f53bc77fa7 · 2020-07-19T01:45:58.000+02:00
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
@@ -124,7 +124,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
   private void build(Filer filer) throws Exception {
     Types typeUtils = processingEnv.getTypeUtils();
-    Map<String, List<HandlerCompiler>> classes = new LinkedHashMap<>();
+    Map<TypeElement, List<HandlerCompiler>> classes = new LinkedHashMap<>();
     for (Map.Entry<TypeElement, Map<TypeElement, List<ExecutableElement>>> e : routeMap
         .entrySet()) {
       TypeElement type = e.getKey();
@@ -150,7 +150,6 @@ private void build(Filer filer) throws Exception {
             }
           }
         }
-        String typeName = typeUtils.erasure(type.asType()).toString();
         /** Route method ready, creates a Route.Handler for each of them: */
         for (Map.Entry<TypeElement, List<ExecutableElement>> mapping : mappings.entrySet()) {
           TypeElement httpMethod = mapping.getKey();
@@ -162,7 +161,7 @@ private void build(Filer filer) throws Exception {
               debug("  route %s %s", httpMethod.getSimpleName(), path);
               HandlerCompiler compiler = new HandlerCompiler(processingEnv, type, method,
                   httpMethod, path);
-              classes.computeIfAbsent(typeName, k -> new ArrayList<>())
+              classes.computeIfAbsent(type, k -> new ArrayList<>())
                   .add(compiler);
             }
           }
@@ -171,18 +170,20 @@ private void build(Filer filer) throws Exception {
     }
 
     List<String> moduleList = new ArrayList<>();
-    for (Map.Entry<String, List<HandlerCompiler>> entry : classes.entrySet()) {
+    for (Map.Entry<TypeElement, List<HandlerCompiler>> entry : classes.entrySet()) {
+      TypeElement type = entry.getKey();
+      String typeName = typeUtils.erasure(type.asType()).toString();
       List<HandlerCompiler> handlers = entry.getValue();
-      ModuleCompiler module = new ModuleCompiler(processingEnv, entry.getKey());
+      ModuleCompiler module = new ModuleCompiler(processingEnv, typeName);
       String moduleClass = module.getModuleClass();
       byte[] moduleBin = module.compile(handlers);
       onClass(moduleClass, moduleBin);
-      writeClass(filer.createClassFile(moduleClass), moduleBin);
+      writeClass(filer.createClassFile(moduleClass, type), moduleBin);
 
       moduleList.add(moduleClass);
     }
 
-    doServices(filer, moduleList);
+    //doServices(filer, moduleList);
   }
 
   private String signature(ExecutableElement method) {
diff --git a/modules/jooby-apt/src/main/resources/META-INF/gradle/incremental.annotation.processors b/modules/jooby-apt/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+io.jooby.apt.JoobyProcessor,isolating

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment`
`124`	`124`
`125`	`125`	`private void build(Filer filer) throws Exception {`
`126`	`126`	`Types typeUtils = processingEnv.getTypeUtils();`
`127`		`- Map<String, List<HandlerCompiler>> classes = new LinkedHashMap<>();`
	`127`	`+ Map<TypeElement, List<HandlerCompiler>> classes = new LinkedHashMap<>();`
`128`	`128`	`for (Map.Entry<TypeElement, Map<TypeElement, List<ExecutableElement>>> e : routeMap`
`129`	`129`	`.entrySet()) {`
`130`	`130`	`TypeElement type = e.getKey();`
`@@ -150,7 +150,6 @@ private void build(Filer filer) throws Exception {`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`
`153`		`- String typeName = typeUtils.erasure(type.asType()).toString();`
`154`	`153`	`/** Route method ready, creates a Route.Handler for each of them: */`
`155`	`154`	`for (Map.Entry<TypeElement, List<ExecutableElement>> mapping : mappings.entrySet()) {`
`156`	`155`	`TypeElement httpMethod = mapping.getKey();`
`@@ -162,7 +161,7 @@ private void build(Filer filer) throws Exception {`
`162`	`161`	`debug(" route %s %s", httpMethod.getSimpleName(), path);`
`163`	`162`	`HandlerCompiler compiler = new HandlerCompiler(processingEnv, type, method,`
`164`	`163`	`httpMethod, path);`
`165`		`- classes.computeIfAbsent(typeName, k -> new ArrayList<>())`
	`164`	`+ classes.computeIfAbsent(type, k -> new ArrayList<>())`
`166`	`165`	`.add(compiler);`
`167`	`166`	`}`
`168`	`167`	`}`
`@@ -171,18 +170,20 @@ private void build(Filer filer) throws Exception {`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`List<String> moduleList = new ArrayList<>();`
`174`		`- for (Map.Entry<String, List<HandlerCompiler>> entry : classes.entrySet()) {`
	`173`	`+ for (Map.Entry<TypeElement, List<HandlerCompiler>> entry : classes.entrySet()) {`
	`174`	`+ TypeElement type = entry.getKey();`
	`175`	`+ String typeName = typeUtils.erasure(type.asType()).toString();`
`175`	`176`	`List<HandlerCompiler> handlers = entry.getValue();`
`176`		`- ModuleCompiler module = new ModuleCompiler(processingEnv, entry.getKey());`
	`177`	`+ ModuleCompiler module = new ModuleCompiler(processingEnv, typeName);`
`177`	`178`	`String moduleClass = module.getModuleClass();`
`178`	`179`	`byte[] moduleBin = module.compile(handlers);`
`179`	`180`	`onClass(moduleClass, moduleBin);`
`180`		`- writeClass(filer.createClassFile(moduleClass), moduleBin);`
	`181`	`+ writeClass(filer.createClassFile(moduleClass, type), moduleBin);`
`181`	`182`
`182`	`183`	`moduleList.add(moduleClass);`
`183`	`184`	`}`
`184`	`185`
`185`		`- doServices(filer, moduleList);`
	`186`	`+ //doServices(filer, moduleList);`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`private String signature(ExecutableElement method) {`