stklcode/juraclient
0
0
Fork 0
Code Issues Actions Releases 21 Activity

Accept direction ID as String instead if Integer (fix #2)

Browse Source
This commit is contained in:
Stefan Kalscheuer
2018-11-16 11:04:27 +01:00
parent ee91f05898
commit b9656b386a
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/stklcode/pubtrans/ura/model/Trip.java
View File

@ -176,13 +176,15 @@ public final class Trip implements Model {
throw Model.typeErrorString(LINE_NAME, raw.get(LINE_NAME).getClass());
}
if (raw.get(DIRECTION_ID) instanceof Integer) {
directionID = (Integer) raw.get(DIRECTION_ID);
if (raw.get(DIRECTION_ID) instanceof String // Also accept Strings (#2)
|| raw.get(DIRECTION_ID) instanceof Integer
|| raw.get(DIRECTION_ID) instanceof Long) {
directionID = Integer.valueOf(raw.get(DIRECTION_ID).toString());
if (directionID < 0 || directionID > 2) {
throw new IOException("Direction out of range. Expected 1 or 2, found " + directionID);
}
} else {
throw Model.typeError(DIRECTION_ID, raw.get(DIRECTION_ID).getClass(), "Integer");
throw Model.typeError(DIRECTION_ID, raw.get(DIRECTION_ID).getClass(), "String/Long/Integer");
}
if (raw.get(DESTINATION_NAME) instanceof String) {