Merge pull request #345 from SentryMan/fix-CheckedProxy

Fix Throwable Aspects

Author: rob-bygrave

blackbox-test-inject/src/main/java/org/example/myapp/r4j/MyExample.java

@@ -1,16 +1,17 @@
 package org.example.myapp.r4j;
 
-import io.avaje.inject.Component;
 import org.example.myapp.resilience4j.MyRetry;
 
+import io.avaje.inject.Component;
+
 @Component
 public class MyExample {
 
   public int barfCounter;
   public int retryWithFallbackCounter;
 
   @MyRetry
-  public void doingItWithRetry() {
+  public void doingItWithRetry() throws Throwable, IllegalStateException{
     barfCounter++;
     throw new IllegalArgumentException("no");
   }

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

@@ -181,22 +181,25 @@ void writeArgs(Append writer) {
       writer.append("      return call.finalResult();").eol();
     }
 
-    writeThrowsCatch(writer);
     writer.append("    } catch (RuntimeException ex) {").eol();
     writer.append("      ex.addSuppressed(new InvocationException(\"%s proxy threw exception\"));", simpleName).eol();
     writer.append("      throw ex;").eol();
-    writer.append("    } catch (Throwable t) {").eol();
-    writer.append("      throw new InvocationException(\"%s proxy threw exception\", t);", simpleName).eol();
+    writeThrowsCatch(writer);
+    if (thrownTypes.stream().map(Object::toString).noneMatch("java.lang.Throwable"::equals)) {
+      writer.append("    } catch (Throwable t) {").eol();
+      writer.append("      throw new InvocationException(\"%s proxy threw exception\", t);", simpleName).eol();
+    }
     writer.append("    }").eol();
   }
 
   private void writeThrowsCatch(Append writer) {
-
-    if (thrownTypes.isEmpty()) {
+    final var types = new ArrayList<>(thrownTypes);
+    types.removeIf(ProcessingContext::isUncheckedException);
+    if (types.isEmpty()) {
       return;
     }
     writer.append("    } catch (");
-    thrownTypes.stream()
+    types.stream()
         .map(Object::toString)
         .map(Util::shortName)
         .collect(collectingAndThen(joining(" | "), writer::append))

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

@@ -156,6 +156,12 @@ static Element asElement(TypeMirror returnType) {
     return wrapper == null ? CTX.get().typeUtils.asElement(returnType) : element(wrapper);
   }
 
+  static boolean isUncheckedException(TypeMirror returnType) {
+    final var types = CTX.get().typeUtils;
+    final var runtime = element("java.lang.RuntimeException").asType();
+    return types.isSubtype(returnType, runtime);
+  }
+
   static void addModule(String moduleFullName) {
     if (moduleFullName != null) {
       CTX.get().uniqueModuleNames.add(moduleFullName);