Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/java/com/hubspot/jinjava/JinjavaConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public class JinjavaConfig {
private final ELResolver elResolver;
private final ExecutionMode executionMode;
private final LegacyOverrides legacyOverrides;
private final boolean enablePreciseDivideFilter;

public static Builder newBuilder() {
return new Builder();
Expand Down Expand Up @@ -118,6 +119,7 @@ private JinjavaConfig(Builder builder) {
elResolver = builder.elResolver;
executionMode = builder.executionMode;
legacyOverrides = builder.legacyOverrides;
enablePreciseDivideFilter = builder.enablePreciseDivideFilter;
}

public Charset getCharset() {
Expand Down Expand Up @@ -228,6 +230,10 @@ public LegacyOverrides getLegacyOverrides() {
return legacyOverrides;
}

public boolean getEnablePreciseDivideFilter() {
return enablePreciseDivideFilter;
}

public static class Builder {
private Charset charset = StandardCharsets.UTF_8;
private Locale locale = Locale.ENGLISH;
Expand Down Expand Up @@ -256,6 +262,7 @@ public static class Builder {
private int maxMapSize = Integer.MAX_VALUE;
private ExecutionMode executionMode = DefaultExecutionMode.instance();
private LegacyOverrides legacyOverrides = LegacyOverrides.NONE;
private boolean enablePreciseDivideFilter = false;

private Builder() {}

Expand Down Expand Up @@ -402,6 +409,11 @@ public Builder withLegacyOverrides(LegacyOverrides legacyOverrides) {
return this;
}

public Builder withEnablePreciseDivideFilter(boolean enablePreciseDivideFilter) {
this.enablePreciseDivideFilter = enablePreciseDivideFilter;
return this;
}

public JinjavaConfig build() {
return new JinjavaConfig(this);
}
Expand Down
26 changes: 16 additions & 10 deletions src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,22 @@ public Object filter(
Object toMul = args[0];
Number num;
if (toMul != null) {
try {
num = new BigDecimal(toMul.toString());
} catch (NumberFormatException e) {
throw new InvalidArgumentException(
interpreter,
this,
InvalidReason.NUMBER_FORMAT,
0,
toMul
);
if (
interpreter.getConfig().getEnablePreciseDivideFilter() && toMul instanceof Number
) {
num = (Number) toMul;
} else {
try {
num = new BigDecimal(toMul.toString());
} catch (NumberFormatException e) {
throw new InvalidArgumentException(
interpreter,
this,
InvalidReason.NUMBER_FORMAT,
0,
toMul
);
}
}
} else {
return var;
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

import com.google.common.collect.ImmutableMap;
import com.hubspot.jinjava.BaseJinjavaTest;
import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.LegacyOverrides;
import org.junit.Test;

public class DivideFilterTest extends BaseJinjavaTest {
Expand Down Expand Up @@ -43,4 +46,33 @@ public void itDividesIntegersWithNonIntegerResult() {
)
.isEqualTo("1 0.9");
}

@Test
public void itRendersWithMorePrecisionWithConfigOption() {
Jinjava customJinjava = new Jinjava(
JinjavaConfig
.newBuilder()
.withLegacyOverrides(
LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
)
.withEnablePreciseDivideFilter(true)
.build()
);

assertThat(
jinjava.render(
"{{ numerator|divide(denominator) }}",
ImmutableMap.of("numerator", 2, "denominator", 100)
)
)
.isEqualTo("0");

assertThat(
customJinjava.render(
"{{ numerator|divide(denominator) }}",
ImmutableMap.of("numerator", 2, "denominator", 100)
)
)
.isEqualTo("0.02");
}
}