diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java index ebeb241f8..b8fd866c4 100644 --- a/src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java +++ b/src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java @@ -67,20 +67,16 @@ public Object filter( Object toMul = args[0]; Number num; if (toMul != null) { - if (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 - ); - } + try { + num = new BigDecimal(toMul.toString()); + } catch (NumberFormatException e) { + throw new InvalidArgumentException( + interpreter, + this, + InvalidReason.NUMBER_FORMAT, + 0, + toMul + ); } } else { return var; diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/MultiplyFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/MultiplyFilter.java index 26d990fbb..d8cf7fb85 100644 --- a/src/main/java/com/hubspot/jinjava/lib/filter/MultiplyFilter.java +++ b/src/main/java/com/hubspot/jinjava/lib/filter/MultiplyFilter.java @@ -65,20 +65,16 @@ public Object filter( Object toMul = args[0]; Number num; if (toMul != null) { - if (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 - ); - } + try { + num = new BigDecimal(toMul.toString()); + } catch (NumberFormatException e) { + throw new InvalidArgumentException( + interpreter, + this, + InvalidReason.NUMBER_FORMAT, + 0, + toMul + ); } } else { return var; diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java index 0bc092dc1..3f3aa0c9d 100644 --- a/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java +++ b/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java @@ -16,7 +16,7 @@ public void itDivides() { ImmutableMap.of("numerator", 10, "denominator", 2) ) ) - .isEqualTo("5.0"); + .isEqualTo("5"); assertThat( jinjava.render( "{{ numerator // denominator }}", @@ -41,6 +41,6 @@ public void itDividesIntegersWithNonIntegerResult() { ImmutableMap.of("numerator", 9, "denominator", 10) ) ) - .isEqualTo("0.9 0.9"); + .isEqualTo("1 0.9"); } } diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/MultiplyFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/MultiplyFilterTest.java index 7151859ea..d9eef38c3 100644 --- a/src/test/java/com/hubspot/jinjava/lib/filter/MultiplyFilterTest.java +++ b/src/test/java/com/hubspot/jinjava/lib/filter/MultiplyFilterTest.java @@ -20,13 +20,13 @@ public void setup() { public void itMultipliesDecimalNumbers() { Map vars = ImmutableMap.of("test", 10); RenderResult renderResult = jinjava.renderForResult("{{ test|multiply(.25) }}", vars); - assertThat(renderResult.getOutput()).isEqualTo("2.5"); + assertThat(renderResult.getOutput()).isEqualTo("2.50"); } @Test public void itCoercesStringsToNumbers() { Map vars = ImmutableMap.of("test", "10"); RenderResult renderResult = jinjava.renderForResult("{{ test|multiply(.25) }}", vars); - assertThat(renderResult.getOutput()).isEqualTo("2.5"); + assertThat(renderResult.getOutput()).isEqualTo("2.50"); } }