More little cleanups and consolidating options (#11)

Author: ZacSweers

src/main/kotlin/com/slack/auto/value/kotlin/AutoValueKotlinExtension.kt

@@ -50,23 +50,17 @@ import javax.lang.model.util.Elements
 import javax.lang.model.util.Types
 import javax.tools.Diagnostic
 
-public class AutoValueKotlinExtension(private val realMessager: Messager) : AutoValueExtension() {
-
-  public companion object {
-    // Options
-    public const val OPT_SRC: String = "avkSrc"
-    public const val OPT_TARGETS: String = "avkTargets"
-    public const val OPT_IGNORE_NESTED: String = "avkIgnoreNested"
-  }
+public class AutoValueKotlinExtension(
+  private val realMessager: Messager,
+  private val options: Options
+) : AutoValueExtension() {
 
   internal val collectedKclassees = ConcurrentHashMap<ClassName, KotlinClass>()
   internal val collectedEnums = ConcurrentHashMap<ClassName, TypeSpec>()
   private lateinit var elements: Elements
   private lateinit var types: Types
 
-  override fun getSupportedOptions(): Set<String> {
-    return setOf(OPT_SRC, OPT_TARGETS, OPT_IGNORE_NESTED)
-  }
+  override fun getSupportedOptions(): Set<String> = Options.ALL
 
   override fun incrementalType(processingEnvironment: ProcessingEnvironment): IncrementalExtensionType {
     // This is intentionally not incremental, we are generating into source sets directly
@@ -91,11 +85,6 @@ public class AutoValueKotlinExtension(private val realMessager: Messager) : Auto
     classToExtend: String,
     isFinal: Boolean
   ): String? {
-    val options = Options(context.processingEnvironment().options)
-
-    val ignoreNested =
-      context.processingEnvironment().options[OPT_IGNORE_NESTED]?.toBoolean() ?: false
-
     if (options.targets.isNotEmpty() && context.autoValueClass().simpleName.toString() !in options.targets) {
       return null
     }
@@ -109,7 +98,7 @@ public class AutoValueKotlinExtension(private val realMessager: Messager) : Auto
         AutoValue::class.java
       )
       if (!isParentAv) {
-        val diagnosticKind = if (ignoreNested) {
+        val diagnosticKind = if (options.ignoreNested) {
           Diagnostic.Kind.WARNING
         } else {
           Diagnostic.Kind.ERROR

src/main/kotlin/com/slack/auto/value/kotlin/AutoValueKotlinProcessor.kt

@@ -48,6 +48,7 @@ import javax.lang.model.element.NestingKind
 import javax.lang.model.element.NestingKind.TOP_LEVEL
 import javax.lang.model.element.TypeElement
 import javax.tools.Diagnostic.Kind
+import javax.tools.Diagnostic.Kind.ERROR
 import javax.tools.FileObject
 import javax.tools.JavaFileManager.Location
 import javax.tools.JavaFileObject
@@ -60,6 +61,12 @@ public class AutoValueKotlinProcessor : AbstractProcessor() {
 
   private val collectedClasses: MutableMap<ClassName, KotlinClass> = ConcurrentHashMap<ClassName, KotlinClass>()
   private val collectedEnums: MutableMap<ClassName, TypeSpec> = ConcurrentHashMap<ClassName, TypeSpec>()
+  private lateinit var options: Options
+
+  override fun init(processingEnv: ProcessingEnvironment) {
+    super.init(processingEnv)
+    options = Options(processingEnv.options)
+  }
 
   override fun getSupportedAnnotationTypes(): Set<String> {
     return setOf(AutoValue::class.java.canonicalName)
@@ -69,38 +76,24 @@ public class AutoValueKotlinProcessor : AbstractProcessor() {
     return SourceVersion.latest()
   }
 
+  @Suppress("ReturnCount")
   override fun process(
     annotations: Set<TypeElement>,
     roundEnv: RoundEnvironment
   ): Boolean {
-    // Load extensions ourselves
-    @Suppress("TooGenericExceptionCaught", "SwallowedException")
-    val extensions = try {
-      ServiceLoader.load(AutoValueExtension::class.java).toList()
-    } catch (e: Exception) {
-      emptyList()
+    val avClasses = roundEnv.getElementsAnnotatedWith(AutoValue::class.java)
+    if (avClasses.isNotEmpty()) {
+      processAvElements(annotations, roundEnv, avClasses)
     }
 
-    // Make our extension
-    val avkExtension = AutoValueKotlinExtension(processingEnv.messager)
-
-    // Create an in-memory av processor and run it
-    val avProcessor = AutoValueProcessor(extensions + avkExtension)
-    avProcessor.init(object : ProcessingEnvironment by processingEnv {
-      override fun getMessager(): Messager = NoOpMessager
-
-      override fun getFiler(): Filer = NoOpFiler
-    })
-    avProcessor.process(annotations, roundEnv)
-
-    // Save off our extracted classes
-    collectedClasses += avkExtension.collectedKclassees
-    collectedEnums += avkExtension.collectedEnums
-
     // We're done processing, write all our collected classes down
     if (roundEnv.processingOver()) {
+      if (collectedClasses.isEmpty()) {
+        processingEnv.messager.printMessage(ERROR, "No AutoValue classes found")
+        return false
+      }
       val srcDir =
-        processingEnv.options[AutoValueKotlinExtension.OPT_SRC] ?: error("Missing src dir option")
+        processingEnv.options[Options.OPT_SRC] ?: error("Missing src dir option")
       val roots = collectedClasses.filterValues { it.isTopLevel }
         .toMutableMap()
       for ((_, root) in roots) {
@@ -128,6 +121,41 @@ public class AutoValueKotlinProcessor : AbstractProcessor() {
       }
       .build()
   }
+
+  private fun processAvElements(
+    annotations: Set<TypeElement>,
+    roundEnv: RoundEnvironment,
+    avClasses: Set<Element>
+  ) {
+    if (options.targets.isNotEmpty() && avClasses.none { it.simpleName.toString() in options.targets }) {
+      // Nothing to do this round
+      return
+    }
+
+    // Load extensions ourselves
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    val extensions = try {
+      ServiceLoader.load(AutoValueExtension::class.java, AutoValueExtension::class.java.classLoader).toList()
+    } catch (e: Exception) {
+      emptyList()
+    }
+
+    // Make our extension
+    val avkExtension = AutoValueKotlinExtension(processingEnv.messager, options)
+
+    // Create an in-memory av processor and run it
+    val avProcessor = AutoValueProcessor(extensions + avkExtension)
+    avProcessor.init(object : ProcessingEnvironment by processingEnv {
+      override fun getMessager(): Messager = NoOpMessager
+
+      override fun getFiler(): Filer = NoOpFiler
+    })
+    avProcessor.process(annotations, roundEnv)
+
+    // Save off our extracted classes
+    collectedClasses += avkExtension.collectedKclassees
+    collectedEnums += avkExtension.collectedEnums
+  }
 }
 
 private object NoOpMessager : Messager {

src/test/kotlin/com/slack/auto/value/kotlin/AutoValueKotlinExtensionTest.kt

@@ -1154,7 +1154,7 @@ class AutoValueKotlinExtensionTest {
         """.trimIndent()
       )
     ) {
-      withOptions(listOf(compilerSrcOption(), "-A${AutoValueKotlinExtension.OPT_IGNORE_NESTED}=true"))
+      withOptions(listOf(compilerSrcOption(), "-A${Options.OPT_IGNORE_NESTED}=true"))
     }
 
     result.succeeded()
@@ -1191,7 +1191,7 @@ class AutoValueKotlinExtensionTest {
         """.trimIndent()
       )
     ) {
-      withOptions(listOf(compilerSrcOption(), "-A${AutoValueKotlinExtension.OPT_TARGETS}=Example"))
+      withOptions(listOf(compilerSrcOption(), "-A${Options.OPT_TARGETS}=Example"))
     }
 
     result.succeeded()
@@ -1288,7 +1288,7 @@ class AutoValueKotlinExtensionTest {
   }
 
   private fun compilerSrcOption(): String {
-    return "-A${AutoValueKotlinExtension.OPT_SRC}=${srcDir.absolutePath}"
+    return "-A${Options.OPT_SRC}=${srcDir.absolutePath}"
   }
 
   private fun compile(vararg sourceFiles: JavaFileObject, compilerBody: Compiler.() -> Compiler = { this }): CompilationSubject {