Merge branch 'master' into feature/bump-bte-buddy

Author: rob-bygrave

.github/workflows/dependabot-merge.yml

@@ -21,9 +21,8 @@ jobs:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       # Enable for automerge
-      # - name: Enable auto-merge for Dependabot PRs
-      #   if: ${{contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
-      #   run: gh pr merge --auto --merge "$PR_URL"
-      #   env:
-      #     PR_URL: ${{github.event.pull_request.html_url}}
-      #     GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

blackbox-aspect/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>9.8-RC1</version>
+    <version>9.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

blackbox-other/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>9.8-RC1</version>
+    <version>9.9-SNAPSHOT</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>

blackbox-test-inject/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>9.8-RC1</version>
+    <version>9.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>3.8</version>
+      <version>3.9</version>
     </dependency>
 
     <dependency>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.github.resilience4j</groupId>
       <artifactId>resilience4j-annotations</artifactId>
-      <version>1.7.1</version>
+      <version>2.1.0</version>
     </dependency>
 
     <!-- annotation processor -->

blackbox-test-inject/src/main/java/org/example/myapp/conditional/WithAspectConditional.java

@@ -0,0 +1,15 @@
+package org.example.myapp.conditional;
+
+import io.avaje.inject.Component;
+import io.avaje.inject.RequiresProperty;
+import org.example.myapp.aspect.MyAround;
+
+@Component
+@RequiresProperty(value = "factory")
+public class WithAspectConditional {
+
+  @MyAround
+  void test(String str) {
+    // does nothing
+  }
+}

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

@@ -3,6 +3,8 @@
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
 
+import java.io.IOException;
+
 @Factory
 class AFactory {
 
@@ -27,10 +29,19 @@ void ad(A0.Builder b1, A1.Builder b2) {
     b2.hashCode();
   }
 
+  @Bean
+  AFoo buildAfoo() throws IOException {
+    return new AFoo();
+  }
+
   static class I0 implements A0.Builder {
 
   }
   static class I1 implements A1.Builder {
 
   }
+
+  static class AFoo {
+
+  }
 }

blackbox-test-inject/src/test/java/org/example/myapp/conditional/ConditionalTests.java

