Merge pull request #43653 from mkouba/issue-43489-next

Qute: fix generated ValueResolver for default methods with params
quarkusio · Oct 2, 2024 · b208ba2 · b208ba2
2 parents c01bf2c + fdd1ae4
commit b208ba2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/...ojects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/...ojects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
@@ -707,15 +707,15 @@ private void matchMethod(MethodInfo method, ClassInfo clazz, MethodCreator resol
         }
 
         if (Modifier.isStatic(method.flags())) {
-            if (Modifier.isInterface(clazz.flags())) {
+            if (Modifier.isInterface(method.declaringClass().flags())) {
                 tryCatch.assign(invokeRet,
                         tryCatch.invokeStaticInterfaceMethod(MethodDescriptor.of(method), realParamsHandle));
             } else {
                 tryCatch.assign(invokeRet,
                         tryCatch.invokeStaticMethod(MethodDescriptor.of(method), realParamsHandle));
             }
         } else {
-            if (Modifier.isInterface(clazz.flags())) {
+            if (Modifier.isInterface(method.declaringClass().flags())) {
                 tryCatch.assign(invokeRet,
                         tryCatch.invokeInterfaceMethod(MethodDescriptor.of(method), whenBase, realParamsHandle));
             } else {
@@ -853,15 +853,15 @@ private void matchMethods(String matchName, int matchParamsCount, Collection<Met
                 }
 
                 if (Modifier.isStatic(method.flags())) {
-                    if (Modifier.isInterface(clazz.flags())) {
+                    if (Modifier.isInterface(method.declaringClass().flags())) {
                         tryCatch.assign(invokeRet,
                                 tryCatch.invokeStaticInterfaceMethod(MethodDescriptor.of(method), realParamsHandle));
                     } else {
                         tryCatch.assign(invokeRet,
                                 tryCatch.invokeStaticMethod(MethodDescriptor.of(method), realParamsHandle));
                     }
                 } else {
-                    if (Modifier.isInterface(clazz.flags())) {
+                    if (Modifier.isInterface(method.declaringClass().flags())) {
                         tryCatch.assign(invokeRet,
                                 tryCatch.invokeInterfaceMethod(MethodDescriptor.of(method), whenBase, realParamsHandle));
                     } else {

diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/DefaultMethodResource.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/DefaultMethodResource.java
@@ -1,5 +1,8 @@
 package io.quarkus.it.qute;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
@@ -13,10 +16,10 @@ public class DefaultMethodResource {
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public TemplateInstance get() {
-        return new hello(new Name());
+        return new hello(new Name(), LocalDateTime.now(), ZoneOffset.UTC);
     }
 
-    record hello(Name name) implements TemplateInstance {
+    record hello(Name name, LocalDateTime time, ZoneOffset zoneOffset) implements TemplateInstance {
     };
 
     public static class Name implements Something {

diff --git a/integration-tests/qute/src/main/resources/templates/DefaultMethodResource/hello.txt b/integration-tests/qute/src/main/resources/templates/DefaultMethodResource/hello.txt
@@ -1 +1 @@
-Hello {name.fullName}!
+Hello {name.fullName} at {time.toInstant(zoneOffset)}!
diff --git a/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java b/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java
@@ -27,7 +27,7 @@ public void testTemplates() throws InterruptedException {
                 .contentType(is(ContentType.HTML.toString()))
                 .body(containsString("Hello Ciri!"));
         RestAssured.when().get("/beer").then().body(containsString("Beer Pilsner, completed: true, done: true"));
-        RestAssured.when().get("/defaultmethod").then().body(containsString("Hello MK!"));
+        RestAssured.when().get("/defaultmethod").then().body(containsString("Hello MK"));
     }
 
     @Test