Merge pull request #50383 from mkouba/issue-50377

Qute: fix error propagation from section helpers

Author: mkouba

independent-projects/qute/core/src/main/java/io/quarkus/qute/CompletedStage.java

@@ -61,6 +61,9 @@ public boolean isFailure() {
 
     public T get() {
         if (exception != null) {
+            if (exception instanceof TemplateException te) {
+                throw te;
+            }
             // Always wrap the original exception if completed exceptionally
             throw new TemplateException(exception);
         }

independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java

@@ -290,8 +290,8 @@ private DoubletonCondition(Condition condition1, Condition condition2, Operator
         @Override
         public CompletionStage<Object> evaluate(SectionResolutionContext context) {
             CompletionStage<Object> ret = condition1.evaluate(context);
-            if (ret instanceof CompletedStage completed) {
-                ret = evaluateSecond(context, completed.get());
+            if (ret instanceof CompletedStage<Object> completed) {
+                ret = completed.isFailure() ? completed : evaluateSecond(context, completed.get());
             } else {
                 ret = ret.thenCompose(first -> evaluateSecond(context, first));
             }
@@ -323,8 +323,8 @@ CompletionStage<Object> evaluateSecond(SectionResolutionContext context, Object
                 return CompletedStage.of(shortResult);
             }
             CompletionStage<Object> second = condition2.evaluate(context);
-            if (second instanceof CompletedStage completed) {
-                return processValues(operator, firstVal, completed.get());
+            if (second instanceof CompletedStage<Object> completed) {
+                return completed.isFailure() ? completed : processValues(operator, firstVal, completed.get());
             } else {
                 return second.thenCompose(c2 -> processValues(operator, firstVal, c2));
             }
@@ -395,9 +395,10 @@ CompletionStage<Object> evaluateNext(SectionResolutionContext context, Object pr
                     return processConditionValue(context, operator, previousValue, literalVal, iter);
                 } else {
                     CompletionStage<Object> ret = next.evaluate(context);
-                    if (ret instanceof CompletedStage completed) {
-                        return processConditionValue(context, operator, previousValue, completed.get(),
-                                iter);
+                    if (ret instanceof CompletedStage<Object> completed) {
+                        return completed.isFailure() ? completed
+                                : processConditionValue(context, operator, previousValue, completed.get(),
+                                        iter);
                     } else {
                         return ret.thenCompose(r -> processConditionValue(context, operator, previousValue, r, iter));
                     }

independent-projects/qute/core/src/main/java/io/quarkus/qute/Results.java

@@ -19,6 +19,7 @@ public final class Results {
 
     public static final CompletedStage<Object> FALSE = CompletedStage.of(false);
     public static final CompletedStage<Object> TRUE = CompletedStage.of(true);
+    @SuppressWarnings("unchecked")
     public static final CompletedStage<Object> NULL = CompletedStage.NULL;
 
     private Results() {

independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java

@@ -53,7 +53,14 @@ public CompletionStage<ResultNode> resolve(ResolutionContext context, Map<String
                 return r;
             });
         }
-        return helper.resolve(new SectionResolutionContextImpl(context, params, engine));
+        try {
+            return helper.resolve(new SectionResolutionContextImpl(context, params, engine));
+        } catch (Throwable t) {
+            if (t instanceof TemplateException te) {
+                return CompletedStage.failure(te);
+            }
+            return CompletedStage.failure(new TemplateException(t));
+        }
     }
 
     @Override

independent-projects/qute/core/src/test/java/io/quarkus/qute/ErrorPropagationTest.java

@@ -0,0 +1,69 @@
+package io.quarkus.qute;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CompletionStage;
+
+import org.junit.jupiter.api.Test;
+
+public class ErrorPropagationTest {
+
+    @Test
+    public void testErrorPropagation() {
+        Engine engine = Engine.builder()
+                .strictRendering(true)
+                .addSectionHelper("foo", new FooSectionHelper.FooSectionHelperFactory())
+                .addDefaults()
+                .build();
+
+        TemplateException e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#let unused='var'}{bazbaz.size}{/let}").data("bazbaz", null).render());
+        assertEquals("Rendering error: Property \"size\" not found on the base object \"null\" in expression {bazbaz.size}",
+                e.getMessage());
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#for i in 10}{bazbaz.size}{/for}").data("bazbaz", null).render());
+        assertEquals("Rendering error: Property \"size\" not found on the base object \"null\" in expression {bazbaz.size}",
+                e.getMessage());
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#let unused='var'}{#if true}{bazbaz.size}{/if}{/let}").data("bazbaz", null).render());
+        assertEquals("Rendering error: Property \"size\" not found on the base object \"null\" in expression {bazbaz.size}",
+                e.getMessage());
+
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#let unused='var'}{#foo /}{/let}").render());
+        assertTrue(e.getCause() instanceof NullPointerException);
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#for i in 10}{#foo /}{/for}").render());
+        assertTrue(e.getCause() instanceof NullPointerException);
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#if true}{#foo /}{/if}").render());
+        assertTrue(e.getCause() instanceof NullPointerException);
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#for i in 10}{#let unused='var'}{#if true}{#foo /}{/if}{/let}{/for}").render());
+        assertTrue(e.getCause() instanceof NullPointerException);
+        e = assertThrows(TemplateException.class,
+                () -> engine.parse("{#let unused='var'}{#eval '{#if true}{#foo /}{/if}' /}{/let}").render());
+        assertTrue(e.getCause() instanceof NullPointerException);
+    }
+
+    public static class FooSectionHelper implements SectionHelper {
+
+        @Override
+        public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
+            throw new NullPointerException();
+        }
+
+        public static class FooSectionHelperFactory implements SectionHelperFactory<FooSectionHelper> {
+
+            @Override
+            public FooSectionHelper initialize(SectionInitContext context) {
+                return new FooSectionHelper();
+            }
+
+        }
+
+    }
+
+}

independent-projects/qute/core/src/test/java/io/quarkus/qute/LetTimeoutTest.java

@@ -27,7 +27,7 @@ void withDataFactoryMethod() {
 
         assertThatThrownBy(instance::render)
                 .isInstanceOf(TemplateException.class)
-                .hasRootCauseMessage("Rendering error: Key \"c\" not found in the map with keys [a] in expression {c}");
+                .hasMessage("Rendering error: Key \"c\" not found in the map with keys [a] in expression {c}");
     }
 
     @Test
@@ -42,7 +42,7 @@ void withInstanceThenDataForEachEntry() {
         }
         assertThatThrownBy(instance::render)
                 .isInstanceOf(TemplateException.class)
-                .hasRootCauseMessage(
+                .hasMessage(
                         "Rendering error: Key \"c\" not found in the template data map with keys [a] in expression {c}");
     }
 
@@ -58,7 +58,7 @@ void withSet_withInstanceThenDataForEachEntry() {
         }
         assertThatThrownBy(instance::render)
                 .isInstanceOf(TemplateException.class)
-                .hasRootCauseMessage(
+                .hasMessage(
                         "Rendering error: Key \"c\" not found in the template data map with keys [a] in expression {c}");
     }
 
@@ -73,7 +73,7 @@ void withLetWithoutEndTagwithInstanceThenDataForEachEntry() {
         }
         assertThatThrownBy(instance::render)
                 .isInstanceOf(TemplateException.class)
-                .hasRootCauseMessage(
+                .hasMessage(
                         "Rendering error: Key \"c\" not found in the template data map with keys [a] in expression {c}");
     }
 }