Treat BigDecimal and other Numbers as a serializable object type

jasmith-hs · jasmith-hs · commit 8dee42232e55 · 2023-06-23T19:13:22.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java b/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java
@@ -340,7 +340,10 @@ private static boolean isResolvableObjectRec(
 
   public static boolean isPrimitive(Object val) {
     return (
-      val == null || Primitives.isWrapperType(val.getClass()) || val instanceof String
+      val == null ||
+      Primitives.isWrapperType(val.getClass()) ||
+      val instanceof String ||
+      val instanceof Number
     );
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -25,6 +25,7 @@
 import com.hubspot.jinjava.tree.parse.TokenScannerSymbols;
 import com.hubspot.jinjava.util.EagerExpressionResolver.EagerExpressionResult;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -914,4 +915,10 @@ public <T extends Appendable & CharSequence> T appendPyishString(T appendable)
       throw new DeferredValueException("Can't serialize");
     }
   }
+
+  @Test
+  public void itCountsBigDecimalAsPrimitive() {
+    assertThat(EagerExpressionResolver.isResolvableObject(new BigDecimal("2.1E7")))
+      .isTrue();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import com.hubspot.jinjava.tree.parse.TokenScannerSymbols;`
`26`	`26`	`import com.hubspot.jinjava.util.EagerExpressionResolver.EagerExpressionResult;`
`27`	`27`	`import java.io.IOException;`
	`28`	`+import java.math.BigDecimal;`
`28`	`29`	`import java.time.Instant;`
`29`	`30`	`import java.time.ZoneId;`
`30`	`31`	`import java.time.ZonedDateTime;`
`@@ -914,4 +915,10 @@ public <T extends Appendable & CharSequence> T appendPyishString(T appendable)`
`914`	`915`	`throw new DeferredValueException("Can't serialize");`
`915`	`916`	`}`
`916`	`917`	`}`
	`918`	`+`
	`919`	`+ @Test`
	`920`	`+ public void itCountsBigDecimalAsPrimitive() {`
	`921`	`+ assertThat(EagerExpressionResolver.isResolvableObject(new BigDecimal("2.1E7")))`
	`922`	`+ .isTrue();`
	`923`	`+ }`
`917`	`924`	`}`