AOP: Fix delegated method invocation (#11702)

Author: dstepanov

core-processor/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java

@@ -655,7 +655,7 @@ public void visitAroundMethod(TypedElement beanType,
 
             if (!methodElementKey.equals(overriddenByKey)) {
                 proxyBuilder.addMethod(MethodDef.override(methodElement)
-                    .build((aThis, methodParameters) -> aThis.superRef().invoke(overriddenBy, methodParameters).returning())
+                    .build((aThis, methodParameters) -> aThis.invoke(overriddenBy, methodParameters).returning())
                 );
                 return;
             }

inject-java/src/test/groovy/io/micronaut/aop/introduction/MyRepo6.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017-2020 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.aop.introduction;
+
+@Tx
+@RepoDef
+public interface MyRepo6 extends DeleteByIdCrudRepo<Integer> {
+
+    @Override
+    void deleteById(Integer integer);
+
+}

inject-java/src/test/groovy/io/micronaut/aop/introduction/MyRepo6Service.java

@@ -0,0 +1,17 @@
+package io.micronaut.aop.introduction;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class MyRepo6Service {
+
+    private final DeleteByIdCrudRepo rawRepository;
+
+    public MyRepo6Service(MyRepo6 myRepo6) {
+        this.rawRepository = myRepo6;
+    }
+
+    void deleteById(Integer integer) {
+        rawRepository.deleteById(integer);
+    }
+}

inject-java/src/test/groovy/io/micronaut/aop/introduction/MyRepoIntroductionSpec.groovy

@@ -182,4 +182,16 @@ class MyRepoIntroductionSpec extends Specification {
             TxInterceptor.EXECUTED_METHODS.clear()
     }
 
+    void "test delegating methods"() {
+        given:
+            def myRepoService = applicationContext.getBean(MyRepo6Service)
+        when:
+            myRepoService.deleteById(1)
+        then:
+            MyRepoIntroducer.EXECUTED_METHODS.size() == 1
+            MyRepoIntroducer.EXECUTED_METHODS.clear()
+            TxInterceptor.EXECUTED_METHODS.size() == 1
+            TxInterceptor.EXECUTED_METHODS.clear()
+    }
+
 }