Implement BiConsumer instead

jasmith-hs · jasmith-hs · commit 7fb1dc7a1726 · 2023-02-10T13:36:21.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/JinjavaConfig.java b/src/main/java/com/hubspot/jinjava/JinjavaConfig.java
@@ -21,15 +21,16 @@
 import com.hubspot.jinjava.el.JinjavaInterpreterResolver;
 import com.hubspot.jinjava.el.JinjavaNodePreProcessor;
 import com.hubspot.jinjava.el.JinjavaObjectUnwrapper;
-import com.hubspot.jinjava.el.NodePreProcessor;
 import com.hubspot.jinjava.el.ObjectUnwrapper;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.Context.Library;
 import com.hubspot.jinjava.interpret.InterpreterFactory;
+import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.JinjavaInterpreterFactory;
 import com.hubspot.jinjava.mode.DefaultExecutionMode;
 import com.hubspot.jinjava.mode.ExecutionMode;
 import com.hubspot.jinjava.random.RandomNumberGeneratorStrategy;
+import com.hubspot.jinjava.tree.Node;
 import com.hubspot.jinjava.tree.parse.DefaultTokenScannerSymbols;
 import com.hubspot.jinjava.tree.parse.TokenScannerSymbols;
 import java.nio.charset.Charset;
@@ -40,6 +41,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BiConsumer;
 import javax.el.ELResolver;
 
 public class JinjavaConfig {
@@ -74,7 +76,7 @@ public class JinjavaConfig {
   private final ObjectMapper objectMapper;
 
   private final ObjectUnwrapper objectUnwrapper;
-  private final NodePreProcessor nodePreProcessor;
+  private final BiConsumer<Node, JinjavaInterpreter> nodePreProcessor;
 
   public static Builder newBuilder() {
     return new Builder();
@@ -234,7 +236,7 @@ public ObjectUnwrapper getObjectUnwrapper() {
     return objectUnwrapper;
   }
 
-  public NodePreProcessor getNodePreProcessor() {
+  public BiConsumer<Node, JinjavaInterpreter> getNodePreProcessor() {
     return nodePreProcessor;
   }
 
@@ -290,7 +292,7 @@ public static class Builder {
     private ObjectMapper objectMapper = new ObjectMapper();
 
     private ObjectUnwrapper objectUnwrapper = new JinjavaObjectUnwrapper();
-    private NodePreProcessor nodePreProcessor = new JinjavaNodePreProcessor();
+    private BiConsumer<Node, JinjavaInterpreter> nodePreProcessor = new JinjavaNodePreProcessor();
 
     private Builder() {}
 
@@ -452,7 +454,9 @@ public Builder withObjectUnwrapper(ObjectUnwrapper objectUnwrapper) {
       return this;
     }
 
-    public Builder withNodePreProcessor(NodePreProcessor nodePreProcessor) {
+    public Builder withNodePreProcessor(
+      BiConsumer<Node, JinjavaInterpreter> nodePreProcessor
+    ) {
       this.nodePreProcessor = nodePreProcessor;
       return this;
     }
diff --git a/src/main/java/com/hubspot/jinjava/el/JinjavaNodePreProcessor.java b/src/main/java/com/hubspot/jinjava/el/JinjavaNodePreProcessor.java
@@ -3,11 +3,12 @@
 import com.hubspot.jinjava.interpret.InterpretException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.tree.Node;
+import java.util.function.BiConsumer;
 
-public class JinjavaNodePreProcessor implements NodePreProcessor {
+public class JinjavaNodePreProcessor implements BiConsumer<Node, JinjavaInterpreter> {
 
   @Override
-  public void preProcess(Node node, JinjavaInterpreter interpreter) {
+  public void accept(Node node, JinjavaInterpreter interpreter) {
     interpreter.getContext().setCurrentNode(node);
     checkForInterrupt(node);
   }
diff --git a/src/main/java/com/hubspot/jinjava/el/NodePreProcessor.java b/src/main/java/com/hubspot/jinjava/el/NodePreProcessor.java
diff --git a/src/main/java/com/hubspot/jinjava/tree/Node.java b/src/main/java/com/hubspot/jinjava/tree/Node.java
@@ -99,6 +99,6 @@ public String toTreeString(int level) {
   }
 
   public void preProcess(JinjavaInterpreter interpreter) {
-    interpreter.getConfig().getNodePreProcessor().preProcess(this, interpreter);
+    interpreter.getConfig().getNodePreProcessor().accept(this, interpreter);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,6 @@ public String toTreeString(int level) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public void preProcess(JinjavaInterpreter interpreter) {`
`102`		`- interpreter.getConfig().getNodePreProcessor().preProcess(this, interpreter);`
	`102`	`+ interpreter.getConfig().getNodePreProcessor().accept(this, interpreter);`
`103`	`103`	`}`
`104`	`104`	`}`