Skip to content

Commit 38b50a5

Browse files
committed
Removed unnecessary method and formalized default case for non-number args
1 parent 09f051b commit 38b50a5

2 files changed

Lines changed: 11 additions & 16 deletions

File tree

src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public String render(String template, long renderLimit) {
267267
}
268268

269269
/**
270-
* Render the given root node, processing extend parents. Equivalent to render(root, true, -1)
270+
* Render the given root node, processing extend parents. Equivalent to render(root, true)
271271
*
272272
* @param root
273273
* node to render
@@ -279,7 +279,7 @@ public String render(Node root) {
279279

280280
/**
281281
* Render the given root node with an option to process extend parents.
282-
* Equivalent to render(root, processExtendRoots, -1).
282+
* Equivalent to render(root, processExtendRoots).
283283
* @param root
284284
* node to render
285285
* @param processExtendRoots
@@ -289,18 +289,6 @@ public String render(Node root, boolean processExtendRoots) {
289289
return render(root, processExtendRoots, config.getMaxOutputSize());
290290
}
291291

292-
/**
293-
* Render the given root node to a certain limit, processing extend parents.
294-
* @param root
295-
* node to render
296-
* @param renderLimit
297-
* the number of characters in response text
298-
* @return
299-
*/
300-
public String render(Node root, long renderLimit) {
301-
return render(root, true, renderLimit);
302-
}
303-
304292
/**
305293
* Render the given root node using this interpreter's current context
306294
*
@@ -312,7 +300,7 @@ public String render(Node root, long renderLimit) {
312300
* the number of characters the result may contain
313301
* @return rendered result
314302
*/
315-
public String render(Node root, boolean processExtendRoots, long renderLimit) {
303+
private String render(Node root, boolean processExtendRoots, long renderLimit) {
316304
OutputList output = new OutputList(renderLimit);
317305
for (Node node : root.getChildren()) {
318306
lineNumber = node.getLineNumber();

src/main/java/com/hubspot/jinjava/lib/filter/RenderFilter.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.hubspot.jinjava.lib.filter;
22

3+
import com.hubspot.jinjava.JinjavaConfig;
34
import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
45
import com.hubspot.jinjava.doc.annotations.JinjavaParam;
56
import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
@@ -27,7 +28,13 @@ public String getName() {
2728
public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
2829
if (args.length > 0) {
2930
String firstArg = args[0];
30-
return interpreter.render(Objects.toString(var), NumberUtils.toLong(firstArg, 0));
31+
return interpreter.render(
32+
Objects.toString(var),
33+
NumberUtils.toLong(
34+
firstArg,
35+
JinjavaConfig.newBuilder().build().getMaxOutputSize()
36+
)
37+
);
3138
}
3239
return interpreter.render(Objects.toString(var));
3340
}

0 commit comments

Comments
 (0)