Merge branch 'master' into jakarta-master

Author: rbygrave

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

@@ -339,12 +339,8 @@ MetaData createMeta() {
     return metaData;
   }
 
-  boolean isFieldInjectionRequired() {
-    return !injectFields.isEmpty();
-  }
-
-  boolean isMethodInjectionRequired() {
-    return !injectMethods.isEmpty();
+  boolean isExtraInjectionRequired() {
+    return !injectFields.isEmpty() || !injectMethods.isEmpty();
   }
 
   void buildAddFor(Append writer) {
@@ -356,12 +352,10 @@ void buildAddFor(Append writer) {
   }
 
   void buildRegister(Append writer) {
-
     writer.append("      ");
-    if (isFieldInjectionRequired() || isLifecycleRequired()) {
+    if (isExtraInjectionRequired() || isLifecycleRequired()) {
       writer.append("%s $bean = ", shortName);
     }
-
     String flags = primary ? "Primary" : secondary ? "Secondary" : "";
     writer.append("builder.register%s(bean, ", flags);
     if (name == null) {

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

@@ -6,7 +6,7 @@
 class IncludeAnnotations {
 
   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", ".PreDestroy"};
+  private static final String[] EXCLUDED_SUFFIX = {".PostConstruct", ".PreDestroy", ".Generated"};
 
   /**
    * Annotations that we don't bother registering lists for.

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

@@ -130,7 +130,7 @@ private void writeStaticFactoryMethod() {
     if (beanReader.isLifecycleRequired()) {
       beanReader.buildAddLifecycle(writer);
     }
-    if (beanReader.isFieldInjectionRequired() || beanReader.isMethodInjectionRequired()) {
+    if (beanReader.isExtraInjectionRequired()) {
       writer.append("      builder.addInjector(b -> {").eol();
       writer.append("        // field and method injection").eol();
       for (FieldReader fieldReader : beanReader.getInjectFields()) {

inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java

@@ -34,6 +34,7 @@ public void exclude_kotlinMetaData() {
   @Test
   public void exclude_di_annotations() {
     assertFalse(include("javax.annotation.Generated"));
+    assertFalse(include("foo.Generated"));
     assertFalse(include(Singleton.class.getName()));
     assertFalse(include(Named.class.getName()));
     assertFalse(include(Factory.class.getName()));

inject-test/src/test/java/org/example/coffee/qualifier/Green.java

@@ -0,0 +1,11 @@
+package org.example.coffee.qualifier;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Retention(RUNTIME)
+public @interface Green {
+}

inject-test/src/test/java/org/example/coffee/qualifier/GreenStore.java

@@ -2,6 +2,7 @@
 
 import jakarta.inject.Singleton;
 
+@Green
 @Singleton
 public class GreenStore implements SomeStore {
   @Override

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifier.java

@@ -0,0 +1,28 @@
+package org.example.coffee.qualifier;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class StoreManagerWithSetterQualifier {
+
+  private final SomeStore blueStore;
+  private SomeStore greenStore;
+
+  public StoreManagerWithSetterQualifier(@Blue SomeStore blueStore) {
+    this.blueStore = blueStore;
+  }
+
+  @Inject
+  public void setGreenStore(@Green SomeStore greenStore) {
+    this.greenStore = greenStore;
+  }
+
+  public String blueStore() {
+    return blueStore.store();
+  }
+
+  public String greenStore() {
+    return greenStore.store();
+  }
+}

inject-test/src/test/java/org/example/coffee/qualifier/StoreManagerWithSetterQualifierTest.java

@@ -0,0 +1,18 @@
+package org.example.coffee.qualifier;
+
+import io.avaje.inject.BeanContext;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class StoreManagerWithSetterQualifierTest {
+
+  @Test
+  void redStore() {
+    try (BeanContext context = BeanContext.newBuilder().build()) {
+      StoreManagerWithSetterQualifier manager = context.getBean(StoreManagerWithSetterQualifier.class);
+      assertThat(manager.blueStore()).isEqualTo("blue");
+      assertThat(manager.greenStore()).isEqualTo("green");
+    }
+  }
+}