order constants

avaje · Feb 8, 2023 · 2b20e1b · 2b20e1b
1 parent 80dcb5c
commit 2b20e1b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -320,7 +320,7 @@ boolean isRequestScopedController() {
   }
 
   String suffix() {
-    return isRequestScopedController() ? Constants.FACTORY : Constants.DI;
+    return isRequestScopedController() ? Constants.DOLLAR_FACTORY : Constants.DI;
   }
 
   /**

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Constants.java b/inject-generator/src/main/java/io/avaje/inject/generator/Constants.java
@@ -4,17 +4,19 @@ final class Constants {
 
   static final int ORDERING_DEFAULT = 1000;
 
-  static final String FACTORY = "$Factory";
+  static final String DOLLAR_FACTORY = "$Factory";
   static final String DI = "$DI";
   static final String IO_CLOSEABLE = "java.io.Closeable";
   static final String AUTO_CLOSEABLE = "java.lang.AutoCloseable";
   static final String OPTIONAL = "java.util.Optional";
   static final String KOTLIN_METADATA = "kotlin.Metadata";
   static final String TYPE = "java.lang.reflect.Type";
 
-  static final String PROVIDER = "jakarta.inject.Provider";
   static final String SINGLETON = "jakarta.inject.Singleton";
   static final String INJECT = "jakarta.inject.Inject";
+  static final String SCOPE = "jakarta.inject.Scope";
+  static final String QUALIFIER = "jakarta.inject.Qualifier";
+  static final String NAMED = "jakarta.inject.Named";
 
   static final String PATH = "io.avaje.http.api.Path";
   static final String CONTROLLER = "io.avaje.http.api.Controller";
@@ -30,6 +32,12 @@ final class Constants {
   static final String BEANSCOPE = "io.avaje.inject.BeanScope";
   static final String INJECTMODULE = "io.avaje.inject.InjectModule";
   static final String TESTSCOPE = "io.avaje.inject.test.TestScope";
+  static final String PRIMARY = "io.avaje.inject.Primary";
+  static final String SECONDARY = "io.avaje.inject.Secondary";
+  static final String PROTOTYPE = "io.avaje.inject.Prototype";
+  static final String COMPONENT = "io.avaje.inject.Component";
+  static final String FACTORY = "io.avaje.inject.Factory";
+  static final String BEAN = "io.avaje.inject.Bean";
 
   static final String REFLECT_METHOD = "java.lang.reflect.Method";
   static final String ASPECT = "io.avaje.inject.aop.Aspect";
@@ -46,9 +54,4 @@ final class Constants {
   static final String DEPENDENCYMETA = "io.avaje.inject.spi.DependencyMeta";
   static final String MODULE = "io.avaje.inject.spi.Module";
   static final String GENERICTYPE = "io.avaje.inject.spi.GenericType";
-
-  static final String COMPONENT = "io.avaje.inject.Component";
-  static final String PROTOTYPE = "io.avaje.inject.Prototype";
-  static final String SCOPE = "jakarta.inject.Scope";
-  static final String INJECT_FACTORY = "io.avaje.inject.Factory";
 }
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java b/inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java
@@ -29,17 +29,17 @@ private static boolean moduleCP() {
     }
   }
 
-  public static Set<String> registerModuleProvidedTypes(Set<String> providedTypes) {
+  public static void registerModuleProvidedTypes(Set<String> providedTypes) {
 
-    if (!injectAvailable) return Set.of();
+    if (!injectAvailable) return;
 
     Iterator<Module> iterator =
         ServiceLoader.load(Module.class, ExternalProvider.class.getClassLoader()).iterator();
-    
+
     while (iterator.hasNext()) {
-    	
+
       try {
-    	  Module module = iterator.next();
+        Module module = iterator.next();
         for (final Class<?> provide : module.provides()) {
           providedTypes.add(provide.getCanonicalName());
         }
@@ -53,7 +53,6 @@ public static Set<String> registerModuleProvidedTypes(Set<String> providedTypes)
         // ignore expected error reading the module that we are also writing
       }
     }
-    return providedTypes;
   }
 
   /**

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java b/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java
@@ -26,7 +26,7 @@
 
 @SupportedAnnotationTypes({
   Constants.INJECTMODULE,
-  Constants.INJECT_FACTORY,
+  Constants.FACTORY,
   Constants.SINGLETON,
   Constants.COMPONENT,
   Constants.PROTOTYPE,
@@ -93,7 +93,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     readModule(roundEnv);
     readScopes(roundEnv.getElementsAnnotatedWith(context.element(Constants.SCOPE)));
     readChangedBeans(
-        roundEnv.getElementsAnnotatedWith(context.element(Constants.INJECT_FACTORY)), true);
+        roundEnv.getElementsAnnotatedWith(context.element(Constants.FACTORY)), true);
     if (defaultScope.includeSingleton()) {
       readChangedBeans(
           roundEnv.getElementsAnnotatedWith(context.element(Constants.SINGLETON)), false);

diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java b/inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java
@@ -30,10 +30,10 @@ public void exclude_di_annotations() {
     assertFalse(include("javax.annotation.Generated"));
     assertFalse(include("foo.Generated"));
     assertFalse(include(Constants.SINGLETON));
-    assertFalse(include("jakarta.inject.Named"));
-    assertFalse(include(Constants.INJECT_FACTORY));
-    assertFalse(include("io.avaje.inject.Primary"));
-    assertFalse(include("io.avaje.inject.Secondary"));
+    assertFalse(include(Constants.NAMED));
+    assertFalse(include(Constants.FACTORY));
+    assertFalse(include(Constants.PRIMARY));
+    assertFalse(include(Constants.SECONDARY));
     assertFalse(include(Constants.PATH));
   }