Merge pull request quarkusio#46788 from mkouba/issue-46721

ArC: fix decorated interface defaults methods not overriden by a bean

Author: manovotn

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java

@@ -827,6 +827,13 @@ private void addDecoratedMethods(Map<MethodKey, DecorationInfo> decoratedMethods
                 addDecoratedMethods(decoratedMethods, superClassInfo, originalClassInfo, boundDecorators, skipPredicate);
             }
         }
+
+        for (DotName i : classInfo.interfaceNames()) {
+            ClassInfo interfaceInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), i);
+            if (interfaceInfo != null) {
+                addDecoratedMethods(decoratedMethods, interfaceInfo, originalClassInfo, boundDecorators, skipPredicate);
+            }
+        }
     }
 
     private List<DecoratorMethod> findMatchingDecorators(MethodInfo method, List<DecoratorInfo> decorators) {
@@ -857,6 +864,9 @@ private List<DecoratorMethod> findMatchingDecorators(MethodInfo method, List<Dec
                     decoratedMethodParams = Types.getResolvedParameters(decoratedTypeClass, resolvedTypeParameters,
                             decoratedMethod,
                             beanDeployment.getBeanArchiveIndex());
+                    methodParams = Types.getResolvedParameters(decoratedTypeClass, resolvedTypeParameters,
+                            method,
+                            beanDeployment.getBeanArchiveIndex());
                     for (int i = 0; i < methodParams.size(); i++) {
                         BeanResolver resolver = beanDeployment.getDelegateInjectionPointResolver();
                         Type decoratedParam = decoratedMethodParams.get(i);

independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/DecoratorDefaultMethodTest.java

@@ -1,6 +1,8 @@
 package io.quarkus.arc.test.decorators;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import jakarta.annotation.Priority;
 import jakarta.decorator.Decorator;
@@ -16,22 +18,31 @@
 import io.quarkus.arc.test.ArcTestContainer;
 
 public class DecoratorDefaultMethodTest {
+
     @RegisterExtension
     public ArcTestContainer container = new ArcTestContainer(Converter.class, ToLengthConverter.class,
-            NoopConverterDecorator.class);
+            ConverterDecorator.class);
 
     @SuppressWarnings("serial")
     @Test
     public void testDecoration() {
         Converter<String> converter = Arc.container().instance(new TypeLiteral<Converter<String>>() {
         }).get();
         assertEquals(5, converter.convert("Hola!"));
+        assertTrue(converter.convertToBoolean("echo"));
+        assertFalse(converter.convertToBoolean("echos"));
     }
 
     interface Converter<T> {
+
         default int convert(T value) {
             return Integer.MAX_VALUE;
         }
+
+        // this method is intentionally not overriden by ToLengthConverter
+        default boolean convertToBoolean(T value) {
+            return false;
+        }
     }
 
     @ApplicationScoped
@@ -44,7 +55,7 @@ public int convert(String value) {
 
     @Priority(1)
     @Decorator
-    static class NoopConverterDecorator implements Converter<String> {
+    static class ConverterDecorator implements Converter<String> {
 
         @Inject
         @Delegate
@@ -54,6 +65,12 @@ static class NoopConverterDecorator implements Converter<String> {
         public int convert(String value) {
             return delegate.convert(value);
         }
+
+        @Override
+        public boolean convertToBoolean(String value) {
+            return value.equals("echo");
+        }
+
     }
 
 }