From 4d88eb0b69236716d7ad499552c20e1b3912b17a Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Sun, 12 Jan 2025 22:37:41 -0500
Subject: [PATCH 01/12] [test] allow list injection for tests (#761)

* [test] allow list injection for tests

now can do
```java
@InjectTest
class ListInject {

  @Inject List<Somei> testSomei;

  @Test
  void test() {

    assertThat(testSomei).isNotEmpty();
  }
}
```

* also optional

* Update MetaReader.java

* remove if
---
 .../java/io/avaje/inject/test/MetaReader.java | 50 +++++++++++++------
 .../org/example/coffee/list/ListInject.java   | 22 ++++++++
 2 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 inject-test/src/test/java/org/example/coffee/list/ListInject.java

diff --git a/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java b/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
index 0d7a91b1d..ac02315c4 100644
--- a/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
+++ b/inject-test/src/main/java/io/avaje/inject/test/MetaReader.java
@@ -1,24 +1,27 @@
 package io.avaje.inject.test;
 
-import io.avaje.inject.BeanScope;
-import io.avaje.inject.BeanScopeBuilder;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Qualifier;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.mockito.internal.configuration.plugins.Plugins;
-import org.mockito.internal.util.reflection.GenericMaster;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.internal.configuration.plugins.Plugins;
+import org.mockito.internal.util.reflection.GenericMaster;
+
+import io.avaje.inject.BeanScope;
+import io.avaje.inject.BeanScopeBuilder;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 
 final class MetaReader {
 
@@ -349,9 +352,28 @@ Object get(Object instance) {
     }
 
     void setFromScope(BeanScope beanScope, Object testInstance) throws IllegalAccessException {
-      if (!valueAlreadyProvided) {
-        set(field, beanScope.get(type(), name), testInstance);
+      if (valueAlreadyProvided) {
+        return;
+      }
+      final var type = type();
+
+      if (type instanceof ParameterizedType) {
+        final var parameterizedType = (ParameterizedType) type;
+        final var rawType = parameterizedType.getRawType();
+        final var typeArguments = parameterizedType.getActualTypeArguments();
+
+        if (rawType.equals(List.class)) {
+          set(field, beanScope.list(typeArguments[0]), testInstance);
+          return;
+        }
+
+        if (rawType.equals(Optional.class)) {
+          set(field, beanScope.getOptional(typeArguments[0], name), testInstance);
+          return;
+        }
       }
+
+      set(field, beanScope.get(type, name), testInstance);
     }
 
     void setFromPlugin(Object value, Object testInstance) throws IllegalAccessException {
diff --git a/inject-test/src/test/java/org/example/coffee/list/ListInject.java b/inject-test/src/test/java/org/example/coffee/list/ListInject.java
new file mode 100644
index 000000000..2f8ee96e4
--- /dev/null
+++ b/inject-test/src/test/java/org/example/coffee/list/ListInject.java
@@ -0,0 +1,22 @@
+package org.example.coffee.list;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.avaje.inject.test.InjectTest;
+import jakarta.inject.Inject;
+
+@InjectTest
+class ListInject {
+
+  @Inject List<Somei> testSomei;
+
+  @Test
+  void test() {
+
+    assertThat(testSomei).isNotEmpty();
+  }
+}

From face168e3d630f35781dfb2f18bae1825ea732a1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Jan 2025 16:44:19 +1300
Subject: [PATCH 02/12] [test] Add test for @InjectTest Optional field
 injection

---
 .../src/test/java/org/example/coffee/list/ListInject.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/inject-test/src/test/java/org/example/coffee/list/ListInject.java b/inject-test/src/test/java/org/example/coffee/list/ListInject.java
index 2f8ee96e4..ffa471f54 100644
--- a/inject-test/src/test/java/org/example/coffee/list/ListInject.java
+++ b/inject-test/src/test/java/org/example/coffee/list/ListInject.java
@@ -3,7 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import java.util.Optional;
 
+import jakarta.inject.Named;
+import org.example.optional.Que;
 import org.junit.jupiter.api.Test;
 
 import io.avaje.inject.test.InjectTest;
@@ -14,9 +17,11 @@ class ListInject {
 
   @Inject List<Somei> testSomei;
 
+  @Inject @Named("frodo") Optional<Que> frodo;
+
   @Test
   void test() {
-
     assertThat(testSomei).isNotEmpty();
+    assertThat(frodo).isNotEmpty();
   }
 }

From f9baeb00ceb3e2bb23982690dcef4609794264a9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Jan 2025 17:09:59 +1300
Subject: [PATCH 03/12] Failing test for ModuleOrdering that skips the extra
 test module(s) (#760)

* Failing test for ModuleOrdering that skips the extra test module(s)

Test components in src/test that are not annotated with @TestScope go into an extra module. This module is ignored/skipped by the compiled module ordering.

A fix for this is desired.

* Add ModuleOrdering.supportsExpected() such that we only use compiled module ordering when ...

When it supports the modules that are being used. When it does not then fall back to the default ordering mechanism.

* Opps, need to set factoryOrder variable there ...

* [test] Add test injecting BeanScope into a test component

---------

Co-authored-by: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
---
 .../other/InjectTestOnlyComponentTest.java    | 29 +++++++++++++++++++
 .../org/example/myapp/other/WireOther2.java   | 19 ++++++++++++
 .../org/example/myapp/other/WireOther3.java   | 18 ++++++++++++
 .../inject/generator/SimpleOrderWriter.java   | 12 +++++++-
 .../io/avaje/inject/DBeanScopeBuilder.java    | 15 ++++------
 .../io/avaje/inject/spi/ModuleOrdering.java   | 16 +++++++---
 6 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 blackbox-test-inject/src/test/java/org/example/myapp/other/InjectTestOnlyComponentTest.java
 create mode 100644 blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther2.java
 create mode 100644 blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther3.java

diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/other/InjectTestOnlyComponentTest.java b/blackbox-test-inject/src/test/java/org/example/myapp/other/InjectTestOnlyComponentTest.java
new file mode 100644
index 000000000..0d92d3aa9
--- /dev/null
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/other/InjectTestOnlyComponentTest.java
@@ -0,0 +1,29 @@
+package org.example.myapp.other;
+
+import io.avaje.inject.test.InjectTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@InjectTest
+public class InjectTestOnlyComponentTest {
+
+  @Inject WireOther myTestOnlyComponent;
+  @Inject WireOther2 myTestOnlyComponent2;
+  @Inject WireOther3 withBeanScope;
+
+  @Test
+  void test() {
+    assertThat(myTestOnlyComponent).isNotNull();
+    assertThat(myTestOnlyComponent.component).isNotNull();
+    assertThat(myTestOnlyComponent.plugin).isNotNull();
+
+    assertThat(myTestOnlyComponent2).isNotNull();
+    assertThat(myTestOnlyComponent2.component).isNotNull();
+    assertThat(myTestOnlyComponent2.plugin).isNotNull();
+
+    assertThat(withBeanScope).isNotNull();
+    assertThat(withBeanScope.beanScope).isNotNull();
+  }
+}
diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther2.java b/blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther2.java
new file mode 100644
index 000000000..962fd81df
--- /dev/null
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther2.java
@@ -0,0 +1,19 @@
+package org.example.myapp.other;
+
+import io.avaje.inject.PostConstruct;
+import jakarta.inject.Singleton;
+import org.example.external.aspect.PluginProvidedClass;
+import org.other.one.OtherComponent;
+
+@Singleton
+public class WireOther2 {
+  OtherComponent component;
+  PluginProvidedClass plugin;
+
+  @PostConstruct
+  public void postConstruct(OtherComponent component, PluginProvidedClass plugin) {
+    this.component = component;
+    this.plugin = plugin;
+  }
+
+}
diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther3.java b/blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther3.java
new file mode 100644
index 000000000..398bbdc41
--- /dev/null
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/other/WireOther3.java
@@ -0,0 +1,18 @@
+package org.example.myapp.other;
+
+import io.avaje.inject.BeanScope;
+import io.avaje.inject.PostConstruct;
+import jakarta.inject.Singleton;
+import org.example.external.aspect.PluginProvidedClass;
+import org.other.one.OtherComponent;
+
+@Singleton
+public class WireOther3 {
+  BeanScope beanScope;
+
+  @PostConstruct
+  public void postConstruct(BeanScope beanScope) {
+    this.beanScope = beanScope;
+  }
+
+}
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleOrderWriter.java b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleOrderWriter.java
index 7d02a1083..58e11a06a 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/SimpleOrderWriter.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/SimpleOrderWriter.java
@@ -76,7 +76,17 @@ private void writeStartClass() {
 
   private void writeBuildMethods() {
     writer.append(
-      "\n"
+        "\n"
+        + "  @Override\n"
+        + "  public boolean supportsExpected(List<AvajeModule> modules) {\n"
+        + "    if (modules.size() != sortedModules.length) {\n"
+        + "      return false;\n"
+        + "    }\n"
+        + "    return modules.stream()\n"
+        + "            .map(m -> m.getClass().getTypeName())\n"
+        + "            .allMatch(k -> INDEXES.containsKey(k));\n"
+        + "  }\n"
+        + "\n"
         + "  @Override\n"
         + "  public List<AvajeModule> factories() {\n"
         + "    return List.of(sortedModules);\n"
diff --git a/inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java b/inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java
index 71f209dc2..2fc52a275 100644
--- a/inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java
+++ b/inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java
@@ -6,13 +6,7 @@
 
 import java.lang.System.Logger.Level;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -257,10 +251,13 @@ public BeanScope build() {
 
     // sort factories by dependsOn
     ModuleOrdering factoryOrder = new FactoryOrder(parent, includeModules, !suppliedBeans.isEmpty());
+    var modules = serviceLoader.modules();
     if (factoryOrder.isEmpty()) {
       // prefer generated ModuleOrdering if provided
-      factoryOrder = serviceLoader.moduleOrdering().orElse(factoryOrder);
-      serviceLoader.modules().forEach(factoryOrder::add);
+      factoryOrder = serviceLoader.moduleOrdering()
+        .filter(o -> o.supportsExpected(modules))
+        .orElse(factoryOrder);
+      modules.forEach(factoryOrder::add);
     }
 
     final var moduleNames = factoryOrder.orderModules();
diff --git a/inject/src/main/java/io/avaje/inject/spi/ModuleOrdering.java b/inject/src/main/java/io/avaje/inject/spi/ModuleOrdering.java
index 5e68b3bd0..984c50404 100644
--- a/inject/src/main/java/io/avaje/inject/spi/ModuleOrdering.java
+++ b/inject/src/main/java/io/avaje/inject/spi/ModuleOrdering.java
@@ -8,6 +8,18 @@
  */
 public interface ModuleOrdering extends InjectExtension {
 
+  /**
+   * Return true if ordering supports the modules passed in.
+   */
+  default boolean supportsExpected(List<AvajeModule> modules) {
+    return true;
+  }
+
+  /**
+   * Accept a module for ordering
+   */
+  void add(AvajeModule module);
+
   /**
    * Order the factories, returning the ordered list of module names.
    */
@@ -23,8 +35,4 @@ public interface ModuleOrdering extends InjectExtension {
    */
   boolean isEmpty();
 
-  /**
-   * Accept a module for ordering
-   */
-  void add(AvajeModule module);
 }

From 0a244ab68fea72d23236ee22cfd368cdcfcc3927 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Jan 2025 17:14:25 +1300
Subject: [PATCH 04/12] Version 11.2-RC1

---
 blackbox-aspect/pom.xml      | 2 +-
 blackbox-other/pom.xml       | 2 +-
 blackbox-test-inject/pom.xml | 2 +-
 inject-aop/pom.xml           | 2 +-
 inject-events/pom.xml        | 2 +-
 inject-generator/pom.xml     | 2 +-
 inject-maven-plugin/pom.xml  | 2 +-
 inject-test/pom.xml          | 2 +-
 inject/pom.xml               | 2 +-
 pom.xml                      | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blackbox-aspect/pom.xml b/blackbox-aspect/pom.xml
index dcc8c3e5d..6e805a043 100644
--- a/blackbox-aspect/pom.xml
+++ b/blackbox-aspect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/blackbox-other/pom.xml b/blackbox-other/pom.xml
index 62882aa26..93a17fefa 100644
--- a/blackbox-other/pom.xml
+++ b/blackbox-other/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>
diff --git a/blackbox-test-inject/pom.xml b/blackbox-test-inject/pom.xml
index 3638a747a..b46a70f4d 100644
--- a/blackbox-test-inject/pom.xml
+++ b/blackbox-test-inject/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/inject-aop/pom.xml b/inject-aop/pom.xml
index af6fbddf6..3bf5546af 100644
--- a/inject-aop/pom.xml
+++ b/inject-aop/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
   <artifactId>avaje-inject-aop</artifactId>
   <dependencies>
diff --git a/inject-events/pom.xml b/inject-events/pom.xml
index cc79b167e..f4e457919 100644
--- a/inject-events/pom.xml
+++ b/inject-events/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
   <artifactId>avaje-inject-events</artifactId>
   <name>avaje inject events</name>
diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index 7eae3cd89..287b76206 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
diff --git a/inject-maven-plugin/pom.xml b/inject-maven-plugin/pom.xml
index be7b3048c..7852ede1d 100644
--- a/inject-maven-plugin/pom.xml
+++ b/inject-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
 
   <artifactId>avaje-inject-maven-plugin</artifactId>
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
index c3835ecb7..50dfa1086 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>
diff --git a/inject/pom.xml b/inject/pom.xml
index 2039ba33c..b5c1acd8c 100644
--- a/inject/pom.xml
+++ b/inject/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.1</version>
+    <version>11.2-RC1</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>
diff --git a/pom.xml b/pom.xml
index b66eed511..644fc5c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>11.1</version>
+  <version>11.2-RC1</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>
@@ -23,7 +23,7 @@
     <surefire.useModulePath>false</surefire.useModulePath>
     <argLine>-Dnet.bytebuddy.experimental=true</argLine>
     <!-- default-build-start -->
-    <project.build.outputTimestamp>2025-01-07T19:41:49Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-01-13T04:10:43Z</project.build.outputTimestamp>
     <!-- default-build-end -->
     <!-- valhalla-build-start ___
     <maven.compiler.release>23</maven.compiler.release>

From 16ccf4123e608c4f20f3d433586492b52133c3e1 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Tue, 14 Jan 2025 20:08:14 -0500
Subject: [PATCH 05/12] Fix Avaje HttpClient interface generation error (#763)

* Fix Avaje HttpClient interface closable

fix issue where incorrect predestroy hooks were generated

* Adding a test and it doesn't pass without explicit @Bean(autoCloseable = true)

* Uses avaje-http-client to detect if AutoClosable is used

---------

Co-authored-by: robin.bygrave <robin.bygrave@eroad.com>
---
 inject-generator/pom.xml                           |  7 +++++++
 .../java/io/avaje/inject/generator/BeanReader.java |  2 +-
 .../io/avaje/inject/generator/MethodReader.java    |  5 +++--
 .../avaje/inject/generator/TypeExtendsReader.java  |  9 ++++++---
 .../models/valid/lifecycle/ClientFactory.java      | 13 +++++++++++++
 .../models/valid/lifecycle/ClientInterface.java    |  6 ++++++
 inject-test/pom.xml                                |  7 +++++++
 .../java/org/example/coffee/factory/MyFactory.java | 14 ++++++++++++++
 .../org/example/coffee/factory/MyFactoryTest.java  |  4 ++++
 .../java/org/example/request/MyHttpClient.java     |  7 +++++++
 10 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientFactory.java
 create mode 100644 inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientInterface.java
 create mode 100644 inject-test/src/test/java/org/example/request/MyHttpClient.java

diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index 287b76206..e6de7403e 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -55,6 +55,13 @@
       <version>1.5</version>
       <scope>test</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-client</artifactId>
+      <version>2.9-RC7</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 
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
index 89aee81ed..514f729be 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -342,7 +342,7 @@ void addLifecycleCallbacks(Append writer, String indent) {
       var priority = preDestroyPriority == null || preDestroyPriority == 1000 ? "" : ", " + preDestroyPriority;
       writer.indent(indent).append(" builder.addPreDestroy($bean::%s%s);", preDestroyMethod.getSimpleName(), priority).eol();
     } else if (typeReader.isClosable() && !prototype) {
-      writer.indent(indent).append(" builder.addPreDestroy($bean);").eol();
+      writer.indent(indent).append(" builder.addAutoClosable($bean);").eol();
     }
   }
 
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
index a607732bb..4c14b8c17 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
@@ -293,6 +293,7 @@ void builderBuildAddBean(Append writer) {
             : "builder.addPostConstruct($bean::%s);";
         writer.indent(indent).append(addPostConstruct, initMethod).eol();
       }
+      final var isCloseable = typeReader != null && typeReader.isClosable();
 
       var priority = priority(destroyPriority);
       if (notEmpty(destroyMethod)) {
@@ -302,14 +303,14 @@ void builderBuildAddBean(Append writer) {
             : "builder.addPreDestroy(%s%s);";
         writer.indent(indent).append(addPreDestroy, addPreDestroy(destroyMethod), priority).eol();
 
-      } else if (typeReader != null && typeReader.isClosable()) {
+      } else if (isCloseable && !priority.isBlank()) {
         var addPreDestroy =
           multiRegister
             ? "    .forEach($bean -> builder.addPreDestroy($bean::close%s));"
             : "builder.addPreDestroy($bean::close%s);";
         writer.indent(indent).append(addPreDestroy, priority).eol();
 
-      } else if (beanCloseable) {
+      } else if (isCloseable || beanCloseable) {
         var addAutoClosable =
           multiRegister
             ? "    .forEach(builder::addAutoClosable);"
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java
index 34d55be8c..b7e9df67e 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java
@@ -62,9 +62,12 @@ final class TypeExtendsReader {
    */
   private boolean closeableClient(TypeElement baseType) {
     return ClientPrism.isPresent(baseType)
-      && APContext.typeElement("io.avaje.http.client.HttpClient").getInterfaces().stream()
-      .map(Object::toString)
-      .anyMatch(AutoCloseable.class.getCanonicalName()::equals);
+        && Optional.ofNullable(APContext.typeElement("io.avaje.http.client.HttpClient"))
+            .map(TypeElement::getInterfaces)
+            .stream()
+            .flatMap(List::stream)
+            .map(Object::toString)
+            .anyMatch(AutoCloseable.class.getCanonicalName()::equals);
   }
 
   private boolean autoProvide() {
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientFactory.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientFactory.java
new file mode 100644
index 000000000..265f60b2c
--- /dev/null
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientFactory.java
@@ -0,0 +1,13 @@
+package io.avaje.inject.generator.models.valid.lifecycle;
+
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+
+@Factory
+public class ClientFactory {
+
+  @Bean
+  ClientInterface i() {
+    return null;
+  }
+}
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientInterface.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientInterface.java
new file mode 100644
index 000000000..38411a684
--- /dev/null
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lifecycle/ClientInterface.java
@@ -0,0 +1,6 @@
+package io.avaje.inject.generator.models.valid.lifecycle;
+
+import io.avaje.http.api.Client;
+
+@Client
+public interface ClientInterface {}
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
index 50dfa1086..23be4bc10 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -81,6 +81,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-client</artifactId>
+      <version>2.9-RC7</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jex</artifactId>
diff --git a/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java b/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java
index 1986cf6f9..1c388f377 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/MyFactory.java
@@ -7,6 +7,7 @@
 
 import jakarta.inject.Named;
 import org.example.coffee.parent.DesEngi;
+import org.example.request.MyHttpClient;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -16,6 +17,19 @@ public class MyFactory {
 
   String methods = "";
 
+  @Bean // (autoCloseable = true)
+  MyHttpClient httpClient() {
+    return new MyHttpClientGenerated();
+  }
+
+  public static class MyHttpClientGenerated implements MyHttpClient, AutoCloseable {
+    public boolean closed;
+    @Override
+    public void close() throws Exception {
+      closed = true;
+    }
+  }
+
   @Bean
   DFact buildDFact() {
     return new DFact();
diff --git a/inject-test/src/test/java/org/example/coffee/factory/MyFactoryTest.java b/inject-test/src/test/java/org/example/coffee/factory/MyFactoryTest.java
index 9a4dcff02..06f1b8323 100644
--- a/inject-test/src/test/java/org/example/coffee/factory/MyFactoryTest.java
+++ b/inject-test/src/test/java/org/example/coffee/factory/MyFactoryTest.java
@@ -3,6 +3,7 @@
 import io.avaje.inject.xtra.ApplicationScope;
 import io.avaje.inject.BeanScope;
 import org.example.coffee.parent.DesEngi;
+import org.example.request.MyHttpClient;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -22,12 +23,15 @@ public void closableBeans_expect_closedViaPreDestroy() {
 
     final MyFactory.MyClose myClose;
     final MyFactory.MyAutoClose myAutoClose;
+    final MyFactory.MyHttpClientGenerated myHttpClientGenerated;
     try (BeanScope context = BeanScope.builder().build()) {
       myClose = context.get(MyFactory.MyClose.class);
       myAutoClose = context.get(MyFactory.MyAutoClose.class);
+      myHttpClientGenerated = (MyFactory.MyHttpClientGenerated) context.get(MyHttpClient.class);
     }
     assertThat(myClose.isClosed()).isTrue();
     assertThat(myAutoClose.isClosed()).isTrue();
+    assertThat(myHttpClientGenerated.closed).isTrue();
   }
 
   @Test
diff --git a/inject-test/src/test/java/org/example/request/MyHttpClient.java b/inject-test/src/test/java/org/example/request/MyHttpClient.java
new file mode 100644
index 000000000..7b99f3112
--- /dev/null
+++ b/inject-test/src/test/java/org/example/request/MyHttpClient.java
@@ -0,0 +1,7 @@
+package org.example.request;
+
+import io.avaje.http.api.Client;
+
+@Client
+public interface MyHttpClient {
+}

From b5e4cafb77f3a56c7c5e6f0f6ba16fb54587d143 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Wed, 15 Jan 2025 15:34:18 -0500
Subject: [PATCH 06/12] Fix Injecting generic ypes extending generic types
 (#765)

* fix injecting generic types extending generic types

* provider test

* Update TypeAppender.java

* Update TypeAppender.java
---
 .../org/example/myapp/generic/Aldrich.java    |  6 +++
 .../java/org/example/myapp/generic/MyA.java   |  4 ++
 .../java/org/example/myapp/generic/MyB.java   |  4 ++
 .../org/example/myapp/generic/MyConsumer.java |  9 +++++
 .../myapp/generic/MyConsumerFactory.java      | 37 +++++++++++++++++++
 .../generic/MyUseGenericDependencies.java     | 34 +++++++++++++++++
 .../myapp/generic/GenericFactoryTest.java     |  4 ++
 .../avaje/inject/generator/TypeAppender.java  | 16 ++++++--
 .../models/valid/generic/MyConsumer.java      | 12 ------
 .../valid/generic/MyConsumerFactory.java      | 23 ------------
 .../models/valid/provider/BProv.java          | 14 +++++++
 .../models/valid/provider/BProvProvider.java  | 17 +++++++++
 .../coffee/provider/BProvProviderTest.java    |  5 +++
 .../example/coffee/provider/BProvUser.java    | 18 +++++++++
 14 files changed, 165 insertions(+), 38 deletions(-)
 create mode 100644 blackbox-test-inject/src/main/java/org/example/myapp/generic/Aldrich.java
 create mode 100644 blackbox-test-inject/src/main/java/org/example/myapp/generic/MyA.java
 create mode 100644 blackbox-test-inject/src/main/java/org/example/myapp/generic/MyB.java
 create mode 100644 blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumer.java
 create mode 100644 blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumerFactory.java
 create mode 100644 blackbox-test-inject/src/main/java/org/example/myapp/generic/MyUseGenericDependencies.java
 delete mode 100644 inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumer.java
 delete mode 100644 inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumerFactory.java
 create mode 100644 inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProv.java
 create mode 100644 inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProvProvider.java
 create mode 100644 inject-test/src/test/java/org/example/coffee/provider/BProvUser.java

diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/generic/Aldrich.java b/blackbox-test-inject/src/main/java/org/example/myapp/generic/Aldrich.java
new file mode 100644
index 000000000..e906fb9e9
--- /dev/null
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/generic/Aldrich.java
@@ -0,0 +1,6 @@
+package org.example.myapp.generic;
+
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+public interface Aldrich<T, T2> extends BiConsumer<T, T2>, Consumer<BiConsumer<T, T2>> {}
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyA.java b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyA.java
new file mode 100644
index 000000000..dc595929b
--- /dev/null
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyA.java
@@ -0,0 +1,4 @@
+package org.example.myapp.generic;
+
+public interface MyA {
+}
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyB.java b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyB.java
new file mode 100644
index 000000000..e68343d8c
--- /dev/null
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyB.java
@@ -0,0 +1,4 @@
+package org.example.myapp.generic;
+
+public interface MyB {
+}
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumer.java b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumer.java
new file mode 100644
index 000000000..a34b04a2a
--- /dev/null
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumer.java
@@ -0,0 +1,9 @@
+package org.example.myapp.generic;
+
+import java.util.function.BiConsumer;
+
+public class MyConsumer implements BiConsumer<MyA, MyB> {
+
+  @Override
+  public void accept(MyA t, MyB u) {}
+}
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumerFactory.java b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumerFactory.java
new file mode 100644
index 000000000..93dd72c26
--- /dev/null
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyConsumerFactory.java
@@ -0,0 +1,37 @@
+package org.example.myapp.generic;
+
+import io.avaje.inject.Bean;
+import io.avaje.inject.Factory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+@Factory
+class MyConsumerFactory {
+
+  @Bean
+  MyConsumer createTest() {
+    return new MyConsumer();
+  }
+
+  @Bean
+  Map<String, MyConsumer> genericMap(BiConsumer<MyA, MyB> consumer) {
+    return new HashMap<>();
+  }
+
+  @Bean
+  Aldrich<String, String> bean() {
+    return new Aldrich<>() {
+      @Override
+      public void accept(String s, String s2) {
+
+      }
+
+      @Override
+      public void accept(BiConsumer<String, String> stringStringBiConsumer) {
+
+      }
+    };
+  }
+}
diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyUseGenericDependencies.java b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyUseGenericDependencies.java
new file mode 100644
index 000000000..0bd7fbb31
--- /dev/null
+++ b/blackbox-test-inject/src/main/java/org/example/myapp/generic/MyUseGenericDependencies.java
@@ -0,0 +1,34 @@
+package org.example.myapp.generic;
+
+import jakarta.inject.Singleton;
+
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+@Singleton
+class MyUseGenericDependencies {
+
+  private final Aldrich<String, String> aldrich;
+  private final Map<String, MyConsumer> genericMap;
+  private final BiConsumer<MyA, MyB> biConsumer;
+
+  MyUseGenericDependencies(Aldrich<String, String> aldrich,
+                           Map<String, MyConsumer> genericMap,
+                           BiConsumer<MyA, MyB> biConsumer) {
+    this.aldrich = aldrich;
+    this.genericMap = genericMap;
+    this.biConsumer = biConsumer;
+  }
+
+  Aldrich<String, String> getAldrich() {
+    return aldrich;
+  }
+
+  Map<String, MyConsumer> getGenericMap() {
+    return genericMap;
+  }
+
+  BiConsumer<MyA, MyB> getBiConsumer() {
+    return biConsumer;
+  }
+}
diff --git a/blackbox-test-inject/src/test/java/org/example/myapp/generic/GenericFactoryTest.java b/blackbox-test-inject/src/test/java/org/example/myapp/generic/GenericFactoryTest.java
index bc16a9c13..dc7c5a5e3 100644
--- a/blackbox-test-inject/src/test/java/org/example/myapp/generic/GenericFactoryTest.java
+++ b/blackbox-test-inject/src/test/java/org/example/myapp/generic/GenericFactoryTest.java
@@ -12,10 +12,14 @@ class GenericFactoryTest {
 
   @Inject Generic<Integer> intymcintface;
   @Inject Generic<String> stringy;
+  @Inject MyUseGenericDependencies others;
 
   @Test
   void test() {
     assertThat(intymcintface).isNotNull();
     assertThat(stringy).isNotNull();
+    assertThat(others.getAldrich()).isNotNull();
+    assertThat(others.getGenericMap()).isNotNull();
+    assertThat(others.getBiConsumer()).isNotNull();
   }
 }
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeAppender.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeAppender.java
index 48ede3867..a99461622 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/TypeAppender.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/TypeAppender.java
@@ -3,6 +3,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import javax.lang.model.type.TypeKind;
 
@@ -21,22 +22,31 @@ final class TypeAppender {
 
   void add(UType utype) {
     var type = Util.unwrapProvider(utype);
-    var components = type.componentTypes();
-    if (isAddGenericType(type, components)) {
+    if (isAddGenericType(type)) {
       addUType(type);
     } else {
       addSimpleType(type.mainType());
     }
   }
 
-  private static boolean isAddGenericType(UType type, List<UType> components) {
+  private static boolean isAddGenericType(UType type) {
+    var components = type.componentTypes();
     return type.isGeneric()
       && type.kind() != TypeKind.TYPEVAR
       && (components.size() != 1 || components.get(0).kind() != TypeKind.WILDCARD)
       && components.stream()
+      .flatMap(TypeAppender::allComponentTypes)
       .noneMatch(u -> u.kind() == TypeKind.TYPEVAR || u.kind() == TypeKind.WILDCARD);
   }
 
+  private static Stream<UType> allComponentTypes(UType u) {
+    final var componentTypes = u.componentTypes();
+    return componentTypes.isEmpty()
+      ? Stream.of(u)
+      : Stream.concat(
+        Stream.of(u), componentTypes.stream().flatMap(TypeAppender::allComponentTypes));
+  }
+
   void add(List<UType> sourceTypes) {
     sourceTypes.forEach(this::add);
   }
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumer.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumer.java
deleted file mode 100644
index d9131be81..000000000
--- a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.avaje.inject.generator.models.valid.generic;
-
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
-import io.avaje.inject.generator.models.valid.A0;
-
-public class MyConsumer implements BiConsumer<A0, io.avaje.inject.generator.models.valid.nested.A0> {
-
-  @Override
-  public void accept(A0 t, io.avaje.inject.generator.models.valid.nested.A0 u) {}
-}
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumerFactory.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumerFactory.java
deleted file mode 100644
index b6b667518..000000000
--- a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/generic/MyConsumerFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.avaje.inject.generator.models.valid.generic;
-
-import java.util.Map;
-import java.util.function.BiConsumer;
-
-import io.avaje.inject.Bean;
-import io.avaje.inject.Factory;
-import io.avaje.inject.generator.models.valid.A0;
-
-@Factory
-public class MyConsumerFactory {
-
-  @Bean
-  MyConsumer createTest() {
-    return new MyConsumer();
-  }
-
-  @Bean
-  Map<String, MyConsumer> genericMap(
-      BiConsumer<A0, io.avaje.inject.generator.models.valid.nested.A0> consumer) {
-    return null;
-  }
-}
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProv.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProv.java
new file mode 100644
index 000000000..4e02be9dd
--- /dev/null
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProv.java
@@ -0,0 +1,14 @@
+package io.avaje.inject.generator.models.valid.provider;
+
+public class BProv<T> {
+
+  final T value;
+
+  public BProv(T value) {
+    this.value = value;
+  }
+
+  public T get() {
+    return value;
+  }
+}
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProvProvider.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProvProvider.java
new file mode 100644
index 000000000..2f722e516
--- /dev/null
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/provider/BProvProvider.java
@@ -0,0 +1,17 @@
+package io.avaje.inject.generator.models.valid.provider;
+
+import io.avaje.inject.Component;
+import jakarta.inject.Provider;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Component
+public class BProvProvider implements Provider<BProv<String>> {
+
+  AtomicInteger counter = new AtomicInteger();
+
+  @Override
+  public BProv<String> get() {
+    return new BProv<>("Hello BProv" + counter.incrementAndGet());
+  }
+}
diff --git a/inject-test/src/test/java/org/example/coffee/provider/BProvProviderTest.java b/inject-test/src/test/java/org/example/coffee/provider/BProvProviderTest.java
index 2e5e80ba5..424818e16 100644
--- a/inject-test/src/test/java/org/example/coffee/provider/BProvProviderTest.java
+++ b/inject-test/src/test/java/org/example/coffee/provider/BProvProviderTest.java
@@ -17,6 +17,11 @@ void providerOfGenericType() {
       BProv<String> bProv2 = beanScope.get(BProvProvider$DI.TYPE_BProvString);
       assertThat(bProv).isNotSameAs(bProv2);
       assertThat(bProv2.get()).isEqualTo("Hello BProv2");
+
+      BProvUser bProvUser = beanScope.get(BProvUser.class);
+      BProv<String> bProv3 = bProvUser.getProvider().get();
+      assertThat(bProv3.get()).isEqualTo("Hello BProv3");
+      assertThat(bProv).isNotSameAs(bProv3);
     }
   }
 
diff --git a/inject-test/src/test/java/org/example/coffee/provider/BProvUser.java b/inject-test/src/test/java/org/example/coffee/provider/BProvUser.java
new file mode 100644
index 000000000..b460a476b
--- /dev/null
+++ b/inject-test/src/test/java/org/example/coffee/provider/BProvUser.java
@@ -0,0 +1,18 @@
+package org.example.coffee.provider;
+
+import io.avaje.inject.Component;
+import jakarta.inject.Provider;
+
+@Component
+class BProvUser {
+
+  private final Provider<BProv<String>> provider;
+
+  BProvUser(Provider<BProv<String>> provider){
+    this.provider = provider;
+  }
+
+  Provider<BProv<String>> getProvider() {
+    return provider;
+  }
+}

From c76007194fd6952efbb037f8484c2cf6e6b5f719 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 16 Jan 2025 09:43:10 +1300
Subject: [PATCH 07/12] Version 11.2-RC2

---
 blackbox-aspect/pom.xml      | 2 +-
 blackbox-other/pom.xml       | 2 +-
 blackbox-test-inject/pom.xml | 2 +-
 inject-aop/pom.xml           | 2 +-
 inject-events/pom.xml        | 2 +-
 inject-generator/pom.xml     | 2 +-
 inject-maven-plugin/pom.xml  | 2 +-
 inject-test/pom.xml          | 2 +-
 inject/pom.xml               | 2 +-
 pom.xml                      | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blackbox-aspect/pom.xml b/blackbox-aspect/pom.xml
index 6e805a043..856d43c83 100644
--- a/blackbox-aspect/pom.xml
+++ b/blackbox-aspect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/blackbox-other/pom.xml b/blackbox-other/pom.xml
index 93a17fefa..4bbfb21d4 100644
--- a/blackbox-other/pom.xml
+++ b/blackbox-other/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>
diff --git a/blackbox-test-inject/pom.xml b/blackbox-test-inject/pom.xml
index b46a70f4d..ec6746ea8 100644
--- a/blackbox-test-inject/pom.xml
+++ b/blackbox-test-inject/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/inject-aop/pom.xml b/inject-aop/pom.xml
index 3bf5546af..a6e2ac1be 100644
--- a/inject-aop/pom.xml
+++ b/inject-aop/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
   <artifactId>avaje-inject-aop</artifactId>
   <dependencies>
diff --git a/inject-events/pom.xml b/inject-events/pom.xml
index f4e457919..da1ed75dc 100644
--- a/inject-events/pom.xml
+++ b/inject-events/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
   <artifactId>avaje-inject-events</artifactId>
   <name>avaje inject events</name>
diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index e6de7403e..18e957d04 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
diff --git a/inject-maven-plugin/pom.xml b/inject-maven-plugin/pom.xml
index 7852ede1d..dd06234be 100644
--- a/inject-maven-plugin/pom.xml
+++ b/inject-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
 
   <artifactId>avaje-inject-maven-plugin</artifactId>
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
index 23be4bc10..c81bf0372 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>
diff --git a/inject/pom.xml b/inject/pom.xml
index b5c1acd8c..cf1e07375 100644
--- a/inject/pom.xml
+++ b/inject/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC1</version>
+    <version>11.2-RC2</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>
diff --git a/pom.xml b/pom.xml
index 644fc5c69..8f04d42d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>11.2-RC1</version>
+  <version>11.2-RC2</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>
@@ -23,7 +23,7 @@
     <surefire.useModulePath>false</surefire.useModulePath>
     <argLine>-Dnet.bytebuddy.experimental=true</argLine>
     <!-- default-build-start -->
-    <project.build.outputTimestamp>2025-01-13T04:10:43Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-01-15T20:36:06Z</project.build.outputTimestamp>
     <!-- default-build-end -->
     <!-- valhalla-build-start ___
     <maven.compiler.release>23</maven.compiler.release>

From 3bee19c52abfe0f2f88d53547d946705d53dd238 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:43:35 -0500
Subject: [PATCH 08/12] Fix `cutAnnotations` Edge Case (#766)

* fix cutAnnotations edge case

It's hard to replicate, but in certain situations it is possible to get an OOM error when compiling

* Use original formatting

---------

Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>
---
 .../main/java/io/avaje/inject/generator/ProcessingContext.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/ProcessingContext.java b/inject-generator/src/main/java/io/avaje/inject/generator/ProcessingContext.java
index 86fcc4316..edf12ace9 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/ProcessingContext.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/ProcessingContext.java
@@ -151,7 +151,7 @@ static boolean externallyProvided(String type) {
 
   static void addOptionalType(String paramType, String name) {
     if (!CTX.get().providedTypes.contains(paramType)) {
-      CTX.get().optionalTypes.add(ProcessorUtils.trimAnnotations(Util.addQualifierSuffixTrim(name, paramType)));
+      CTX.get().optionalTypes.add(Util.addQualifierSuffixTrim(name, ProcessorUtils.trimAnnotations(paramType)));
     }
   }
 

From c4b1c2c140471ede6b748a39e3b2dc750a0e4500 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 06:03:38 +0000
Subject: [PATCH 09/12] Bump the dependencies group with 3 updates

Bumps the dependencies group with 3 updates: [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy), [net.bytebuddy:byte-buddy-agent](https://github.com/raphw/byte-buddy) and [io.avaje:avaje-http-client](https://github.com/avaje/avaje-http-client).


Updates `net.bytebuddy:byte-buddy` from 1.15.11 to 1.16.1
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.11...byte-buddy-1.16.1)

Updates `net.bytebuddy:byte-buddy-agent` from 1.15.11 to 1.16.1
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.11...byte-buddy-1.16.1)

Updates `io.avaje:avaje-http-client` from 2.9-RC7 to 2.9-RC8
- [Release notes](https://github.com/avaje/avaje-http-client/releases)
- [Commits](https://github.com/avaje/avaje-http-client/commits)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: net.bytebuddy:byte-buddy-agent
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: io.avaje:avaje-http-client
  dependency-type: direct:production
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 inject-generator/pom.xml | 2 +-
 inject-test/pom.xml      | 6 +++---
 pom.xml                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index 18e957d04..36888ef8d 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>2.9-RC7</version>
+      <version>2.9-RC8</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
index c81bf0372..c0e46246b 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -45,12 +45,12 @@
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
-      <version>1.15.11</version>
+      <version>1.16.1</version>
     </dependency>
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy-agent</artifactId>
-      <version>1.15.11</version>
+      <version>1.16.1</version>
     </dependency>
 
     <dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>2.9-RC7</version>
+      <version>2.9-RC8</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 8f04d42d3..278c9d6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,13 +61,13 @@
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
-      <version>1.15.11</version>
+      <version>1.16.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy-agent</artifactId>
-      <version>1.15.11</version>
+      <version>1.16.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 69a929526e6939fcb1a51e9490599680ae7e7067 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Sun, 26 Jan 2025 05:26:15 -0500
Subject: [PATCH 10/12] fix requires retention (#769)

---
 inject/src/main/java/io/avaje/inject/RequiresBean.java     | 4 ++--
 inject/src/main/java/io/avaje/inject/RequiresProperty.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inject/src/main/java/io/avaje/inject/RequiresBean.java b/inject/src/main/java/io/avaje/inject/RequiresBean.java
index 742c7cc60..e1f0005ae 100644
--- a/inject/src/main/java/io/avaje/inject/RequiresBean.java
+++ b/inject/src/main/java/io/avaje/inject/RequiresBean.java
@@ -3,8 +3,8 @@
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
@@ -30,7 +30,7 @@
  * <p>In the sample above the MyService bean will get wired only if a bean of type {@code
  * OtherService} is already registered in the {@link BeanScope}.
  */
-@Retention(SOURCE)
+@Retention(CLASS)
 @Repeatable(RequiresBean.Container.class)
 @Target({TYPE, METHOD, ANNOTATION_TYPE})
 public @interface RequiresBean {
diff --git a/inject/src/main/java/io/avaje/inject/RequiresProperty.java b/inject/src/main/java/io/avaje/inject/RequiresProperty.java
index 7b4f35124..0c89bd196 100644
--- a/inject/src/main/java/io/avaje/inject/RequiresProperty.java
+++ b/inject/src/main/java/io/avaje/inject/RequiresProperty.java
@@ -3,8 +3,8 @@
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
@@ -40,7 +40,7 @@
  * If no ConfigPropertyPlugin is found then the default implementation is used which uses
  * {@link System#getProperty(String)} and {@link System#getenv(String)}.
  */
-@Retention(SOURCE)
+@Retention(CLASS)
 @Repeatable(RequiresProperty.Container.class)
 @Target({TYPE, METHOD, ANNOTATION_TYPE})
 public @interface RequiresProperty {

From 354e74917acc5d1ea1166573593065df526d8008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 05:44:27 +0000
Subject: [PATCH 11/12] Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [io.avaje:avaje-prisms](https://github.com/avaje/avaje-prisms) and [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations).


Updates `io.avaje:avaje-prisms` from 1.37 to 1.38
- [Release notes](https://github.com/avaje/avaje-prisms/releases)
- [Commits](https://github.com/avaje/avaje-prisms/compare/1.37...1.38)

Updates `org.jetbrains:annotations` from 26.0.1 to 26.0.2
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.1...26.0.2)

---
updated-dependencies:
- dependency-name: io.avaje:avaje-prisms
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 inject-generator/pom.xml | 2 +-
 inject-test/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index 36888ef8d..374c55b79 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -13,7 +13,7 @@
   <name>avaje inject generator</name>
   <description>annotation processor generating source code for avaje-inject dependency injection</description>
   <properties>
-    <avaje.prisms.version>1.37</avaje.prisms.version>
+    <avaje.prisms.version>1.38</avaje.prisms.version>
     <!-- valhalla-build-start ___
     <maven.compiler.enablePreview>false</maven.compiler.enablePreview>
     ____ valhalla-build-end -->
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
index c0e46246b..4870096a5 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-      <version>26.0.1</version>
+      <version>26.0.2</version>
       <scope>test</scope>
     </dependency>
 

From add33db597ff1f54a893e31adb598240b4e54fe0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 31 Jan 2025 07:56:23 +1300
Subject: [PATCH 12/12] Version 11.2

---
 blackbox-aspect/pom.xml      | 2 +-
 blackbox-other/pom.xml       | 2 +-
 blackbox-test-inject/pom.xml | 2 +-
 inject-aop/pom.xml           | 2 +-
 inject-events/pom.xml        | 2 +-
 inject-generator/pom.xml     | 2 +-
 inject-maven-plugin/pom.xml  | 2 +-
 inject-test/pom.xml          | 2 +-
 inject/pom.xml               | 2 +-
 pom.xml                      | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blackbox-aspect/pom.xml b/blackbox-aspect/pom.xml
index 856d43c83..17a9bccb4 100644
--- a/blackbox-aspect/pom.xml
+++ b/blackbox-aspect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/blackbox-other/pom.xml b/blackbox-other/pom.xml
index 4bbfb21d4..0af6d242f 100644
--- a/blackbox-other/pom.xml
+++ b/blackbox-other/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>
diff --git a/blackbox-test-inject/pom.xml b/blackbox-test-inject/pom.xml
index ec6746ea8..e73e88f32 100644
--- a/blackbox-test-inject/pom.xml
+++ b/blackbox-test-inject/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/inject-aop/pom.xml b/inject-aop/pom.xml
index a6e2ac1be..232386039 100644
--- a/inject-aop/pom.xml
+++ b/inject-aop/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
   <artifactId>avaje-inject-aop</artifactId>
   <dependencies>
diff --git a/inject-events/pom.xml b/inject-events/pom.xml
index da1ed75dc..66d311fc0 100644
--- a/inject-events/pom.xml
+++ b/inject-events/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
   <artifactId>avaje-inject-events</artifactId>
   <name>avaje inject events</name>
diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
index 374c55b79..4e5bdb6f0 100644
--- a/inject-generator/pom.xml
+++ b/inject-generator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
diff --git a/inject-maven-plugin/pom.xml b/inject-maven-plugin/pom.xml
index dd06234be..46730589e 100644
--- a/inject-maven-plugin/pom.xml
+++ b/inject-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
 
   <artifactId>avaje-inject-maven-plugin</artifactId>
diff --git a/inject-test/pom.xml b/inject-test/pom.xml
index 4870096a5..23446b9c8 100644
--- a/inject-test/pom.xml
+++ b/inject-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>
diff --git a/inject/pom.xml b/inject/pom.xml
index cf1e07375..84820b5ed 100644
--- a/inject/pom.xml
+++ b/inject/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>11.2-RC2</version>
+    <version>11.2</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>
diff --git a/pom.xml b/pom.xml
index 278c9d6e2..3b2674dec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>11.2-RC2</version>
+  <version>11.2</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>
@@ -23,7 +23,7 @@
     <surefire.useModulePath>false</surefire.useModulePath>
     <argLine>-Dnet.bytebuddy.experimental=true</argLine>
     <!-- default-build-start -->
-    <project.build.outputTimestamp>2025-01-15T20:36:06Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-01-30T18:52:51Z</project.build.outputTimestamp>
     <!-- default-build-end -->
     <!-- valhalla-build-start ___
     <maven.compiler.release>23</maven.compiler.release>