Always add spacing when ending an object in the pyish object mapper

jasmith-hs · jasmith-hs · commit bf9b540705ea · 2022-11-17T14:33:10.000-05:00
To prevent situations where something is serialized and it appears to have the end expression symbol in it
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java
@@ -57,22 +57,6 @@ public static String getAsPyishStringOrThrow(Object val)
     if (maxStringLength.map(max -> string.length() > max).orElse(false)) {
       throw new OutputTooBigException(maxStringLength.get(), string.length());
     }
-    if (
-      interpreterMaybe
-        .map(
-          interpreter ->
-            interpreter
-              .getConfig()
-              .getTokenScannerSymbols()
-              .getExpressionEnd()
-              .equals("}}")
-        )
-        .orElse(true) &&
-      string.contains("}}") &&
-      !string.contains("{{")
-    ) {
-      return String.join("} ", string.split("}(?=})"));
-    }
     return string;
   }
 
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishPrettyPrinter.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishPrettyPrinter.java
@@ -41,6 +41,6 @@ public void writeEndObject(JsonGenerator jg, int nrOfEntries) throws IOException
     if (!this._objectIndenter.isInline()) {
       --this._nesting;
     }
-    jg.writeRaw('}');
+    jg.writeRaw("} ");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public void writeEndObject(JsonGenerator jg, int nrOfEntries) throws IOException`
`41`	`41`	`if (!this._objectIndenter.isInline()) {`
`42`	`42`	`--this._nesting;`
`43`	`43`	`}`
`44`		`- jg.writeRaw('}');`
	`44`	`+ jg.writeRaw("} ");`
`45`	`45`	`}`
`46`	`46`	`}`