Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Count Optional as resolvable inside EagerExpressionResolver #1186

Merged
merged 1 commit into from
May 16, 2024
Merged

Count Optional as resolvable inside EagerExpressionResolver #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)) {
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Loading