Merge pull request #821 from HubSpot/revert-820-handle-nested-import-file-paths

Revert "Handle nested import file paths"

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/fn/MacroFunction.java

@@ -182,20 +182,14 @@ public boolean equals(Object o) {
     MacroFunction that = (MacroFunction) o;
     return (
       caller == that.caller &&
-      Objects.equals(getName(), that.getName()) &&
-      Objects.equals(
-        localContextScope.get(Context.IMPORT_RESOURCE_PATH_KEY),
-        that.localContextScope.get(Context.IMPORT_RESOURCE_PATH_KEY)
-      )
+      definitionLineNumber == that.definitionLineNumber &&
+      definitionStartPosition == that.definitionStartPosition &&
+      content.equals(that.content)
     );
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(
-      getName(),
-      localContextScope.get(Context.IMPORT_RESOURCE_PATH_KEY),
-      caller
-    );
+    return Objects.hash(content, caller, definitionLineNumber, definitionStartPosition);
   }
 }

src/main/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunction.java

@@ -5,7 +5,6 @@
 import com.hubspot.jinjava.el.ext.AstMacroFunction;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.DeferredMacroValueImpl;
-import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter.InterpreterScopeClosable;
@@ -107,15 +106,11 @@ public String reconstructImage() {
     String prefix = "";
     String suffix = "";
     Optional<String> importFile = macroFunction.getImportFile(interpreter);
-    Object currentDeferredImportResource = null;
     if (importFile.isPresent()) {
       interpreter.getContext().getCurrentPathStack().pop();
-      currentDeferredImportResource =
-        interpreter.getContext().get(Context.DEFERRED_IMPORT_RESOURCE_PATH_KEY);
-      if (currentDeferredImportResource instanceof DeferredValue) {
-        currentDeferredImportResource =
-          ((DeferredValue) currentDeferredImportResource).getOriginalValue();
-      }
+      String currentDeferredImportResource = (String) interpreter
+        .getContext()
+        .get(Context.DEFERRED_IMPORT_RESOURCE_PATH_KEY);
       prefix =
         EagerReconstructionUtils.buildSetTag(
           ImmutableMap.of(
@@ -125,9 +120,6 @@ public String reconstructImage() {
           interpreter,
           false
         );
-      interpreter
-        .getContext()
-        .put(Context.DEFERRED_IMPORT_RESOURCE_PATH_KEY, importFile.get());
       suffix =
         EagerReconstructionUtils.buildSetTag(
           ImmutableMap.of(
@@ -158,10 +150,6 @@ public String reconstructImage() {
             .map(arg -> DeferredMacroValueImpl.instance())
             .toArray()
         );
-
-        interpreter
-          .getContext()
-          .put(Context.DEFERRED_IMPORT_RESOURCE_PATH_KEY, currentDeferredImportResource);
         if (interpreter.getContext().getEagerTokens().size() > numEagerTokensStart) {
           evaluation =
             (String) evaluate(

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

@@ -25,9 +25,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -153,9 +151,7 @@ public static void integrateChild(
         parent.getContext().addGlobalMacro(macro);
       }
       childBindings.remove(Context.GLOBAL_MACROS_SCOPE_KEY);
-      parent
-        .getContext()
-        .putAll(getChildBindingsWithoutImportResourcePath(childBindings));
+      parent.getContext().putAll(childBindings);
     } else {
       for (Map.Entry<String, MacroFunction> macro : child
         .getContext()
@@ -168,17 +164,6 @@ public static void integrateChild(
     }
   }
 
-  public static Map<String, Object> getChildBindingsWithoutImportResourcePath(
-    Map<String, Object> childBindings
-  ) {
-    // Don't remove them from childBindings, because it is needed in a macro function's localContextScope
-    return childBindings
-      .entrySet()
-      .stream()
-      .filter(entry -> !entry.getKey().equals(Context.IMPORT_RESOURCE_PATH_KEY))
-      .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
-  }
-
   public static void handleDeferredNodesDuringImport(
     Node node,
     String contextVar,

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

@@ -338,9 +338,7 @@ public static void integrateChild(
       }
       childBindings.remove(Context.GLOBAL_MACROS_SCOPE_KEY);
       childBindings.remove(Context.IMPORT_RESOURCE_ALIAS_KEY);
-      parent
-        .getContext()
-        .putAll(ImportTag.getChildBindingsWithoutImportResourcePath(childBindings));
+      parent.getContext().putAll(childBindings);
     } else {
       Map<String, MacroFunction> globalMacros = child.getContext().getGlobalMacros();
       for (Map.Entry<String, MacroFunction> macro : globalMacros.entrySet()) {

src/test/java/com/hubspot/jinjava/lib/tag/ImportTagTest.java

@@ -11,7 +11,6 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.RenderResult;
 import com.hubspot.jinjava.lib.fn.MacroFunction;
-import com.hubspot.jinjava.lib.tag.eager.EagerImportTagTest.PrintPathFilter;
 import com.hubspot.jinjava.loader.LocationResolver;
 import com.hubspot.jinjava.loader.RelativePathResolver;
 import com.hubspot.jinjava.loader.ResourceLocator;
@@ -40,7 +39,6 @@ public void setup() {
     );
 
     context.put("padding", 42);
-    context.registerFilter(new PrintPathFilter());
   }
 
   @Test
@@ -354,17 +352,6 @@ public void itSetsErrorLineNumbersCorrectlyForImportedMacros() throws IOExceptio
       .isEqualTo("tags/importtag/errors/macro-with-error.jinja");
   }
 
-  @Test
-  public void itCorrectlySetsNestedPaths() {
-    context.put("foo", "foo");
-    assertThat(
-        interpreter.render(
-          "{% import 'double-import-macro.jinja' %}{{ print_path_macro2(foo) }}"
-        )
-      )
-      .isEqualTo("double-import-macro.jinja\n\nimport-macro.jinja\nfoo\n");
-  }
-
   private String fixture(String name) {
     try {
       return interpreter.renderFlat(

src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java

@@ -535,27 +535,6 @@ public void itCorrectlySetsPathForSecondPass() {
       .isEqualTo("import-macro.jinja\nfoo");
   }
 
-  @Test
-  public void itCorrectlySetsNestedPathsForSecondPass() {
-    setupResourceLocator();
-    context.put("foo", DeferredValue.instance());
-    String firstPassResult = interpreter.render(
-      "{% import 'double-import-macro.jinja' %}{{ print_path_macro2(foo) }}"
-    );
-    assertThat(firstPassResult)
-      .isEqualTo(
-        "{% set deferred_import_resource_path = 'double-import-macro.jinja' %}{% macro print_path_macro2(var) %}{{ filter:print_path.filter(var, ____int3rpr3t3r____) }}\n" +
-        "{% set deferred_import_resource_path = 'import-macro.jinja' %}{% macro print_path_macro(var) %}\n" +
-        "{{ filter:print_path.filter(var, ____int3rpr3t3r____) }}\n" +
-        "{{ var }}\n" +
-        "{% endmacro %}{% set deferred_import_resource_path = null %}{{ print_path_macro(var) }}{% endmacro %}{% set deferred_import_resource_path = null %}{{ print_path_macro2(foo) }}"
-      );
-    context.put("foo", "foo");
-    context.put(Context.GLOBAL_MACROS_SCOPE_KEY, null);
-    assertThat(interpreter.render(firstPassResult).trim())
-      .isEqualTo("double-import-macro.jinja\n\nimport-macro.jinja\nfoo");
-  }
-
   @Test
   public void itImportsDoublyNamed() {
     setupResourceLocator();