Merge pull request #1135 from HubSpot/958-fix-ZonedDateTime

maple-buice · web-flow · commit 61acbfb63376 · 2023-12-12T10:34:43.000-05:00
Fix serialization of ZonedDateTime
diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/PrettyPrintFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/PrettyPrintFilter.java
@@ -1,9 +1,11 @@
 package com.hubspot.jinjava.lib.filter;
 
-import com.fasterxml.jackson.databind.node.POJONode;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
+import com.hubspot.jinjava.interpret.InvalidInputException;
+import com.hubspot.jinjava.interpret.InvalidReason;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.objects.date.PyishDate;
 import java.util.Map;
@@ -48,7 +50,16 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
     ) {
       varStr = Objects.toString(var);
     } else {
-      varStr = new POJONode(var).toPrettyString();
+      try {
+        varStr =
+          interpreter
+            .getConfig()
+            .getObjectMapper()
+            .writerWithDefaultPrettyPrinter()
+            .writeValueAsString(var);
+      } catch (JsonProcessingException e) {
+        throw new InvalidInputException(interpreter, this, InvalidReason.JSON_WRITE);
+      }
     }
 
     return EscapeFilter.escapeHtmlEntities(
