From fdd1ae4418ff3a7428553b02d8b07fecd69d0649 Mon Sep 17 00:00:00 2001
From: Martin Kouba <mkouba@redhat.com>
Date: Wed, 2 Oct 2024 15:13:11 +0200
Subject: [PATCH] Qute: fix generated ValueResolver for default methods with
 params

- follows up on https://github.com/quarkusio/quarkus/pull/43602
---
 .../io/quarkus/qute/generator/ValueResolverGenerator.java | 8 ++++----
 .../java/io/quarkus/it/qute/DefaultMethodResource.java    | 7 +++++--
 .../resources/templates/DefaultMethodResource/hello.txt   | 2 +-
 .../src/test/java/io/quarkus/it/qute/QuteTestCase.java    | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
index b390b7b5a60a9..329acd30c1fc8 100644
--- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
+++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
@@ -707,7 +707,7 @@ 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 {
@@ -715,7 +715,7 @@ private void matchMethod(MethodInfo method, ClassInfo clazz, MethodCreator resol
                         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,7 +853,7 @@ 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 {
@@ -861,7 +861,7 @@ private void matchMethods(String matchName, int matchParamsCount, Collection<Met
                                 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
index 68da431a5e14a..8034c10274596 100644
--- 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
index 0a181d9a27831..5c1b7af1f3b20 100644
--- 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}!
\ No newline at end of file
+Hello {name.fullName} at {time.toInstant(zoneOffset)}!
\ No newline at end of file
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
index 7e875a44db5b0..81c791ea56e18 100644
--- 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