Populate and run ExecutionMode's prepareContext method

jasmith-hs · jasmith-hs · commit a60f4d123570 · 2020-11-13T13:56:56.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java b/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java
@@ -83,6 +83,8 @@ public JinjavaInterpreter(
     this.config = renderConfig;
     this.application = application;
 
+    this.config.getExecutionMode().prepareContext(this.context);
+
     switch (config.getRandomNumberGeneratorStrategy()) {
       case THREAD_LOCAL:
         random = ThreadLocalRandom.current();
diff --git a/src/main/java/com/hubspot/jinjava/mode/EagerExecutionMode.java b/src/main/java/com/hubspot/jinjava/mode/EagerExecutionMode.java
@@ -1,6 +1,9 @@
 package com.hubspot.jinjava.mode;
 
 import com.hubspot.jinjava.interpret.Context;
+import com.hubspot.jinjava.lib.tag.eager.EagerTagDecorator;
+import com.hubspot.jinjava.lib.tag.eager.EagerTagFactory;
+import java.util.Optional;
 
 public class EagerExecutionMode implements ExecutionMode {
 
@@ -11,6 +14,13 @@ public boolean isPreserveRawTags() {
 
   @Override
   public void prepareContext(Context context) {
-    // TODO register eager tags & expression node
+    context
+      .getAllTags()
+      .stream()
+      .filter(tag -> !(tag instanceof EagerTagDecorator))
+      .map(tag -> EagerTagFactory.getEagerTagDecorator(tag.getClass()))
+      .filter(Optional::isPresent)
+      .forEach(maybeEagerTag -> context.registerTag(maybeEagerTag.get()));
+    // TODO prepare expression node
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/EagerTest.java b/src/test/java/com/hubspot/jinjava/EagerTest.java
@@ -79,13 +79,6 @@ public Optional<LocationResolver> getLocationResolver() {
       new ExpectedTemplateInterpreter(jinjava, interpreter, "eager");
     localContext = interpreter.getContext();
 
-    localContext
-      .getAllTags()
-      .stream()
-      .map(tag -> EagerTagFactory.getEagerTagDecorator(tag.getClass()))
-      .filter(Optional::isPresent)
-      .forEach(maybeEagerTag -> localContext.registerTag(maybeEagerTag.get()));
-
     localContext.put("deferred", DeferredValue.instance());
     localContext.put("resolved", "resolvedValue");
     localContext.put("dict", ImmutableSet.of("a", "b", "c"));
@@ -723,15 +716,6 @@ public void itWrapsCertainOutputInRaw() {
       config
     );
     JinjavaInterpreter noNestedInterpreter = new JinjavaInterpreter(parentInterpreter);
-    noNestedInterpreter
-      .getContext()
-      .getAllTags()
-      .stream()
-      .map(tag -> EagerTagFactory.getEagerTagDecorator(tag.getClass()))
-      .filter(Optional::isPresent)
-      .forEach(
-        maybeEagerTag -> noNestedInterpreter.getContext().registerTag(maybeEagerTag.get())
-      );
 
     JinjavaInterpreter.pushCurrent(noNestedInterpreter);
     try {
