Merge pull request #1186 from HubSpot/optional-resolvable

Count Optional as resolvable inside EagerExpressionResolver
HubSpot · May 16, 2024 · b5e4e74 · b5e4e74
2 parents ee49945 + 363cae2
commit b5e4e74
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java b/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
@@ -335,6 +336,11 @@ private static boolean isResolvableObjectRec(
         }
         return (Arrays.stream((Object[]) val)).filter(Objects::nonNull)
           .allMatch(item -> isResolvableObjectRec(item, depth + 1, maxDepth, maxSize));
+      } else if (val instanceof Optional) {
+        return ((Optional<?>) val).map(item ->
+            isResolvableObjectRec(item, depth + 1, maxDepth, maxSize)
+          )
+          .orElse(true);
       }
     } catch (DeferredValueException e) {
       if (!(val instanceof PartiallyDeferredValue)) {

diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -954,4 +954,14 @@ public void itCountsBigDecimalAsPrimitive() {
     assertThat(EagerExpressionResolver.isResolvableObject(new BigDecimal("2.1E7")))
       .isTrue();
   }
+
+  @Test
+  public void itCountsOptionalAsResolvable() {
+    assertThat(
+      EagerExpressionResolver.isResolvableObject(
+        ImmutableList.of(Optional.of(123), Optional.empty())
+      )
+    )
+      .isTrue();
+  }
 }