Skip to content

Add getOptionalDecimal to FieldMap #183

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

Merged
merged 1 commit into from
May 9, 2018
Merged

Add getOptionalDecimal to FieldMap #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion quickfixj-core/src/main/java/quickfix/FieldMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,16 @@ public double getDouble(int field) throws FieldNotFound {
}

public BigDecimal getDecimal(int field) throws FieldNotFound {
return getDecimalFromString(field, getString(field));
}

public Optional<BigDecimal> getOptionalDecimal(int field) {
return getOptionalString(field).map(s -> getDecimalFromString(field, s));
}

private BigDecimal getDecimalFromString(int field, String s) {
try {
return DecimalConverter.convert(getString(field));
return DecimalConverter.convert(s);
} catch (final FieldConvertError e) {
throw newIncorrectDataException(e, field);
}
Expand Down
9 changes: 9 additions & 0 deletions quickfixj-core/src/test/java/quickfix/FieldMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package quickfix;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneOffset;
Expand Down Expand Up @@ -101,6 +102,14 @@ public void testOptionalString() {
assertFalse(map.getOptionalString(129).isPresent());
}

public void testOptionalDecimal() {
FieldMap map = new Message();
map.setField(new DecimalField(44, new BigDecimal("1565.10")));
Optional<BigDecimal> optValue = map.getOptionalDecimal(44);
assertTrue(optValue.isPresent());
assertEquals(0, optValue.get().compareTo(new BigDecimal("1565.10")));
assertFalse(map.getOptionalDecimal(6).isPresent());
}

private long epochMilliOfLocalDate(LocalDateTime localDateTime) {
return localDateTime.toInstant(ZoneOffset.UTC).toEpochMilli();
Expand Down