Merge pull request quarkusio#7930 from mkouba/qute-raw-validation

Qute type-safe templates - fix inconsitency in "raw" validation
stuartwdouglas · Mar 18, 2020 · 40b2888 · 40b2888
2 parents 391d390 + baf7343
commit 40b2888
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java
@@ -718,7 +718,7 @@ void excludeTypeChecks(BuildProducer<TypeCheckExcludeBuildItem> excludes) {
             @Override
             public boolean test(Check check) {
                 // RawString
-                if (check.isProperty() && check.classNameEquals(STRING) && check.nameIn("raw", "safe")) {
+                if (check.isProperty() && check.nameIn("raw", "safe")) {
                     return true;
                 }
                 // Elvis and ternary operators

diff --git a/...oyment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java b/...oyment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java
@@ -20,15 +20,16 @@ public class ObjectValidationSuccessTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(Movie.class, MovieExtensions.class)
                     .addAsResource(new StringAsset("{@java.lang.Object obj}"
-                            + "{obj.toString}"),
+                            + "{@java.lang.Object anotherObj}"
+                            + "{obj.toString}:{anotherObj.raw}"),
                             "templates/object.html"));
 
     @Inject
     Template object;
 
     @Test
     public void testResult() {
-        assertEquals("hello", object.data("obj", "hello").render());
+        assertEquals("hello:<strong>", object.data("obj", "hello").data("anotherObj", "<strong>").render());
     }
 
 }