Merge pull request #1057 from rdehuyss/master

Small refactoring related to #724
HubSpot · Apr 24, 2023 · 89cd768 · 89cd768
2 parents c1e2e0f + 87464de
commit 89cd768
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/Jinjava.java b/src/main/java/com/hubspot/jinjava/Jinjava.java
@@ -230,10 +230,10 @@ public RenderResult renderForResult(
     JinjavaInterpreter parentInterpreter = JinjavaInterpreter.getCurrent();
     if (parentInterpreter != null) {
       renderConfig = parentInterpreter.getConfig();
-      Map<String, Object> bindingsWithParentContext = new HashMap<>(bindings);
-      if (parentInterpreter.getContext() != null) {
-        bindingsWithParentContext.putAll(parentInterpreter.getContext());
-      }
+      Map<String, Object> bindingsWithParentContext = createBindingsWithParentContext(
+        bindings,
+        parentInterpreter.getContext()
+      );
       context =
         new Context(
           copyGlobalContext(),
@@ -320,6 +320,17 @@ public void registerExpTest(ExpTest t) {
     globalContext.registerExpTest(t);
   }
 
+  protected Map<String, Object> createBindingsWithParentContext(
+    Map<String, ?> bindings,
+    Map<String, ?> bindingsFromParentContext
+  ) {
+    Map<String, Object> bindingsWithParentContext = new HashMap<>(bindings);
+    if (bindingsFromParentContext != null) {
+      bindingsWithParentContext.putAll(bindingsFromParentContext);
+    }
+    return bindingsWithParentContext;
+  }
+
   private Context copyGlobalContext() {
     Context context = new Context(null, globalContext);
     // copy registered.