Merge pull request #533 from mohamed-abdelnour/fix-fallible-providers

fix: compilation error with providers and `throws`

Author: rbygrave

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

@@ -48,6 +48,12 @@ public Builder newBuilder() {
     return new Builder();
   }
 
+  @Prototype
+  @Bean
+  public BuilderThrows newBuilderThrows() throws Exception {
+    return new BuilderThrows();
+  }
+
   @Bean
   Generated newGenerated() {
     return new Generated();
@@ -59,6 +65,12 @@ public MySecType generalSecondary() {
     return new MySecType();
   }
 
+  @Secondary
+  @Bean
+  public MySecTypeThrows generalSecondaryThrows() throws Exception {
+    return new MySecTypeThrows();
+  }
+
   @Secondary
   @Bean
   public Optional<MySecOptType> optionalSecondary() {
@@ -100,12 +112,18 @@ MyAbstract myAbstract() {
   public static class Builder {
   }
 
+  public static class BuilderThrows {
+  }
+
   public static class Generated {
   }
 
   public static class MySecType {
   }
 
+  public static class MySecTypeThrows {
+  }
+
   public static class MySecOptType {
   }
 

blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyFactory.java

@@ -20,4 +20,10 @@ LazyBean lazyInt(@Nullable AtomicBoolean initialized) {
     if (initialized != null) initialized.set(true);
     return new LazyBean();
   }
+
+  @Bean
+  @Named("factoryThrows")
+  LazyBean lazyIntThrows(@Nullable AtomicBoolean initialized) throws Exception {
+    return lazyInt(initialized);
+  }
 }

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

@@ -205,6 +205,7 @@ void builderAddBeanProvider(Append writer) {
 
     writer.indent(String.format(".%s(() -> {", lazy ? "registerLazy" : "registerProvider")).eol();
 
+    startTry(writer);
     writer.indent(indent).append("    return ");
     writer.append("factory.%s(", methodName);
     for (int i = 0; i < params.size(); i++) {
@@ -214,6 +215,7 @@ void builderAddBeanProvider(Append writer) {
       params.get(i).builderGetDependency(writer, "builder");
     }
     writer.append(");").eol();
+    endTry(writer);
     writer.indent(indent).append("  });").eol();
     writer.indent(indent).append("}").eol();
   }

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

@@ -144,11 +144,10 @@ private void writeFactoryBeanMethod(MethodReader method) {
     method.buildConditional(writer);
     method.buildAddFor(writer);
     method.builderGetFactory(writer, beanReader.hasConditions());
-    method.startTry(writer);
     if (method.isLazy() || method.isProtoType() || method.isUseProviderForSecondary()) {
       method.builderAddBeanProvider(writer);
-      method.endTry(writer);
     } else {
+      method.startTry(writer);
       method.builderBuildBean(writer);
       method.builderBuildAddBean(writer);
       method.endTry(writer);