Skip to content

Add more lenient coercing #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ruslanhubspot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add more lenient coercing #1172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63be60d
add more lenient string parsing
ruslanhubspot Mar 29, 2024
36f752a
fix float parsing and move functions
ruslanhubspot Apr 1, 2024
16c40b8
do not allow extra characters after decimals
ruslanhubspot Apr 1, 2024
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
Next Next commit
add more lenient string parsing
  • Loading branch information
@ruslanhubspot
ruslanhubspot committed Mar 29, 2024
commit 63be60dc99559c478d7735014cd3339bd5f44920
58 changes: 58 additions & 0 deletions src/main/java/com/hubspot/jinjava/el/TruthyTypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ protected BigDecimal coerceToBigDecimal(Object value) {
if (value instanceof DummyObject) {
return BigDecimal.ZERO;
}

if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToBigDecimal(sanitizedValue);
}

return super.coerceToBigDecimal(value);
}

Expand All @@ -41,6 +47,12 @@ protected BigInteger coerceToBigInteger(Object value) {
if (value instanceof DummyObject) {
return BigInteger.ZERO;
}

if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToBigInteger(sanitizedValue);
}

return super.coerceToBigInteger(value);
}

Expand All @@ -49,6 +61,12 @@ protected Double coerceToDouble(Object value) {
if (value instanceof DummyObject) {
return 0d;
}

if (value instanceof String) {
String sanitizedValue = trimCommas((String) value);
return super.coerceToDouble(sanitizedValue);
}
Comment on lines +65 to +68
Copy link
Copy Markdown
Contributor

@jasmith-hs jasmith-hs Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer these to use similar logic as in IntFilter and FloatFilter. Make use of NumberFormat#parse


return super.coerceToDouble(value);
}

Expand All @@ -57,6 +75,12 @@ protected Float coerceToFloat(Object value) {
if (value instanceof DummyObject) {
return 0f;
}

if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToFloat(sanitizedValue);
}

return super.coerceToFloat(value);
}

Expand All @@ -65,14 +89,38 @@ protected Long coerceToLong(Object value) {
if (value instanceof DummyObject) {
return 0L;
}

if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToLong(sanitizedValue);
}
return super.coerceToLong(value);
}

private String trimCommas(String value) {
if (!value.contains(",")) {
return value;
}
return value.replaceAll(",", "");
}

private String trimDecimal(String value) {
if (!value.contains(".")) {
return value;
}
return value.substring(0, value.indexOf("."));
}

@Override
protected Integer coerceToInteger(Object value) {
if (value instanceof DummyObject) {
return 0;
}

if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToInteger(sanitizedValue);
}
return super.coerceToInteger(value);
}

Expand All @@ -81,6 +129,11 @@ protected Short coerceToShort(Object value) {
if (value instanceof DummyObject) {
return 0;
}

if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToShort(sanitizedValue);
}
return super.coerceToShort(value);
}

Expand All @@ -89,6 +142,11 @@ protected Byte coerceToByte(Object value) {
if (value instanceof DummyObject) {
return 0;
}
if (value instanceof String) {
String sanitizedValue = trimDecimal(trimCommas((String) value));
return super.coerceToByte(sanitizedValue);
}
Comment on lines +131 to +134
Copy link
Copy Markdown
Contributor

@jasmith-hs jasmith-hs Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think we should do this when coercing to byte


return super.coerceToByte(value);
}

Expand Down
11 changes: 11 additions & 0 deletions src/test/java/com/hubspot/jinjava/lib/exptest/ComparisonExpTestsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,15 @@ public void testAliases() {
assertThat(jinjava.render("{{ 4 is >= 5 }}", new HashMap<>())).isEqualTo("false");
assertThat(jinjava.render("{{ 4 is != 5 }}", new HashMap<>())).isEqualTo("true");
}

@Test
public void testFormattedStringParsing() {
assertThat(jinjava.render("{{ \"1,050.25\" is ge 4 }}", new HashMap<>()))
.isEqualTo("true");
assertThat(jinjava.render("{{ \"4.1\" is gt 4 }}", new HashMap<>()))
.isEqualTo("false");
assertThat(jinjava.render("{{ 4.0 is le 5.00 }}", new HashMap<>())).isEqualTo("true");
assertThat(jinjava.render("{{ \"4,500.75\" is le 10000.00 }}", new HashMap<>()))
.isEqualTo("true");
}
}