Skip to content

Preserve originalValue when deferring imported template bindings #1336

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

Open
manheychiu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve originalValue when deferring imported template bindings #1336

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
16 changes: 13 additions & 3 deletions src/main/java/com/hubspot/jinjava/lib/tag/ImportTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,19 @@ public static void handleDeferredNodesDuringImport(
interpreter.getContext().addGlobalMacro(macro);
}
childBindings.remove(Context.GLOBAL_MACROS_SCOPE_KEY);
childBindings
.keySet()
.forEach(key -> interpreter.getContext().put(key, DeferredValue.instance()));
childBindings.forEach((key, value) -> {
Object originalValue = value instanceof DeferredValue
? ((DeferredValue) value).getOriginalValue()
: null;
interpreter
.getContext()
.put(
key,
originalValue != null
? DeferredValue.instance(originalValue)
: DeferredValue.instance()
);
});
} else {
for (Map.Entry<String, MacroFunction> macroEntry : child
.getContext()
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,34 @@ public void itHandlesMultiLayerDeferred() {
.isEqualTo("bar val");
}

@Test
public void itPreservesOriginalValueOfDeferredImportedBindings() {
JinjavaInterpreter child = getChildInterpreter(interpreter, "");
Map<String, Object> childBindings = new HashMap<>();
childBindings.put("request", DeferredValue.instance("the real request"));
childBindings.put("valueless", DeferredValue.instance());

ImportTag.handleDeferredNodesDuringImport(
interpreter.parse(""),
"",
childBindings,
child,
interpreter
);

assertThat(interpreter.getContext().get("request")).isInstanceOf(DeferredValue.class);
assertThat(
((DeferredValue) interpreter.getContext().get("request")).getOriginalValue()
)
.isEqualTo("the real request");
assertThat(interpreter.getContext().get("valueless"))
.isInstanceOf(DeferredValue.class);
assertThat(
((DeferredValue) interpreter.getContext().get("valueless")).getOriginalValue()
)
.isNull();
}

@Test
@SuppressWarnings("unchecked")
public void itHandlesMultiLayerSomeAliased() {
Expand Down
Loading