Unwrap JsonMappingException if cause is LengthLimitingJsonProcessingException

jasmith-hs · jasmith-hs · commit 54f197ba9482 · 2023-06-15T14:35:28.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java
@@ -66,10 +66,14 @@ private static String getAsPyishString(Object val, boolean forOutput) {
     try {
       return getAsPyishStringOrThrow(val, forOutput);
     } catch (IOException e) {
-      if (e instanceof LengthLimitingJsonProcessingException) {
+      IOException unwrapped = e;
+      if (unwrapped.getCause() instanceof LengthLimitingJsonProcessingException) {
+        unwrapped = (LengthLimitingJsonProcessingException) unwrapped.getCause();
+      }
+      if (unwrapped instanceof LengthLimitingJsonProcessingException) {
         throw new OutputTooBigException(
-          ((LengthLimitingJsonProcessingException) e).getMaxSize(),
-          ((LengthLimitingJsonProcessingException) e).getAttemptedSize()
+          ((LengthLimitingJsonProcessingException) unwrapped).getMaxSize(),
+          ((LengthLimitingJsonProcessingException) unwrapped).getAttemptedSize()
         );
       }
       return Objects.toString(val, "");
diff --git a/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java b/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java
@@ -88,7 +88,10 @@ public void itLimitsDepth() {
       assertThatThrownBy(() -> PyishObjectMapper.getAsPyishStringOrThrow(original))
         .as("The string to be serialized is larger than the max output size")
         .isInstanceOf(JsonMappingException.class)
+        .hasCauseInstanceOf(LengthLimitingJsonProcessingException.class)
         .hasMessageContaining("Max length of 10000 chars reached");
+      assertThatThrownBy(() -> PyishObjectMapper.getAsPyishString(original))
+        .isInstanceOf(OutputTooBigException.class);
     } finally {
       JinjavaInterpreter.popCurrent();
     }
