Migrate DeferredRandomNumberGenerator to use DeferredParsingException

jasmith-hs · jasmith-hs · commit 07ba3971b991 · 2021-04-30T11:16:43.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/DeferredParsingException.java b/src/main/java/com/hubspot/jinjava/el/ext/DeferredParsingException.java
@@ -6,6 +6,12 @@ public class DeferredParsingException extends DeferredValueException {
   private final String deferredEvalResult;
   private final Object sourceNode;
 
+  public DeferredParsingException(String message) {
+    super(message);
+    this.deferredEvalResult = message;
+    this.sourceNode = null;
+  }
+
   public DeferredParsingException(Object sourceNode, String deferredEvalResult) {
     super(
       String.format(
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethod.java b/src/main/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethod.java
@@ -9,6 +9,7 @@
 import de.odysseus.el.tree.impl.ast.AstParameters;
 import de.odysseus.el.tree.impl.ast.AstProperty;
 import javax.el.ELContext;
+import javax.el.ELException;
 
 public class EagerAstMethod extends AstMethod implements EvalResultHolder {
   protected Object evalResult;
@@ -37,10 +38,20 @@ public Object eval(Bindings bindings, ELContext context) {
       evalResult = super.eval(bindings, context);
       hasEvalResult = true;
       return evalResult;
-    } catch (DeferredParsingException e) {
+    } catch (DeferredParsingException | ELException e) {
+      DeferredParsingException e1;
+      if (!(e instanceof DeferredParsingException)) {
+        if (e.getCause() instanceof DeferredParsingException) {
+          e1 = (DeferredParsingException) e.getCause();
+        } else {
+          throw e;
+        }
+      } else {
+        e1 = (DeferredParsingException) e;
+      }
       throw new DeferredParsingException(
         this,
-        getPartiallyResolved(bindings, context, e)
+        getPartiallyResolved(bindings, context, e1)
       );
     } finally {
       property.getAndClearEvalResult();
diff --git a/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java b/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java
@@ -28,11 +28,13 @@
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.el.ExpressionResolver;
 import com.hubspot.jinjava.el.ext.DeferredParsingException;
+import com.hubspot.jinjava.el.ext.ExtendedParser;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorItem;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
 import com.hubspot.jinjava.interpret.errorcategory.BasicTemplateErrorCategory;
 import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
+import com.hubspot.jinjava.objects.serialization.PyishSerializable;
 import com.hubspot.jinjava.random.ConstantZeroRandomNumberGenerator;
 import com.hubspot.jinjava.random.DeferredRandomNumberGenerator;
 import com.hubspot.jinjava.tree.Node;
@@ -60,7 +62,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
-public class JinjavaInterpreter {
+public class JinjavaInterpreter implements PyishSerializable {
   private final Multimap<String, BlockInfo> blocks = ArrayListMultimap.create();
   private final LinkedList<Node> extendParentRoots = new LinkedList<>();
 
@@ -745,4 +747,9 @@ private String getWrappedErrorMessage(
       );
     }
   }
+
+  @Override
+  public String toPyishString() {
+    return ExtendedParser.INTERPRETER;
+  }
 }
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishSerializer.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishSerializer.java
@@ -22,7 +22,7 @@ public void serialize(
     jsonGenerator.setCharacterEscapes(PyishCharacterEscapes.INSTANCE);
     String string;
     if (object instanceof PyishSerializable) {
-      jsonGenerator.writeRaw(((PyishSerializable) object).toPyishString());
+      jsonGenerator.writeRawValue(((PyishSerializable) object).toPyishString());
     } else {
       string = Objects.toString(object, "");
       try {
diff --git a/src/main/java/com/hubspot/jinjava/random/DeferredRandomNumberGenerator.java b/src/main/java/com/hubspot/jinjava/random/DeferredRandomNumberGenerator.java
@@ -1,6 +1,6 @@
 package com.hubspot.jinjava.random;
 
-import com.hubspot.jinjava.interpret.DeferredValueException;
+import com.hubspot.jinjava.el.ext.DeferredParsingException;
 import java.util.Random;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
@@ -14,42 +14,42 @@ public class DeferredRandomNumberGenerator extends Random {
 
   @Override
   protected int next(int bits) {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public int nextInt() {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public int nextInt(int bound) {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public long nextLong() {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public boolean nextBoolean() {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public float nextFloat() {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public double nextDouble() {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
   public synchronized double nextGaussian() {
-    throw new DeferredValueException(EXCEPTION_MESSAGE);
+    throw new DeferredParsingException(EXCEPTION_MESSAGE);
   }
 
   @Override
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -18,6 +18,7 @@
 import com.hubspot.jinjava.objects.date.PyishDate;
 import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
 import com.hubspot.jinjava.objects.serialization.PyishSerializable;
+import com.hubspot.jinjava.random.RandomNumberGeneratorStrategy;
 import com.hubspot.jinjava.tree.parse.DefaultTokenScannerSymbols;
 import com.hubspot.jinjava.tree.parse.TagToken;
 import com.hubspot.jinjava.tree.parse.TokenScannerSymbols;
@@ -52,6 +53,7 @@ private JinjavaInterpreter getInterpreter(boolean evaluateMapKeys) throws Except
       JinjavaConfig
         .newBuilder()
         .withExecutionMode(EagerExecutionMode.instance())
+        .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
         .withLegacyOverrides(
           LegacyOverrides.newBuilder().withEvaluateMapKeys(evaluateMapKeys).build()
         )
@@ -679,6 +681,12 @@ public void itHandlesToday() {
       .isEqualTo("'bar' ~ today()");
   }
 
+  @Test
+  public void itHandlesRandom() {
+    assertThat(eagerResolveExpression("range(1)|random").toString())
+      .isEqualTo("filter:random.filter([0], ____int3rpr3t3r____)");
+  }
+
   public static void voidFunction(int nothing) {}
 
   public static boolean isNull(Object foo, Object bar) {