@@ -21,7 +21,6 @@ class ConditionalTests {
 
   @BeforeEach
   void clearConfig() {
-
     Config.eventBuilder("")
         .remove("secondary")
         .remove("factory")
@@ -32,15 +31,14 @@ void clearConfig() {
   }
 
   @Test
-  void basic() throws IOException {
+  void basic() {
     // just wire everything with no test scope, mocks etc
     final BeanScope beanScope = BeanScope.builder().build();
     assertTrue(beanScope.getOptional(Bird.class).isEmpty());
   }
 
   @Test
-  void jay() throws IOException {
-
+  void jay() {
     Config.setProperty("factory", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
@@ -51,8 +49,7 @@ void jay() throws IOException {
   }
 
   @Test
-  void birdWatch() throws IOException {
-
+  void birdWatch() {
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");
 
@@ -62,8 +59,7 @@ void birdWatch() throws IOException {
   }
 
   @Test
-  void missingBeans() throws IOException {
-
+  void missingBeans() {
     Config.setProperty("watcher", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
@@ -72,34 +68,33 @@ void missingBeans() throws IOException {
   }
 
   @Test
-  void noFactory() throws IOException {
-
+  void noFactory() {
     Config.setProperty("kiwi", "somethin");
     Config.setProperty("watcher", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
 
+    assertTrue(beanScope.getOptional(WithAspectConditional.class).isEmpty());
     assertTrue(beanScope.getOptional(BirdFactory.class).isEmpty());
     assertTrue(beanScope.getOptional(BlueJay.class).isEmpty());
     assertTrue(beanScope.getOptional(BirdWatcher.class).isPresent());
     assertEquals("Kiwi", beanScope.get(Bird.class).toString());
   }
 
   @Test
-  void factoryKiwiOverride() throws IOException {
-
+  void factoryKiwiOverride() {
     Config.setProperty("kiwi", "somethin");
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
     assertTrue(beanScope.getOptional(BirdWatcher.class).isPresent());
+    assertTrue(beanScope.getOptional(WithAspectConditional.class).isPresent());
     assertEquals("Kiwi", beanScope.get(Bird.class).toString());
   }
 
   @Test
-  void factorySecondaryOverride() throws IOException {
-
+  void factorySecondaryOverride() {
     Config.setProperty("secondary", "somethin");
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");
@@ -110,16 +105,14 @@ void factorySecondaryOverride() throws IOException {
   }
 
   @Test
-  void qualifierTest() throws IOException {
-
+  void qualifierTest() {
     final BeanScope beanScope =
         BeanScope.builder().bean("finch", Bird.class, new StrawberryFinch()).build();
     assertTrue(beanScope.getOptional(QualifiedBirdWatcher.class).isPresent());
   }
 
   @Test
-  void metaMetaAnnotationTest() throws IOException {
-
+  void metaMetaAnnotationTest() {
     Config.setProperty("finch-time", "somethin");
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");

inject-generator/pom.xml

@@ -6,14 +6,14 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>9.8-RC1</version>
+    <version>9.9-SNAPSHOT</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
   <name>avaje inject generator</name>
   <description>annotation processor generating source code for avaje-inject dependency injection</description>
   <properties>
-    <avaje.prisms.version>1.14</avaje.prisms.version>
+    <avaje.prisms.version>1.16</avaje.prisms.version>
   </properties>
   <dependencies>
 

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

@@ -12,11 +12,29 @@ final class Append {
   private final Writer writer;
   private int nameIndex;
   private boolean comma;
+  private String extraIndent;
 
   Append(Writer writer) {
     this.writer = writer;
   }
 
+  Append setExtraIndent(String extraIndent) {
+    this.extraIndent = extraIndent;
+    return this;
+  }
+
+  Append indent(String content) {
+    try {
+      if (extraIndent != null) {
+        writer.append(extraIndent);
+      }
+      writer.append(content);
+      return this;
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
   Append append(String content) {
     try {
       writer.append(content);

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

@@ -44,12 +44,10 @@ final class BeanReader {
     this.prototype = PrototypePrism.isPresent(beanType);
     this.primary = PrimaryPrism.isPresent(beanType);
     this.secondary = !primary && SecondaryPrism.isPresent(beanType);
-    this.proxy = ProxyPrism.isPresent(beanType);
     this.typeReader = new TypeReader(GenericType.parse(type), beanType, importTypes, factory);
 
-    conditions.readAll(beanType);
-
     typeReader.process();
+
     this.requestParams = new BeanRequestParams(type);
     this.name = typeReader.name();
     this.aspects = typeReader.hasAspects();
@@ -61,6 +59,18 @@ final class BeanReader {
     this.preDestroyPriority = typeReader.preDestroyPriority();
     this.constructor = typeReader.constructor();
     this.importedComponent = importedComponent && (constructor != null && constructor.isPublic());
+
+    var proxyPrism = ProxyPrism.getInstanceOn(beanType);
+    if (proxyPrism != null) {
+      this.proxy = true;
+      var proxyMirror = proxyPrism.value();
+      if (!"Void".equals(proxyMirror.toString())) {
+        conditions.readAll(APContext.asTypeElement(proxyMirror));
+      }
+    } else {
+      conditions.readAll(beanType);
+      this.proxy = false;
+    }
   }
 
   @Override
@@ -111,7 +121,7 @@ List<Dependency> dependsOn() {
       for (MethodReader.MethodParam param : constructor.params()) {
         Dependency dependsOn = param.dependsOn();
         // BeanScope is always injectable with no impact on injection ordering
-        if (!dependsOn.dependsOn().equals(Constants.BEANSCOPE)) {
+        if (!Constants.BEANSCOPE.equals(dependsOn.dependsOn())) {
           list.add(dependsOn);
         }
       }
@@ -230,7 +240,7 @@ void buildRegister(Append writer) {
     if (prototype) {
       return;
     }
-    writer.append("      ");
+    writer.indent("      ");
     if (isExtraInjectionRequired() || hasLifecycleMethods()) {
       writer.append("var $bean = ");
     }
@@ -245,14 +255,14 @@ void buildRegister(Append writer) {
 
   void addLifecycleCallbacks(Append writer, String indent) {
     if (postConstructMethod != null && !prototype) {
-      writer.append("%s builder.addPostConstruct($bean::%s);", indent, postConstructMethod.getSimpleName()).eol();
+      writer.indent(indent).append(" builder.addPostConstruct($bean::%s);", postConstructMethod.getSimpleName()).eol();
     }
     if (preDestroyMethod != null) {
       prototypeNotSupported("@PreDestroy");
       var priority = preDestroyPriority == null || preDestroyPriority == 1000 ? "" : ", " + preDestroyPriority;
-      writer.append("%s builder.addPreDestroy($bean::%s%s);", indent, preDestroyMethod.getSimpleName(), priority).eol();
+      writer.indent(indent).append(" builder.addPreDestroy($bean::%s%s);", preDestroyMethod.getSimpleName(), priority).eol();
     } else if (typeReader.isClosable() && !prototype) {
-      writer.append("%s builder.addPreDestroy($bean);", indent).eol();
+      writer.indent(indent).append(" builder.addPreDestroy($bean);").eol();
     }
   }
 
@@ -438,4 +448,13 @@ private String beanPackageName() {
   private String beanQualifiedName() {
     return beanType.getQualifiedName().toString();
   }
+
+  boolean needsTryForMethodInjection() {
+    for (MethodReader injectMethod : injectMethods) {
+      if (injectMethod.methodThrows()) {
+        return true;
+      }
+    }
+    return false;
+  }
 }