Use eager parser depending on execution mode

jasmith-hs · jasmith-hs · commit 58110c919860 · 2021-03-30T16:00:50.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/Jinjava.java b/src/main/java/com/hubspot/jinjava/Jinjava.java
@@ -85,18 +85,17 @@ public Jinjava(JinjavaConfig globalConfig) {
     this.globalContext = new Context();
 
     Properties expConfig = new Properties();
-    // TODO add config flag
-    //    if (globalConfig.isEagerExecutionEnabled()) {
-    expConfig.setProperty(
-      TreeBuilder.class.getName(),
-      EagerExtendedSyntaxBuilder.class.getName()
-    );
-    //    } else {
-    //      expConfig.setProperty(
-    //        TreeBuilder.class.getName(),
-    //        ExtendedSyntaxBuilder.class.getName()
-    //      );
-    //    }
+    if (globalConfig.getExecutionMode().useEagerParser()) {
+      expConfig.setProperty(
+        TreeBuilder.class.getName(),
+        EagerExtendedSyntaxBuilder.class.getName()
+      );
+    } else {
+      expConfig.setProperty(
+        TreeBuilder.class.getName(),
+        ExtendedSyntaxBuilder.class.getName()
+      );
+    }
 
     TypeConverter converter = new TruthyTypeConverter();
     this.expressionFactory = new ExpressionFactoryImpl(expConfig, converter);
diff --git a/src/main/java/com/hubspot/jinjava/el/JinjavaInterpreterResolver.java b/src/main/java/com/hubspot/jinjava/el/JinjavaInterpreterResolver.java
@@ -242,13 +242,15 @@ private Object getValue(
             }
 
             if (value instanceof DeferredValue) {
-              // TODO add a flag to toggle which is thrown
-              throw new DeferredParsingException(String.class, propertyName);
-              //              throw new DeferredValueException(
-              //                propertyName,
-              //                interpreter.getLineNumber(),
-              //                interpreter.getPosition()
-              //              );
+              if (interpreter.getConfig().getExecutionMode().useEagerParser()) {
+                throw new DeferredParsingException(String.class, propertyName);
+              } else {
+                throw new DeferredValueException(
+                  propertyName,
+                  interpreter.getLineNumber(),
+                  interpreter.getPosition()
+                );
+              }
             }
           } catch (PropertyNotFoundException e) {
             if (errOnUnknownProp) {
diff --git a/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java b/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java
@@ -425,9 +425,11 @@ public Object retraceVariable(String variable, int lineNumber, int startPosition
     Object obj = context.get(varName);
     if (obj != null) {
       if (obj instanceof DeferredValue) {
-        // TODO add a flag to toggle which is thrown
-        throw new DeferredParsingException(String.class, variable);
-        //        throw new DeferredValueException(variable, lineNumber, startPosition);
+        if (config.getExecutionMode().useEagerParser()) {
+          throw new DeferredParsingException(String.class, variable);
+        } else {
+          throw new DeferredValueException(variable, lineNumber, startPosition);
+        }
       }
       obj = var.resolve(obj);
     }
diff --git a/src/main/java/com/hubspot/jinjava/mode/EagerExecutionMode.java b/src/main/java/com/hubspot/jinjava/mode/EagerExecutionMode.java
@@ -20,6 +20,11 @@ public boolean isPreserveRawTags() {
     return true;
   }
 
+  @Override
+  public boolean useEagerParser() {
+    return true;
+  }
+
   @Override
   public void prepareContext(Context context) {
     context
diff --git a/src/main/java/com/hubspot/jinjava/mode/ExecutionMode.java b/src/main/java/com/hubspot/jinjava/mode/ExecutionMode.java
@@ -7,5 +7,9 @@ default boolean isPreserveRawTags() {
     return false;
   }
 
+  default boolean useEagerParser() {
+    return false;
+  }
+
   default void prepareContext(Context context) {}
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,9 @@ default boolean isPreserveRawTags() {`
`7`	`7`	`return false;`
`8`	`8`	`}`
`9`	`9`
	`10`	`+ default boolean useEagerParser() {`
	`11`	`+ return false;`
	`12`	`+ }`
	`13`	`+`
`10`	`14`	`default void prepareContext(Context context) {}`
`11`	`15`	`}`