Merge pull request #447 from avaje/dependabot/maven/org.jetbrains-annotations-24.0.1

Bump org.jetbrains:annotations from 13.0 to 24.0.1

Author: github-actions[bot]

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

@@ -52,7 +52,8 @@ String builderGetDependency(String builder) {
     if (isGenericParam()) {
       sb.append("TYPE_").append(type.shortName().replace(".", "_"));
     } else {
-      sb.append(Util.shortName(fieldType)).append(".class");
+      var trimmed = Util.trimAnnotations(fieldType);
+      sb.append(Util.shortName(trimmed)).append(".class");
     }
     if (name != null) {
       sb.append(",\"").append(name).append("\"");

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

@@ -24,12 +24,12 @@
 
 @GenerateAPContext
 @SupportedAnnotationTypes({
-  Constants.INJECTMODULE,
-  Constants.FACTORY,
-  Constants.SINGLETON,
-  Constants.COMPONENT,
-  Constants.PROTOTYPE,
-  Constants.SCOPE,
+  InjectModulePrism.PRISM_TYPE,
+  FactoryPrism.PRISM_TYPE,
+  SingletonPrism.PRISM_TYPE,
+  ComponentPrism.PRISM_TYPE,
+  PrototypePrism.PRISM_TYPE,
+  ScopePrism.PRISM_TYPE,
   Constants.TESTSCOPE,
   Constants.CONTROLLER,
   ImportPrism.PRISM_TYPE,
@@ -61,56 +61,58 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
     pluginFileProvided.forEach(defaultScope::pluginProvided);
   }
 
-  /**
-   * Loads provider files generated by avaje-inject-maven-plugin
-   */
+  /** Loads provider files generated by avaje-inject-maven-plugin */
   void loadProvidedFiles(Filer filer) {
     pluginFileProvided.addAll(lines(filer, "target/avaje-plugin-provides.txt", "/target/classes"));
     moduleFileProvided.addAll(lines(filer, "target/avaje-module-provides.txt", "/target/classes"));
-    pluginFileProvided.addAll(lines(filer, "build/avaje-plugin-provides.txt", "/build/classes/java/main"));
-    moduleFileProvided.addAll(lines(filer, "build/avaje-module-provides.txt", "/build/classes/java/main"));
+    pluginFileProvided.addAll(
+        lines(filer, "build/avaje-plugin-provides.txt", "/build/classes/java/main"));
+    moduleFileProvided.addAll(
+        lines(filer, "build/avaje-module-provides.txt", "/build/classes/java/main"));
   }
 
   private static List<String> lines(Filer filer, String relativeName, String replace) {
     try {
       final String resource = resource(filer, relativeName, replace);
       try (var inputStream = new URI(resource).toURL().openStream();
-           var reader = new BufferedReader(new InputStreamReader(inputStream))) {
+          var reader = new BufferedReader(new InputStreamReader(inputStream))) {
         return reader.lines().collect(Collectors.toList());
       }
     } catch (final Exception e) {
       return Collections.emptyList();
     }
   }
 
-  private static String resource(Filer filer, String relativeName, String replace) throws IOException {
+  private static String resource(Filer filer, String relativeName, String replace)
+      throws IOException {
     return filer
-      .getResource(StandardLocation.CLASS_OUTPUT, "", relativeName)
-      .toUri()
-      .toString()
-      .replace(replace, "");
+        .getResource(StandardLocation.CLASS_OUTPUT, "", relativeName)
+        .toUri()
+        .toString()
+        .replace(replace, "");
   }
 
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
 
     APContext.setProjectModuleElement(annotations, roundEnv);
     readModule(roundEnv);
+
     addImportedAspects(importedAspects(roundEnv));
-    readScopes(roundEnv.getElementsAnnotatedWith(typeElement(Constants.SCOPE)));
-    readFactories(roundEnv.getElementsAnnotatedWith(typeElement(Constants.FACTORY)));
+    getElements(roundEnv, ScopePrism.PRISM_TYPE).ifPresent(this::readScopes);
+    getElements(roundEnv, FactoryPrism.PRISM_TYPE).ifPresent(this::readFactories);
+
     if (defaultScope.includeSingleton()) {
-      readBeans(roundEnv.getElementsAnnotatedWith(typeElement(Constants.SINGLETON)));
+      getElements(roundEnv, SingletonPrism.PRISM_TYPE).ifPresent(this::readBeans);
     }
-    readBeans(roundEnv.getElementsAnnotatedWith(typeElement(Constants.COMPONENT)));
-    readBeans(roundEnv.getElementsAnnotatedWith(typeElement(Constants.PROTOTYPE)));
+    getElements(roundEnv, ComponentPrism.PRISM_TYPE).ifPresent(this::readBeans);
+    getElements(roundEnv, PrototypePrism.PRISM_TYPE).ifPresent(this::readBeans);
+
     readImported(importedElements(roundEnv));
-    readBeans(roundEnv.getElementsAnnotatedWith(typeElement(Constants.PROTOTYPE)));
-    final var typeElement = elementUtils.getTypeElement(Constants.CONTROLLER);
-    if (typeElement != null) {
-      readBeans(roundEnv.getElementsAnnotatedWith(typeElement));
-    }
-    readBeans(roundEnv.getElementsAnnotatedWith(typeElement(Constants.PROXY)));
+
+    getElements(roundEnv, Constants.CONTROLLER).ifPresent(this::readBeans);
+    getElements(roundEnv, ProxyPrism.PRISM_TYPE).ifPresent(this::readBeans);
+
     allScopes.readBeans(roundEnv);
     defaultScope.write(roundEnv.processingOver());
     allScopes.write(roundEnv.processingOver());
@@ -121,13 +123,20 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     return false;
   }
 
+  // Optional because these annotations are not guaranteed to exist
+  private static Optional<? extends Set<? extends Element>> getElements(
+      RoundEnvironment round, String name) {
+    return Optional.ofNullable(typeElement(name)).map(round::getElementsAnnotatedWith);
+  }
+
   private Set<TypeElement> importedElements(RoundEnvironment roundEnv) {
-    return roundEnv.getElementsAnnotatedWith(typeElement(ImportPrism.PRISM_TYPE)).stream()
-      .map(ImportPrism::getInstanceOn)
-      .flatMap(p -> p.value().stream())
-      .map(ProcessingContext::asElement)
-      .filter(this::notAlreadyProvided)
-      .collect(Collectors.toSet());
+    return getElements(roundEnv, ImportPrism.PRISM_TYPE).stream()
+        .flatMap(Set::stream)
+        .map(ImportPrism::getInstanceOn)
+        .flatMap(p -> p.value().stream())
+        .map(ProcessingContext::asElement)
+        .filter(this::notAlreadyProvided)
+        .collect(Collectors.toSet());
   }
 
   private boolean notAlreadyProvided(TypeElement e) {
@@ -136,12 +145,10 @@ private boolean notAlreadyProvided(TypeElement e) {
   }
 
   private static Map<String, AspectImportPrism> importedAspects(RoundEnvironment roundEnv) {
-    return Optional.ofNullable(typeElement(AspectImportPrism.PRISM_TYPE))
-      .map(roundEnv::getElementsAnnotatedWith)
-      .stream()
-      .flatMap(Set::stream)
-      .map(AspectImportPrism::getInstanceOn)
-      .collect(Collectors.toMap(p -> p.value().toString(), p -> p));
+    return getElements(roundEnv, AspectImportPrism.PRISM_TYPE).stream()
+        .flatMap(Set::stream)
+        .map(AspectImportPrism::getInstanceOn)
+        .collect(Collectors.toMap(p -> p.value().toString(), p -> p));
   }
 
   private void readScopes(Set<? extends Element> scopes) {
@@ -154,9 +161,7 @@ private void readScopes(Set<? extends Element> scopes) {
     addTestScope();
   }
 
-  /**
-   * Add built-in test scope for <code>@TestScope</code> if available.
-   */
+  /** Add built-in test scope for <code>@TestScope</code> if available. */
   private void addTestScope() {
     final var testScopeType = elementUtils.getTypeElement(Constants.TESTSCOPE);
     if (testScopeType != null) {
@@ -177,7 +182,8 @@ private void readImported(Set<? extends Element> beans) {
   }
 
   /** Read the beans that have changed. */
-  private void readChangedBeans(Set<TypeElement> beans, boolean factory, boolean importedComponent) {
+  private void readChangedBeans(
+      Set<TypeElement> beans, boolean factory, boolean importedComponent) {
     for (final var typeElement : beans) {
       if (typeElement.getKind() == ElementKind.INTERFACE) {
         continue;
@@ -196,9 +202,7 @@ private void readChangedBeans(Set<TypeElement> beans, boolean factory, boolean i
     }
   }
 
-  /**
-   * Find the scope if the Factory has a scope annotation.
-   */
+  /** Find the scope if the Factory has a scope annotation. */
   private ScopeInfo findScope(Element element) {
     for (final AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
       final var scopeInfo = allScopes.get(annotationMirror.getAnnotationType().toString());
@@ -209,9 +213,7 @@ private ScopeInfo findScope(Element element) {
     return null;
   }
 
-  /**
-   * Read the existing meta-data from InjectModule (if found) and the factory bean (if exists).
-   */
+  /** Read the existing meta-data from InjectModule (if found) and the factory bean (if exists). */
   private void readModule(RoundEnvironment roundEnv) {
     if (readModuleInfo) {
       // only read the module meta data once
@@ -229,20 +231,22 @@ private void readModule(RoundEnvironment roundEnv) {
     readInjectModule(roundEnv);
   }
 
-  /**
-   * Read InjectModule for things like package-info etc (not for custom scopes)
-   */
+  /** Read InjectModule for things like package-info etc (not for custom scopes) */
   private void readInjectModule(RoundEnvironment roundEnv) {
+
     // read other that are annotated with InjectModule
-    for (final Element element : roundEnv.getElementsAnnotatedWith(typeElement(Constants.INJECTMODULE))) {
-      final var scope = ScopePrism.getInstanceOn(element);
-      if (scope == null) {
-        // it it not a custom scope annotation
-        final var annotation = InjectModulePrism.getInstanceOn(element);
-        if (annotation != null) {
-          defaultScope.details(annotation.name(), element);
-        }
-      }
-    }
+    getElements(roundEnv, InjectModulePrism.PRISM_TYPE).stream()
+        .flatMap(Set::stream)
+        .forEach(
+            element -> {
+              final var scope = ScopePrism.getInstanceOn(element);
+              if (scope == null) {
+                // it it not a custom scope annotation
+                final var annotation = InjectModulePrism.getInstanceOn(element);
+                if (annotation != null) {
+                  defaultScope.details(annotation.name(), element);
+                }
+              }
+            });
   }
 }

inject-test/pom.xml

@@ -91,8 +91,7 @@
     <dependency>
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-<!--      <version>24.0.1</version>-->
-      <version>13.0</version>
+      <version>24.0.1</version>
       <scope>test</scope>
     </dependency>