Skip to content

Add getOptionalString + unit test to FieldMap #162

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
Jan 25, 2018
Merged

Add getOptionalString + unit test to FieldMap #162

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
16 changes: 10 additions & 6 deletions 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 @@ -37,13 +37,8 @@
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.TreeMap;

/**
* Field container used by messages, groups, and composites.
Expand Down Expand Up @@ -232,6 +227,15 @@ public String getString(int field) throws FieldNotFound {
return getField(field).getObject();
}

public Optional<String> getOptionalString(int field) {
final StringField f = (StringField) fields.get(field);
if (f == null) {
return Optional.empty();
} else {
return Optional.of(f.getValue());
}
}

public boolean getBoolean(int field) throws FieldNotFound {
try {
return BooleanConverter.convert(getString(field));
Expand Down
11 changes: 11 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
Expand Up @@ -11,6 +11,7 @@
import quickfix.field.converter.UtcTimeOnlyConverter;

import java.util.Iterator;
import java.util.Optional;

/**
* Tests the {@link FieldMap} class.
Expand Down Expand Up @@ -91,6 +92,16 @@ public void testOrdering() {
testOrdering(new int[] { 3, 2, 1 }, new int[] { 3, 1 }, new int[] { 3, 1, 2 });
}

public void testOptionalString() {
FieldMap map = new Message();
map.setField(new StringField(128, "bigbank"));
Optional<String> optValue = map.getOptionalString(128);
assertTrue(optValue.isPresent());
assertEquals("bigbank", optValue.get());
assertFalse(map.getOptionalString(129).isPresent());
}


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