Merge pull request #13116 from mkouba/issue-13113

Qute: do not ignore a user-provided template variant
quarkusio · Nov 4, 2020 · 48d91ff · 48d91ff
2 parents 106cdaa + e47a50e
commit 48d91ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Locale;
+
 import javax.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -14,6 +16,7 @@
 import io.quarkus.qute.RawString;
 import io.quarkus.qute.Template;
 import io.quarkus.qute.TemplateData;
+import io.quarkus.qute.Variant;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class EscapingTest {
@@ -61,6 +64,13 @@ public void testValidation() {
                 engine.getTemplate("validation").data("text", "<div>").render());
     }
 
+    @Test
+    public void testEngineParse() {
+        assertEquals("&lt;div&gt; <div>",
+                engine.parse("{text} {text.raw}",
+                        new Variant(Locale.ENGLISH, "text/html", "UTF-8")).data("text", "<div>").render());
+    }
+
     @TemplateData
     public static class Item {
 

diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Engine.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Engine.java
@@ -27,7 +27,7 @@ static EngineBuilder builder() {
      * @return the template
      */
     default Template parse(String content) {
-        return parse(content, null);
+        return parse(content, null, null);
     }
 
     /**
@@ -40,7 +40,7 @@ default Template parse(String content) {
      * @return the template
      */
     default Template parse(String content, Variant variant) {
-        return parse(content, null, null);
+        return parse(content, variant, null);
     }
 
     /**