Add AutoCloseableWrapper to help avoid requiring explicit popping

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/interpret/AutoCloseableWrapper.java

@@ -0,0 +1,27 @@
+package com.hubspot.jinjava.interpret;
+
+import java.util.function.Consumer;
+
+public class AutoCloseableWrapper<T> implements AutoCloseable {
+
+  private final T t;
+  private final Consumer<T> closeConsumer;
+
+  public static <T> AutoCloseableWrapper<T> of(T t, Consumer<T> closeConsumer) {
+    return new AutoCloseableWrapper<>(t, closeConsumer);
+  }
+
+  protected AutoCloseableWrapper(T t, Consumer<T> closeConsumer) {
+    this.t = t;
+    this.closeConsumer = closeConsumer;
+  }
+
+  public T get() {
+    return t;
+  }
+
+  @Override
+  public void close() {
+    closeConsumer.accept(t);
+  }
+}

src/main/java/com/hubspot/jinjava/interpret/Context.java

@@ -878,25 +878,16 @@ public TemporaryValueClosable<Boolean> withUnwrapRawOverride() {
     return temporaryValueClosable;
   }
 
-  public static class TemporaryValueClosable<T> implements AutoCloseable {
-
-    private final T previousValue;
-    private final Consumer<T> resetValueConsumer;
+  public static class TemporaryValueClosable<T> extends AutoCloseableWrapper<T> {
 
     private TemporaryValueClosable(T previousValue, Consumer<T> resetValueConsumer) {
-      this.previousValue = previousValue;
-      this.resetValueConsumer = resetValueConsumer;
+      super(previousValue, resetValueConsumer);
     }
 
     public static <T> TemporaryValueClosable<T> noOp() {
       return new NoOpTemporaryValueClosable<>();
     }
 
-    @Override
-    public void close() {
-      resetValueConsumer.accept(previousValue);
-    }
-
     private static class NoOpTemporaryValueClosable<T> extends TemporaryValueClosable<T> {
 
       private NoOpTemporaryValueClosable() {

src/main/java/com/hubspot/jinjava/lib/tag/ImportTag.java

@@ -5,6 +5,7 @@
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
+import com.hubspot.jinjava.interpret.AutoCloseableWrapper;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.DeferredValueException;
@@ -90,9 +91,9 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       return "";
     }
     String templateFile = maybeTemplateFile.get();
-    try {
-      Node node = parseTemplateAsNode(interpreter, templateFile);
-
+    try (
+      AutoCloseableWrapper<Node> node = parseTemplateAsNode(interpreter, templateFile);
+    ) {
       JinjavaInterpreter child = interpreter
         .getConfig()
         .getInterpreterFactory()
@@ -102,7 +103,7 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       JinjavaInterpreter.pushCurrent(child);
 
       try {
-        child.render(node);
+        child.render(node.get());
       } finally {
         JinjavaInterpreter.popCurrent();
       }
@@ -114,7 +115,7 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       // If the template depends on deferred values it should not be rendered and all defined variables and macros should be deferred too
       if (!child.getContext().getDeferredNodes().isEmpty()) {
         handleDeferredNodesDuringImport(
-          node,
+          node.get(),
           contextVar,
           childBindings,
           child,
@@ -137,7 +138,6 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
         tagNode.getStartPosition()
       );
     } finally {
-      interpreter.getContext().getCurrentPathStack().pop();
       interpreter.getContext().getImportPathStack().pop();
     }
   }
@@ -210,7 +210,7 @@ public static void handleDeferredNodesDuringImport(
     }
   }
 
-  public static Node parseTemplateAsNode(
+  public static AutoCloseableWrapper<Node> parseTemplateAsNode(
     JinjavaInterpreter interpreter,
     String templateFile
   ) throws IOException {
@@ -220,7 +220,10 @@ public static Node parseTemplateAsNode(
       .push(templateFile, interpreter.getLineNumber(), interpreter.getPosition());
 
     String template = interpreter.getResource(templateFile);
-    return interpreter.parse(template);
+    return AutoCloseableWrapper.of(
+      interpreter.parse(template),
+      n -> interpreter.getContext().getCurrentPathStack().pop()
+    );
   }
 
   public static Optional<String> getTemplateFile(

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTag.java

@@ -1,6 +1,7 @@
 package com.hubspot.jinjava.lib.tag.eager;
 
 import com.google.common.annotations.Beta;
+import com.hubspot.jinjava.interpret.AutoCloseableWrapper;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.InterpretException;
@@ -49,9 +50,12 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       return "";
     }
     String templateFile = maybeTemplateFile.get();
-    try {
-      Node node = ImportTag.parseTemplateAsNode(interpreter, templateFile);
-
+    try (
+      AutoCloseableWrapper<Node> node = ImportTag.parseTemplateAsNode(
+        interpreter,
+        templateFile
+      )
+    ) {
       JinjavaInterpreter child = interpreter
         .getConfig()
         .getInterpreterFactory()
@@ -61,7 +65,7 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       String output;
       try {
         eagerImportingStrategy.setup(child);
-        output = child.render(node);
+        output = child.render(node.get());
       } finally {
         JinjavaInterpreter.popCurrent();
       }
@@ -76,7 +80,7 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
           !child.getContext().getGlobalMacros().isEmpty())
       ) {
         ImportTag.handleDeferredNodesDuringImport(
-          node,
+          node.get(),
           ImportTag.getContextVar(importingData.getHelpers()),
           childBindings,
           child,
@@ -110,7 +114,6 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
         tagToken.getStartPosition()
       );
     } finally {
-      interpreter.getContext().getCurrentPathStack().pop();
       interpreter.getContext().getImportPathStack().pop();
     }
   }