#60 - Refactor internal IncludeAnnotations to use prefix tests to exclude registering annotations

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/IncludeAnnotations.java

@@ -1,39 +1,30 @@
 package io.avaje.inject.generator;
 
-import io.avaje.inject.Factory;
-import io.avaje.inject.Primary;
-import io.avaje.inject.Secondary;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
 import java.util.HashSet;
 import java.util.Set;
 
 class IncludeAnnotations {
 
+  private static final String[] EXCLUDED_PREFIX = {"javax.annotation.", "javax.inject.", "io.avaje.inject.", "lombok."};
+
   /**
    * Annotations that we don't bother registering lists for.
    */
   private static final Set<String> EXCLUDED_ANNOTATIONS = new HashSet<>();
 
   static {
-    EXCLUDED_ANNOTATIONS.add("javax.annotation.Generated");
-    EXCLUDED_ANNOTATIONS.add(Singleton.class.getName());
-    EXCLUDED_ANNOTATIONS.add(Named.class.getName());
-    EXCLUDED_ANNOTATIONS.add(Factory.class.getName());
-    EXCLUDED_ANNOTATIONS.add(Primary.class.getName());
-    EXCLUDED_ANNOTATIONS.add(Secondary.class.getName());
     EXCLUDED_ANNOTATIONS.add(Constants.KOTLIN_METADATA);
     EXCLUDED_ANNOTATIONS.add(Constants.PATH);
-    EXCLUDED_ANNOTATIONS.add(Constants.GENERATED_9);
   }
 
   /**
    * Return true if the annotation should be included.
    */
   static boolean include(String annotationType) {
-    if (annotationType.startsWith("lombok.")) {
-      return false;
+    for (String prefix : EXCLUDED_PREFIX) {
+      if (annotationType.startsWith(prefix)) {
+        return false;
+      }
     }
     return !EXCLUDED_ANNOTATIONS.contains(annotationType);
   }

inject-test/src/test/java/io/avaje/inject/SystemContextTest.java

@@ -1,11 +1,11 @@
 package io.avaje.inject;
 
+import org.example.coffee.fruit.Fruit;
 import org.example.coffee.list.ASomei;
 import org.example.coffee.list.BSomei;
 import org.example.coffee.list.Somei;
 import org.junit.jupiter.api.Test;
 
-import javax.annotation.Priority;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,7 +33,7 @@ public void getBeansUnsorted_withPriority() {
   @Test
   public void getBeansWithAnnotation() {
 
-    final List<Object> beans = SystemContext.getBeansWithAnnotation(Priority.class);
+    final List<Object> beans = SystemContext.getBeansWithAnnotation(Fruit.class);
     assertThat(beans).hasSize(2);
   }
 }

inject-test/src/test/java/org/example/coffee/fruit/BananaService.java

@@ -3,6 +3,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+@Fruit
 @Singleton
 class BananaService {
 

inject-test/src/test/java/org/example/coffee/fruit/Fruit.java

@@ -0,0 +1,9 @@
+package org.example.coffee.fruit;
+
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+public @interface Fruit {
+}

inject-test/src/test/java/org/example/coffee/fruit/PeachService.java

@@ -2,6 +2,7 @@
 
 import javax.inject.Singleton;
 
+@Fruit
 @Singleton
 class PeachService {