Change to only use allow_snake_case filter when the serialization isn't directly for output

jasmith-hs · jasmith-hs · commit c9f612817dce · 2023-03-16T14:08:10.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/BothCasingBeanSerializer.java b/src/main/java/com/hubspot/jinjava/objects/serialization/BothCasingBeanSerializer.java
@@ -28,9 +28,11 @@ public void serialize(
     throws IOException {
     if (
       Boolean.TRUE.equals(
-        serializerProvider.getAttribute(PyishObjectMapper.EAGER_EXECUTION_ATTRIBUTE)
+        serializerProvider.getAttribute(PyishObjectMapper.ALLOW_SNAKE_CASE_ATTRIBUTE)
       )
     ) {
+      // if it's directly for output, then we don't want to add the additional filter characters,
+      // as doing so would make the "|allow_snake_case" appear in the final output.
       StringBuilder sb = new StringBuilder();
       sb
         .append(PyishSerializable.writeValueAsString(value))
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java
@@ -19,7 +19,7 @@
 
 public class PyishObjectMapper {
   public static final ObjectWriter PYISH_OBJECT_WRITER;
-  public static final String EAGER_EXECUTION_ATTRIBUTE = "eagerExecution";
+  public static final String ALLOW_SNAKE_CASE_ATTRIBUTE = "allowSnakeCase";
 
   static {
     ObjectMapper mapper = new ObjectMapper(
@@ -37,14 +37,18 @@ public class PyishObjectMapper {
 
   public static String getAsUnquotedPyishString(Object val) {
     if (val != null) {
-      return WhitespaceUtils.unquoteAndUnescape(getAsPyishString(val));
+      return WhitespaceUtils.unquoteAndUnescape(getAsPyishString(val, true));
     }
     return "";
   }
 
   public static String getAsPyishString(Object val) {
+    return getAsPyishString(val, false);
+  }
+
+  private static String getAsPyishString(Object val, boolean forOutput) {
     try {
-      return getAsPyishStringOrThrow(val);
+      return getAsPyishStringOrThrow(val, forOutput);
     } catch (IOException e) {
       if (e instanceof LengthLimitingJsonProcessingException) {
         throw new OutputTooBigException(
@@ -57,6 +61,11 @@ public static String getAsPyishString(Object val) {
   }
 
   public static String getAsPyishStringOrThrow(Object val) throws IOException {
+    return getAsPyishStringOrThrow(val, false);
+  }
+
+  public static String getAsPyishStringOrThrow(Object val, boolean forOutput)
+    throws IOException {
     ObjectWriter objectWriter = PYISH_OBJECT_WRITER;
     Writer writer;
     Optional<Long> maxOutputSize = JinjavaInterpreter
@@ -77,13 +86,7 @@ public static String getAsPyishStringOrThrow(Object val) throws IOException {
       writer = new CharArrayWriter();
     }
     objectWriter
-      .withAttribute(
-        EAGER_EXECUTION_ATTRIBUTE,
-        JinjavaInterpreter
-          .getCurrentMaybe()
-          .map(interpreter -> interpreter.getConfig().getExecutionMode().useEagerParser())
-          .orElse(false)
-      )
+      .withAttribute(ALLOW_SNAKE_CASE_ATTRIBUTE, !forOutput)
       .writeValue(writer, val);
     return writer.toString();
   }
diff --git a/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java b/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java
@@ -7,8 +7,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
-import com.hubspot.jinjava.mode.EagerExecutionMode;
 import com.hubspot.jinjava.objects.collections.SizeLimitingPyMap;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -92,25 +92,23 @@ public void itLimitsDepth() {
 
   @Test
   public void itSerializesToSnakeCaseAccessibleMap() {
-    try {
-      Jinjava jinjava = new Jinjava(
-        JinjavaConfig
-          .newBuilder()
-          .withExecutionMode(EagerExecutionMode.instance())
-          .build()
-      );
-      JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
-      assertThat(PyishObjectMapper.getAsPyishString(new Foo("bar")))
-        .isEqualTo("{'fooBar': 'bar'} |allow_snake_case");
-    } finally {
-      JinjavaInterpreter.popCurrent();
-    }
+    assertThat(PyishObjectMapper.getAsPyishString(new Foo("bar")))
+      .isEqualTo("{'fooBar': 'bar'} |allow_snake_case");
   }
 
   @Test
-  public void itDoesNotConvertToSnakeCaseMapInDefaultExecutionMode() {
-    assertThat(PyishObjectMapper.getAsPyishString(new Foo("bar")).trim())
-      .isEqualTo("{'fooBar': 'bar'}");
+  public void itDoesNotConvertToSnakeCaseMapWhenResultIsForOutput() {
+    Jinjava jinjava = new Jinjava(
+      JinjavaConfig
+        .newBuilder()
+        .withLegacyOverrides(
+          LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
+        )
+        .build()
+    );
+    JinjavaInterpreter interpreter = jinjava.newInterpreter();
+    interpreter.getContext().put("foo", new Foo("bar"));
+    assertThat(interpreter.render("{{ foo }}")).isEqualTo("{'fooBar': 'bar'}");
   }
 
   static class Foo {
