#70 - Change inject-generator to detect any @PostConstruct @PreDestroy in any package - so javax.annotation, jakarta.annotation etc

Author: rbygrave

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

@@ -4,8 +4,6 @@
 import io.avaje.inject.Primary;
 import io.avaje.inject.Secondary;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Qualifier;
@@ -71,7 +69,7 @@ class BeanReader {
   BeanReader(TypeElement beanType, ProcessingContext context) {
     this.beanType = beanType;
     this.type = beanType.getQualifiedName().toString();
-    this.shortName = beanType.getSimpleName().toString();
+    this.shortName = shortName(beanType);
     this.context = context;
     this.requestParams = new BeanRequestParams(type);
     init();
@@ -267,18 +265,35 @@ private void readMethod(Element element, boolean factory) {
     }
 
     if (context.isPostConstructAvailable()) {
-      PostConstruct pcMarker = element.getAnnotation(PostConstruct.class);
-      if (pcMarker != null) {
+      if (hasAnnotationWithName(element, "PostConstruct")) {
         postConstructMethod = element;
       }
 
-      PreDestroy pdMarker = element.getAnnotation(PreDestroy.class);
-      if (pdMarker != null) {
+      if (hasAnnotationWithName(element, "PreDestroy")) {
         preDestroyMethod = element;
       }
     }
   }
 
+  /**
+   * Return true if the element has an annotation with the matching short name.
+   */
+  private boolean hasAnnotationWithName(Element element, String matchShortName) {
+    for (AnnotationMirror mirror : element.getAnnotationMirrors()) {
+      if (matchShortName.equals(shortName(mirror.getAnnotationType().asElement()))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Return the short name of the element.
+   */
+  private String shortName(Element element) {
+    return element.getSimpleName().toString();
+  }
+
   private void addFactoryMethod(ExecutableElement methodElement, Bean bean) {
     // Not yet reading Qualifier annotations, Named only at this stage
     Named named = methodElement.getAnnotation(Named.class);

pom.xml

@@ -22,7 +22,7 @@
   <modules>
     <module>inject</module>
     <module>inject-generator</module>
-<!--    <module>inject-test</module>-->
+    <module>inject-test</module>
   </modules>
 </project>