add rangeLimit to JinjavaConfig (minor refactor based on PR comments)

HubSpot · Apr 29, 2021 · 53cf9c1 · 53cf9c1
1 parent d6efa02
commit 53cf9c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java b/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java
@@ -1,8 +1,6 @@
 package com.hubspot.jinjava.lib.fn;
 
-import static com.hubspot.jinjava.interpret.JinjavaInterpreter.getCurrent;
 import static com.hubspot.jinjava.util.Logging.ENGINE_LOG;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.Lists;
 import com.hubspot.jinjava.JinjavaConfig;
@@ -52,7 +50,7 @@ public class Functions {
     }
   )
   public static String renderSuperBlock() {
-    JinjavaInterpreter interpreter = getCurrent();
+    JinjavaInterpreter interpreter = JinjavaInterpreter.getCurrent();
     LengthLimitingStringBuilder result = new LengthLimitingStringBuilder(
       interpreter.getConfig().getMaxOutputSize()
     );
@@ -389,20 +387,15 @@ public static int movePointerToJustBeforeLastWord(int pointer, String s) {
     "The third parameter specifies the step increment. All values can be negative. Impossible ranges will return an empty list. " +
     "Ranges can generate a maximum of " +
     DEFAULT_RANGE_LIMIT +
-    " values by default, but this integer value is configurable.",
+    " values.",
     params = {
       @JinjavaParam(value = "start", type = "number", defaultValue = "0"),
       @JinjavaParam(value = "end", type = "number"),
       @JinjavaParam(value = "step", type = "number", defaultValue = "1")
     }
   )
   public static List<Integer> range(Object arg1, Object... args) {
-    int rangeLimit = requireNonNull(
-        JinjavaInterpreter.getCurrent(),
-        "No JinjavaInterpreter instance available to use range function"
-      )
-      .getConfig()
-      .getRangeLimit();
+    int rangeLimit = JinjavaInterpreter.getCurrent().getConfig().getRangeLimit();
     List<Integer> result = new ArrayList<>();
 
     int start = 0;

diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/RangeFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/RangeFunctionTest.java
@@ -33,9 +33,7 @@ public void afterEach() {
   @Test
   public void interpreterInstanceIsMandatory() {
     JinjavaInterpreter.popCurrent();
-    assertThatThrownBy(() -> Functions.range(1))
-      .isInstanceOf(NullPointerException.class)
-      .hasMessage("No JinjavaInterpreter instance available to use range function");
+    assertThatThrownBy(() -> Functions.range(1)).isInstanceOf(NullPointerException.class);
   }
 
   @Test