Java generator: try-catch-finally, synchronized + super method invocation (#259)

dstepanov · web-flow · commit 3bf438eac83f · 2025-03-12T09:34:21.000+02:00
diff --git a/sourcegen-generator-java/src/main/java/io/micronaut/sourcegen/JavaPoetSourceGenerator.java b/sourcegen-generator-java/src/main/java/io/micronaut/sourcegen/JavaPoetSourceGenerator.java
diff --git a/test-suite-bytecode/src/test/java/io/micronaut/sourcegen/example/MethodInvokerTest.java b/test-suite-bytecode/src/test/java/io/micronaut/sourcegen/example/MethodInvokerTest.java
@@ -89,6 +89,35 @@ public void testStaticMethod() {
         );
     }
 
+    @Test
+    public void testInterfaceSuperMethod() {
+        Assertions.assertEquals(
+            "ABCSTT102",
+            new MethodRepositoryInvoker() {
+
+                @Override
+                public String interfaceMethod(String string, Integer integer, int i) {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public double interfaceMethodReturnsDouble() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public long interfaceMethodReturnsLong() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public int interfaceMethodReturnsInt() {
+                    throw new UnsupportedOperationException();
+                }
+            }.defaultMethod("STT", 100, 2)
+        );
+    }
+
     @Test
     public void testDefaultMethodIgnoreResult() {
         Assertions.assertEquals(
diff --git a/test-suite-custom-generators/src/main/java/io/micronaut/sourcegen/custom/visitor/GenerateMethodInvocationVisitor.java b/test-suite-custom-generators/src/main/java/io/micronaut/sourcegen/custom/visitor/GenerateMethodInvocationVisitor.java
@@ -19,6 +19,7 @@
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.reflect.ReflectionUtils;
 import io.micronaut.inject.ast.ClassElement;
+import io.micronaut.inject.ast.MethodElement;
 import io.micronaut.inject.visitor.TypeElementVisitor;
 import io.micronaut.inject.visitor.VisitorContext;
 import io.micronaut.sourcegen.custom.example.GenerateMethodInvocation;
@@ -28,6 +29,7 @@
 import io.micronaut.sourcegen.model.ClassTypeDef;
 import io.micronaut.sourcegen.model.ExpressionDef;
 import io.micronaut.sourcegen.model.FieldDef;
+import io.micronaut.sourcegen.model.JavaIdioms;
 import io.micronaut.sourcegen.model.MethodDef;
 import io.micronaut.sourcegen.model.StatementDef;
 import io.micronaut.sourcegen.model.TypeDef;
@@ -172,6 +174,22 @@ public void visitClass(ClassElement element, VisitorContext context) {
 
         sourceGenerator.write(classDef, context, element);
 
+        ClassTypeDef myRepoType = ClassTypeDef.of(myRepository);
+        MethodElement defaultMethod = myRepository.findMethod("defaultMethod").get();
+        ClassDef interfaceSuperInvokerDef = ClassDef.builder("io.micronaut.sourcegen.example.MethodRepositoryInvoker")
+            .addModifiers(Modifier.ABSTRACT)
+            .addSuperinterface(myRepoType)
+            .addMethod(MethodDef.override(defaultMethod)
+                .build((aThis, methodParameters) ->
+                    JavaIdioms.concatStrings(
+                        ExpressionDef.constant("ABC"),
+                        aThis.superRef(myRepoType)
+                            .invoke(defaultMethod, methodParameters)
+                    ).returning())
+            ).build();
+
+        sourceGenerator.write(interfaceSuperInvokerDef, context, element);
+
         FieldDef targetField = FieldDef.builder("target", TypeDef.OBJECT).addModifiers(Modifier.PRIVATE).build();
         FieldDef lockField = FieldDef.builder("lock", ClassTypeDef.of(ReentrantReadWriteLock.class))
             .addModifiers(Modifier.PRIVATE, Modifier.FINAL)
@@ -224,7 +242,9 @@ public void visitClass(ClassElement element, VisitorContext context) {
                     methodParameters.get(1).invoke("getAndIncrement", TypeDef.Primitive.INT),
                     StatementDef.doTry(
                         StatementDef.multi(
-                            ClassTypeDef.of(IllegalStateException.class).instantiate().doThrow(),
+                            ExpressionDef.trueValue().isTrue().doIf(
+                                ClassTypeDef.of(IllegalStateException.class).instantiate().doThrow()
+                            ),
                             methodParameters.get(1).invoke("getAndIncrement", TypeDef.Primitive.INT),
                             aThis.field(targetField).returning()
                         )
@@ -238,7 +258,9 @@ public void visitClass(ClassElement element, VisitorContext context) {
                     methodParameters.get(1).invoke("getAndIncrement", TypeDef.Primitive.INT),
                     StatementDef.doTry(
                             StatementDef.multi(
-                                ClassTypeDef.of(IllegalStateException.class).instantiate(ExpressionDef.constant("Bam")).doThrow(),
+                                    ExpressionDef.trueValue().isTrue().doIf(
+                                        ClassTypeDef.of(IllegalStateException.class).instantiate(ExpressionDef.constant("Bam")).doThrow()
+                                    ),
                                 methodParameters.get(1).invoke("getAndIncrement", TypeDef.Primitive.INT),
                                 aThis.field(targetField).returning()
                             )
diff --git a/test-suite-custom-generators/src/main/java/io/micronaut/sourcegen/custom/visitor/GenerateMyRepository2Visitor.java b/test-suite-custom-generators/src/main/java/io/micronaut/sourcegen/custom/visitor/GenerateMyRepository2Visitor.java
@@ -20,20 +20,14 @@
 import io.micronaut.inject.ast.ClassElement;
 import io.micronaut.inject.visitor.TypeElementVisitor;
 import io.micronaut.inject.visitor.VisitorContext;
-import io.micronaut.sourcegen.custom.example.GenerateMyRepository1;
 import io.micronaut.sourcegen.custom.example.GenerateMyRepository2;
 import io.micronaut.sourcegen.generator.SourceGenerator;
 import io.micronaut.sourcegen.generator.SourceGenerators;
-import io.micronaut.sourcegen.model.ClassDef;
-import io.micronaut.sourcegen.model.ClassTypeDef;
 import io.micronaut.sourcegen.model.InterfaceDef;
-import io.micronaut.sourcegen.model.MethodDef;
-import io.micronaut.sourcegen.model.PropertyDef;
 import io.micronaut.sourcegen.model.TypeDef;
 
 import javax.lang.model.element.Modifier;
 import java.util.List;
-import java.util.Optional;
 
 @Internal
 public final class GenerateMyRepository2Visitor implements TypeElementVisitor<GenerateMyRepository2, Object> {
diff --git a/test-suite-java/src/main/java/io/micronaut/sourcegen/example/MyRepository.java b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/MyRepository.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017-2024 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.example;
+
+public interface MyRepository {
+
+    static String staticMethod(String string, Integer integer, int i) {
+        return string + (integer + i);
+    }
+
+    default String defaultMethod(String string, Integer integer, int i) {
+        return string + (integer + i);
+    }
+
+    String interfaceMethod(String string, Integer integer, int i);
+
+    double interfaceMethodReturnsDouble();
+
+    long interfaceMethodReturnsLong();
+
+    int interfaceMethodReturnsInt();
+
+}
diff --git a/test-suite-java/src/main/java/io/micronaut/sourcegen/example/Trigger.java b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/Trigger.java
@@ -34,6 +34,7 @@
 @GenerateAnnotatedType
 @GenerateInnerTypes
 @GenerateMyEnum2
+@GenerateMethodInvocation
 public class Trigger {
     public List<String> copyAddresses;
 }
diff --git a/test-suite-java/src/test/java/io/micronaut/sourcegen/example/MethodInvokerTest.java b/test-suite-java/src/test/java/io/micronaut/sourcegen/example/MethodInvokerTest.java

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`@GenerateAnnotatedType`
`35`	`35`	`@GenerateInnerTypes`
`36`	`36`	`@GenerateMyEnum2`
	`37`	`+@GenerateMethodInvocation`
`37`	`38`	`public class Trigger {`
`38`	`39`	`public List<String> copyAddresses;`
`39`	`40`	`}`