From a761ecd8a9c37d2df2f07fafd0b92852b1dae111 Mon Sep 17 00:00:00 2001
From: Martin Kouba <mkouba@redhat.com>
Date: Wed, 9 Jun 2021 13:20:45 +0200
Subject: [PATCH] ArC client proxies - prioritize delegating methods impl. on
 superclasses

- resolves #17755
---
 .../arc/processor/ClientProxyGenerator.java   | 14 ++++++-----
 .../io/quarkus/arc/processor/Methods.java     | 20 ++++++++-------
 ...roxyMethodInvocationInConstructorTest.java | 25 +++++++++++++++++++
 .../delegatingmethods/Component.java          | 11 ++++++++
 .../delegatingmethods/HasElement.java         | 10 ++++++++
 .../delegatingmethods/HasSize.java            |  8 ++++++
 .../clientproxy/delegatingmethods/MyBean.java | 14 +++++++++++
 7 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/Component.java
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasElement.java
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasSize.java
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
index 4410f808f41d8..5720e8a930296 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
@@ -33,6 +33,7 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.TypeVariable;
@@ -310,11 +311,12 @@ void implementGetBean(ClassCreator clientProxy, FieldDescriptor beanField) {
     Collection<MethodInfo> getDelegatingMethods(BeanInfo bean, Consumer<BytecodeTransformer> bytecodeTransformerConsumer,
             boolean transformUnproxyableClasses) {
         Map<Methods.MethodKey, MethodInfo> methods = new HashMap<>();
+        IndexView index = bean.getDeployment().getBeanArchiveIndex();
 
         if (bean.isClassBean()) {
             Set<Methods.NameAndDescriptor> methodsFromWhichToRemoveFinal = new HashSet<>();
             ClassInfo classInfo = bean.getTarget().get().asClass();
-            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), classInfo,
+            Methods.addDelegatingMethods(index, classInfo,
                     methods, methodsFromWhichToRemoveFinal, transformUnproxyableClasses);
             if (!methodsFromWhichToRemoveFinal.isEmpty()) {
                 String className = classInfo.name().toString();
@@ -323,16 +325,16 @@ Collection<MethodInfo> getDelegatingMethods(BeanInfo bean, Consumer<BytecodeTran
             }
         } else if (bean.isProducerMethod()) {
             MethodInfo producerMethod = bean.getTarget().get().asMethod();
-            ClassInfo returnTypeClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), producerMethod.returnType());
-            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), returnTypeClass, methods, null,
+            ClassInfo returnTypeClass = getClassByName(index, producerMethod.returnType());
+            Methods.addDelegatingMethods(index, returnTypeClass, methods, null,
                     transformUnproxyableClasses);
         } else if (bean.isProducerField()) {
             FieldInfo producerField = bean.getTarget().get().asField();
-            ClassInfo fieldClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), producerField.type());
-            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), fieldClass, methods, null,
+            ClassInfo fieldClass = getClassByName(index, producerField.type());
+            Methods.addDelegatingMethods(index, fieldClass, methods, null,
                     transformUnproxyableClasses);
         } else if (bean.isSynthetic()) {
-            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), bean.getImplClazz(), methods, null,
+            Methods.addDelegatingMethods(index, bean.getImplClazz(), methods, null,
                     transformUnproxyableClasses);
         }
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
index 7fc02887ffd8f..fea42a8b7725a 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
@@ -69,8 +69,8 @@ static boolean isBridge(MethodInfo method) {
 
     static void addDelegatingMethods(IndexView index, ClassInfo classInfo, Map<MethodKey, MethodInfo> methods,
             Set<NameAndDescriptor> methodsFromWhichToRemoveFinal, boolean transformUnproxyableClasses) {
-        // TODO support interfaces default methods
         if (classInfo != null) {
+            // First methods declared on the class
             for (MethodInfo method : classInfo.methods()) {
                 if (skipForClientProxy(method, transformUnproxyableClasses, methodsFromWhichToRemoveFinal)) {
                     continue;
@@ -88,14 +88,7 @@ static void addDelegatingMethods(IndexView index, ClassInfo classInfo, Map<Metho
                             key.method.exceptions().toArray(Type.EMPTY_ARRAY));
                 });
             }
-            // Interfaces
-            for (Type interfaceType : classInfo.interfaceTypes()) {
-                ClassInfo interfaceClassInfo = getClassByName(index, interfaceType.name());
-                if (interfaceClassInfo != null) {
-                    addDelegatingMethods(index, interfaceClassInfo, methods, methodsFromWhichToRemoveFinal,
-                            transformUnproxyableClasses);
-                }
-            }
+            // Methods declared on superclasses
             if (classInfo.superClassType() != null) {
                 ClassInfo superClassInfo = getClassByName(index, classInfo.superName());
                 if (superClassInfo != null) {
@@ -103,6 +96,15 @@ static void addDelegatingMethods(IndexView index, ClassInfo classInfo, Map<Metho
                             transformUnproxyableClasses);
                 }
             }
+            // Methods declared on implemented interfaces
+            // TODO support interfaces default methods
+            for (DotName interfaceName : classInfo.interfaceNames()) {
+                ClassInfo interfaceClassInfo = getClassByName(index, interfaceName);
+                if (interfaceClassInfo != null) {
+                    addDelegatingMethods(index, interfaceClassInfo, methods, methodsFromWhichToRemoveFinal,
+                            transformUnproxyableClasses);
+                }
+            }
         }
     }
 
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java
new file mode 100644
index 0000000000000..ae0620a9b4852
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.arc.test.clientproxy.delegatingmethods;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ClientProxy;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class ClientProxyMethodInvocationInConstructorTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyBean.class, Component.class, HasElement.class, HasSize.class);
+
+    @Test
+    public void testClientProxy() throws IOException {
+        // Just test that the client proxy can be instantiated
+        MyBean myBean = Arc.container().instance(MyBean.class).get();
+        assertTrue(myBean instanceof ClientProxy);
+        assertEquals("an element", myBean.getElement().toString());
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/Component.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/Component.java
new file mode 100644
index 0000000000000..c227f1ee42c90
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/Component.java
@@ -0,0 +1,11 @@
+package io.quarkus.arc.test.clientproxy.delegatingmethods;
+
+public class Component implements HasElement {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Object getElement() {
+        return "an element";
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasElement.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasElement.java
new file mode 100644
index 0000000000000..521bd65a9309b
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasElement.java
@@ -0,0 +1,10 @@
+package io.quarkus.arc.test.clientproxy.delegatingmethods;
+
+import java.io.Serializable;
+
+@FunctionalInterface
+public interface HasElement extends Serializable {
+
+    Object getElement();
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasSize.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasSize.java
new file mode 100644
index 0000000000000..88859b82030af
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/HasSize.java
@@ -0,0 +1,8 @@
+package io.quarkus.arc.test.clientproxy.delegatingmethods;
+
+public interface HasSize extends HasElement {
+
+    default void setSize(String size) {
+        getElement();
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java
new file mode 100644
index 0000000000000..e4fa3009cede6
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java
@@ -0,0 +1,14 @@
+package io.quarkus.arc.test.clientproxy.delegatingmethods;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class MyBean extends Component implements HasSize {
+
+    private static final long serialVersionUID = 1L;
+
+    public MyBean() {
+        setSize("5px");
+    }
+
+}