From: Cody Cutrer Date: Sun, 4 Feb 2024 10:57:54 +0000 (-0700) Subject: [jinja] disable failOnUnknownTokens (#16347) X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=24f54f55528e5e47ddca31ae95765eddf5ec1351;p=openhab-addons.git [jinja] disable failOnUnknownTokens (#16347) Home Assistant doesn't enable strict mode, so we shouldn't either Signed-off-by: Cody Cutrer --- diff --git a/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java b/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java index e0e5df8094..c7182c0a94 100644 --- a/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java +++ b/bundles/org.openhab.transform.jinja/src/main/java/org/openhab/transform/jinja/internal/JinjaTransformationService.java @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.hubspot.jinjava.Jinjava; -import com.hubspot.jinjava.JinjavaConfig; import com.hubspot.jinjava.interpret.FatalTemplateErrorsException; /** @@ -47,8 +46,7 @@ public class JinjaTransformationService implements TransformationService { private final Logger logger = LoggerFactory.getLogger(JinjaTransformationService.class); - private final JinjavaConfig config = JinjavaConfig.newBuilder().withFailOnUnknownTokens(true).build(); - private final Jinjava jinjava = new Jinjava(config); + private final Jinjava jinjava = new Jinjava(); /** * Transforms the input value by Jinja template. diff --git a/bundles/org.openhab.transform.jinja/src/test/java/org/openhab/transform/jinja/internal/JinjaTransformationServiceTest.java b/bundles/org.openhab.transform.jinja/src/test/java/org/openhab/transform/jinja/internal/JinjaTransformationServiceTest.java index ecf78c9716..c4211d48a7 100644 --- a/bundles/org.openhab.transform.jinja/src/test/java/org/openhab/transform/jinja/internal/JinjaTransformationServiceTest.java +++ b/bundles/org.openhab.transform.jinja/src/test/java/org/openhab/transform/jinja/internal/JinjaTransformationServiceTest.java @@ -76,15 +76,13 @@ public class JinjaTransformationServiceTest { } @Test - public void testMissingVariableError() { - assertThrows(TransformationException.class, - () -> processor.transform("Hello {{ missing }}!", "{\"string\": \"world\"}")); + public void testMissingVariableError() throws TransformationException { + assertEquals("Hello !", processor.transform("Hello {{ missing }}!", "{\"string\": \"world\"}")); } @Test - public void testMissingMapKeyError() { - assertThrows(TransformationException.class, - () -> processor.transform("Hello {{ value_json.missing }}!", "{\"string\": \"world\"}")); + public void testMissingMapKeyError() throws TransformationException { + assertEquals("Hello !", processor.transform("Hello {{ value_json.missing }}!", "{\"string\": \"world\"}")); } @Test