Tweaks for PostConstruct/PreDestory changes (#75)

* Allow PostConstruct/PreDestory annotations from other packages.

* Remove javax.annotation-api dependency since it is no longer strictly required.

Author: norrisjeremy

inject-generator/pom.xml

@@ -19,12 +19,6 @@
       <version>2.1-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3.2</version>
-    </dependency>
-
     <!-- test dependencies -->
     <dependency>
       <groupId>org.avaje.composite</groupId>

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

@@ -264,14 +264,12 @@ private void readMethod(Element element, boolean factory) {
       }
     }
 
-    if (context.isPostConstructAvailable()) {
-      if (hasAnnotationWithName(element, "PostConstruct")) {
-        postConstructMethod = element;
-      }
+    if (hasAnnotationWithName(element, "PostConstruct")) {
+      postConstructMethod = element;
+    }
 
-      if (hasAnnotationWithName(element, "PreDestroy")) {
-        preDestroyMethod = element;
-      }
+    if (hasAnnotationWithName(element, "PreDestroy")) {
+      preDestroyMethod = element;
     }
   }
 

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

@@ -5,7 +5,6 @@ class Constants {
   static final String KOTLIN_METADATA = "kotlin.Metadata";
   static final String GENERATED_9 = "javax.annotation.processing.Generated";
 
-  static final String POSTCONSTRUCT = "javax.annotation.PostConstruct";
   static final String PROVIDER = "javax.inject.Provider";
 
   static final String PATH = "io.avaje.http.api.Path";

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

@@ -5,7 +5,8 @@
 
 class IncludeAnnotations {
 
-  private static final String[] EXCLUDED_PREFIX = {"javax.annotation.", "javax.inject.", "io.avaje.inject.", "lombok."};
+  private static final String[] EXCLUDED_PREFIX = {"javax.annotation.", "javax.inject.", "jakarta.annotation.", "jakarta.inject.", "io.avaje.inject.", "lombok."};
+  private static final String[] EXCLUDED_SUFFIX = {".PostConstruct", ".PreDestory"};
 
   /**
    * Annotations that we don't bother registering lists for.
@@ -26,6 +27,11 @@ static boolean include(String annotationType) {
         return false;
       }
     }
+    for (String suffix : EXCLUDED_SUFFIX) {
+      if (annotationType.endsWith(suffix)) {
+        return false;
+      }
+    }
     return !EXCLUDED_ANNOTATIONS.contains(annotationType);
   }
 }

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

@@ -60,10 +60,6 @@ private boolean isTypeAvailable(String canonicalName) {
     return null != elementUtils.getTypeElement(canonicalName);
   }
 
-  boolean isPostConstructAvailable() {
-    return isTypeAvailable(Constants.POSTCONSTRUCT);
-  }
-
   boolean isGeneratedAvailable() {
     return generatedAnnotation != null;
   }

inject-test/pom.xml

@@ -25,6 +25,12 @@
     </dependency>
 
     <!-- test dependencies -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>