Merge pull request #35555 from mkouba/issue-35523

Qute: fix regression in the value resolver generator
quarkusio · Aug 25, 2023 · 996f6b5 · 996f6b5
2 parents fd0f246 + 98c5026
commit 996f6b5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java
@@ -100,5 +100,6 @@ private Descriptors() {
             CompletionStage.class);
     public static final FieldDescriptor RESULTS_TRUE = FieldDescriptor.of(Results.class, "TRUE", CompletedStage.class);
     public static final FieldDescriptor RESULTS_FALSE = FieldDescriptor.of(Results.class, "FALSE", CompletedStage.class);
+    public static final FieldDescriptor RESULTS_NULL = FieldDescriptor.of(Results.class, "NULL", CompletedStage.class);
 
 }
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
@@ -393,8 +393,12 @@ public void accept(BytecodeCreator bc) {
                                     && returnType.asPrimitiveType().primitive() == Primitive.BOOLEAN) {
                                 completeBoolean(bc, invokeRet);
                             } else if (method.returnType().name().equals(DotNames.BOOLEAN)) {
+                                BytecodeCreator isNull = bc.ifNull(invokeRet).trueBranch();
+                                isNull.returnValue(isNull.readStaticField(Descriptors.RESULTS_NULL));
                                 completeBoolean(bc, bc.invokeVirtualMethod(Descriptors.BOOLEAN_VALUE, invokeRet));
                             } else if (isEnum(returnType)) {
+                                BytecodeCreator isNull = bc.ifNull(invokeRet).trueBranch();
+                                isNull.returnValue(isNull.readStaticField(Descriptors.RESULTS_NULL));
                                 completeEnum(index.getClassByName(returnType.name()), valueResolver, invokeRet, bc);
                             } else {
                                 bc.returnValue(bc.invokeStaticMethod(Descriptors.COMPLETED_STAGE_OF, invokeRet));
@@ -536,11 +540,11 @@ private boolean completeEnum(ClassInfo enumClass, ClassCreator valueResolver, Re
             BytecodeCreator match;
             if (ifThenElse == null) {
                 ifThenElse = bc.ifThenElse(
-                        Gizmo.equals(bc, result, bc.readStaticField(enumConstantField)));
+                        Gizmo.equals(bc, bc.readStaticField(enumConstantField), result));
                 match = ifThenElse.then();
             } else {
                 match = ifThenElse.elseIf(
-                        b -> Gizmo.equals(b, result, b.readStaticField(enumConstantField)));
+                        b -> Gizmo.equals(b, b.readStaticField(enumConstantField), result));
             }
             match.returnValue(match.invokeVirtualMethod(
                     enumConstantMethod.getMethodDescriptor(), match.getThis()));

diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java
@@ -33,10 +33,18 @@ public boolean hasName() {
         return name != null;
     }
 
-    public Boolean isActive() {
+    public boolean isActive() {
         return true;
     }
 
+    public Boolean isActiveObject() {
+        return true;
+    }
+
+    public Boolean isActiveObjectNull() {
+        return null;
+    }
+
     public boolean hasItems() {
         return false;
     }
@@ -45,6 +53,10 @@ public MyEnum myEnum() {
         return MyEnum.BAR;
     }
 
+    public MyEnum myEnumNull() {
+        return null;
+    }
+
     public List<String> getList(int limit, String dummy) {
         AtomicInteger idx = new AtomicInteger(0);
         return Stream.generate(() -> "" + idx.getAndIncrement())

diff --git a/...-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java b/...-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java
@@ -113,6 +113,8 @@ public void testWithEngine() throws Exception {
         }
         Engine engine = builder.build();
         assertEquals(" FOO ", engine.parse("{#if isActive} {name.toUpperCase} {/if}").render(new MyService()));
+        assertEquals(" FOO ", engine.parse("{#if isActiveObject} {name.toUpperCase} {/if}").render(new MyService()));
+        assertEquals("", engine.parse("{#if isActiveObjectNull} {name.toUpperCase} {/if}").render(new MyService()));
         assertEquals(" FOO ", engine.parse("{#if active} {name.toUpperCase} {/if}").render(new MyService()));
         assertEquals(" FOO ", engine.parse("{#if !hasItems} {name.toUpperCase} {/if}").render(new MyService()));
         assertEquals(" FOO ", engine.parse("{#if !items} {name.toUpperCase} {/if}").render(new MyService()));
@@ -138,6 +140,7 @@ public void testWithEngine() throws Exception {
         assertEquals("5",
                 engine.parse("{#each service.getDummyVarargs(5)}{it}{/}").data("service", new MyService())
                         .render());
+        assertEquals("BAR::", engine.parse("{myEnum}::{myEnumNull}").render(new MyService()));
 
         // Namespace resolvers
         assertEquals("OK", engine.parse("{#if enum is MyEnum:BAR}OK{/if}").data("enum", MyEnum.BAR).render());