Merge pull request quarkusio#15074 from mkouba/qute-fix-or-empty

geoand · Feb 15, 2021 · 1035287 · 1035287
2 parents c84efb8 + 3aec5b0
commit 1035287
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java
@@ -119,13 +119,15 @@ public static ValueResolver orEmpty() {
         return new ValueResolver() {
 
             public boolean appliesTo(EvalContext context) {
-                return (context.getBase() == null || Results.Result.NOT_FOUND.equals(context.getBase()))
-                        && context.getName().equals("orEmpty");
+                return context.getParams().isEmpty() && context.getName().equals("orEmpty");
             }
 
             @Override
             public CompletionStage<Object> resolve(EvalContext context) {
-                return empty;
+                if (context.getBase() == null || Results.Result.NOT_FOUND.equals(context.getBase())) {
+                    return empty;
+                }
+                return CompletableFuture.completedFuture(context.getBase());
             }
         };
     }

diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java
@@ -221,9 +221,9 @@ public void testConvenientDataMethods() {
 
     @Test
     public void testOrEmpty() {
-        Engine engine = Engine.builder().addDefaultSectionHelpers()
-                .addValueResolvers(ValueResolvers.mapResolver(), ValueResolvers.orEmpty())
-                .build();
-        assertEquals("STARTEND", engine.parse("START{#for pet in pets.orEmpty}...{/for}END").data("pets", null).render());
+        Engine engine = Engine.builder().addDefaults().build();
+        assertEquals("STARTEND::STARTJackEND",
+                engine.parse("START{#for pet in pets.orEmpty}...{/for}END::START{#for dog in dogs.orEmpty}{dog}{/for}END")
+                        .data("pets", null, "dogs", Collections.singleton("Jack")).render());
     }
 }