Additional changes in generators, processors, rx sources from EP project

OleksandrKucherenko · Jun 23, 2020 · e5dc180 · e5dc180
1 parent aa2162b
commit e5dc180
Show file tree

Hide file tree

Showing 10 changed files with 389 additions and 294 deletions.
diff --git a/autoproxy-generators/src/main/java/com/olku/generators/RetBoolGenerator.java b/autoproxy-generators/src/main/java/com/olku/generators/RetBoolGenerator.java
@@ -1,10 +1,11 @@
-package com.olku.generators;
+package net.easypark.generators;
+
+import androidx.annotation.*;
 
-import com.olku.annotations.RetBool;
 import com.squareup.javapoet.MethodSpec;
 import com.sun.tools.javac.code.Type;
 
-import androidx.annotation.NonNull;
+import net.easypark.annotations.RetBool;
 
 /** Compose return types for boolean. */
 public class RetBoolGenerator implements ReturnsPoet {
@@ -28,6 +29,6 @@ public boolean compose(@NonNull final Type returnType,
     }
 
     private static final class Singleton {
-        /* package */ static final RetBoolGenerator INSTANCE = new RetBoolGenerator();
+        static final RetBoolGenerator INSTANCE = new RetBoolGenerator();
     }
 }
diff --git a/autoproxy-generators/src/main/java/com/olku/generators/RetNumberGenerator.java b/autoproxy-generators/src/main/java/com/olku/generators/RetNumberGenerator.java
@@ -1,14 +1,15 @@
-package com.olku.generators;
+package net.easypark.generators;
+
+import androidx.annotation.*;
 
-import com.olku.annotations.RetNumber;
 import com.squareup.javapoet.MethodSpec;
 import com.sun.tools.javac.code.Type;
 
+import net.easypark.annotations.RetNumber;
+
 import java.util.Map;
 import java.util.TreeMap;
 
-import androidx.annotation.NonNull;
-
 /** Compose return types for boolean. */
 public class RetNumberGenerator implements ReturnsPoet {
     private static final Map<String, Class<?>> PRIMITIVES = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@@ -55,6 +56,6 @@ public boolean compose(@NonNull final Type returnType,
     }
 
     private static final class Singleton {
-        /* package */ static final RetNumberGenerator INSTANCE = new RetNumberGenerator();
+        static final RetNumberGenerator INSTANCE = new RetNumberGenerator();
     }
 }
diff --git a/autoproxy-generators/src/main/java/com/olku/generators/ReturnsGenerator.java b/autoproxy-generators/src/main/java/com/olku/generators/ReturnsGenerator.java
@@ -1,10 +1,11 @@
-package com.olku.generators;
+package net.easypark.generators;
+
+import androidx.annotation.NonNull;
 
-import com.olku.annotations.Returns;
 import com.squareup.javapoet.MethodSpec;
 import com.sun.tools.javac.code.Type;
 
-import androidx.annotation.NonNull;
+import net.easypark.annotations.Returns;
 
 /** Compose return types for boolean. */
 public class ReturnsGenerator implements ReturnsPoet {
@@ -40,10 +41,17 @@ public boolean compose(@NonNull final Type returnType,
             return true;
         }
 
+        // Builders support, return instance for chained calls
+        if (Returns.THIS.equals(type)) {
+            builder.addComment("return current instance");
+            builder.addStatement("return ($T)this", returnType);
+            return true;
+        }
+
         return false;
     }
 
     private static final class Singleton {
-        /* package */ static final ReturnsGenerator INSTANCE = new ReturnsGenerator();
+        static final ReturnsGenerator INSTANCE = new ReturnsGenerator();
     }
 }
diff --git a/autoproxy-generators/src/main/java/com/olku/generators/ReturnsPoet.java b/autoproxy-generators/src/main/java/com/olku/generators/ReturnsPoet.java
@@ -1,10 +1,10 @@
-package com.olku.generators;
+package net.easypark.generators;
+
+import androidx.annotation.*;
 
 import com.squareup.javapoet.MethodSpec;
 import com.sun.tools.javac.code.Type;
 
-import androidx.annotation.NonNull;
-
 /** Code generator interface. */
 public interface ReturnsPoet {
     /** Compose return statement for provided method based on return type and modifier. */

diff --git a/autoproxy-processor/src/main/java/com/olku/processors/AutoProxyProcessor.java b/autoproxy-processor/src/main/java/com/olku/processors/AutoProxyProcessor.java
@@ -1,13 +1,16 @@
-package com.olku.processors;
+package net.easypark.processors;
 
 import com.google.auto.service.AutoService;
-import com.olku.annotations.AutoProxy;
-import com.olku.annotations.AutoProxyClassGenerator;
+
+import net.easypark.annotations.AutoProxy;
+import net.easypark.annotations.AutoProxyClassGenerator;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -26,7 +29,11 @@
 import static javax.tools.Diagnostic.Kind.ERROR;
 import static javax.tools.Diagnostic.Kind.NOTE;
 
-/** Annotation processor. Generate proxy class for interface. */
+/**
+ * Annotation processor. Generate proxy class for interface.
+ *
+ * @see <a href="https://docs.gradle.org/nightly/userguide/java_plugin.html#sec:incremental_annotation_processing">Incremental Annotation Processing</a>
+ */
 @AutoService(Processor.class)
 @SuppressWarnings("unused")
 public class AutoProxyProcessor extends AbstractProcessor {
@@ -36,6 +43,8 @@ public class AutoProxyProcessor extends AbstractProcessor {
     private Types typesUtil;
     private Elements elementsUtil;
     private Filer filer;
+    /** @see <a href="https://github.com/evernote/android-state/commit/0072478291e2735223d6c14cb79a6b26524ec075#diff-6">Support incremental annotation processing</a> */
+    private HashMap<String, List<Element>> mMapGeneratedFileToOriginatingElements = new LinkedHashMap<>();
 
     @Override
     public synchronized void init(final ProcessingEnvironment pe) {
@@ -56,11 +65,6 @@ public Set<String> getSupportedAnnotationTypes() {
         return annotations;
     }
 
-    @Override
-    public Set<String> getSupportedOptions() {
-        return Collections.singleton("org.gradle.annotation.processing.aggregating");
-    }
-
     @Override
     public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.latestSupported();
@@ -85,9 +89,14 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
 
                 final AutoProxyClassGenerator generator = tp.generator();
 
-                if (!generator.compose(filer)) {
-//                    logger.printMessage(ERROR, generator.getErrors());
-                    logger.printMessage(NOTE, generator.getErrors());
+                if (generator.compose(filer)) {
+                    if (IS_DEBUG) logger.printMessage(NOTE, "--- file: " + generator.getName());
+                    if (IS_DEBUG) logger.printMessage(NOTE, "--- elements: " + generator.getOriginating().size());
+                    if (IS_DEBUG) logger.printMessage(NOTE, "--- elements: " + generator.getOriginating().get(0).getSimpleName());
+
+                    mMapGeneratedFileToOriginatingElements.put(generator.getName(), generator.getOriginating());
+                } else {
+                    logger.printMessage(IS_DEBUG ? ERROR : NOTE, generator.getErrors());
                 }
             } catch (Throwable e) {
                 e.printStackTrace(new PrintWriter(errors));
@@ -100,10 +109,13 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
         }
 
         if (failed > 0) {
-//            logger.printMessage(NOTE, errors.toString());
             logger.printMessage(ERROR, errors.toString());
         }
 
         return true;
     }
+
+    public HashMap<String, List<Element>> getMapGeneratedFileToOriginatingElements() {
+        return mMapGeneratedFileToOriginatingElements;
+    }
 }