Merge branch 'master' into avaje-name

Author: SentryMan

blackbox-test-inject/src/main/java/org/example/myapp/config/MyAopProviderConsumer.java

@@ -0,0 +1,20 @@
+package org.example.myapp.config;
+
+import io.avaje.inject.Component;
+import jakarta.inject.Provider;
+import org.example.myapp.aspect.MyTimed;
+
+@Component
+@MyTimed
+public class MyAopProviderConsumer {
+
+  final Provider<AppConfig.Builder> builderProvider;
+
+  public MyAopProviderConsumer(Provider<AppConfig.Builder> builderProvider) {
+    this.builderProvider = builderProvider;
+  }
+
+  public AppConfig.Builder doStuff() {
+    return builderProvider.get();
+  }
+}

blackbox-test-inject/src/test/java/org/example/myapp/config/MyAopProviderConsumerTest.java

@@ -0,0 +1,23 @@
+package org.example.myapp.config;
+
+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
+class MyAopProviderConsumerTest {
+
+  @Inject MyAopProviderConsumer consumer;
+
+  @Test
+  void doStuff() {
+    AppConfig.Builder builder1 = consumer.doStuff();
+    AppConfig.Builder builder2 = consumer.doStuff();
+
+    assertThat(builder1).isNotNull();
+    assertThat(builder2).isNotNull();
+    assertThat(builder2).isNotSameAs(builder1);
+  }
+}

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

@@ -669,10 +669,10 @@ void writeMethodParam(Append writer) {
       if (nullable) {
         writer.append("@Nullable ");
       }
-      if (genericType.isGeneric()) {
-        writer.append(genericType.shortWithoutAnnotations());
+      if (fullUType.isGeneric()) {
+        writer.append(fullUType.shortWithoutAnnotations());
       } else {
-        writer.append(Util.shortName(genericType.mainType()));
+        writer.append(Util.shortName(fullUType.mainType()));
       }
       writer.append(" ").append(simpleName);
     }