Skip to content

Commit

Permalink
Merge pull request #362 from HSLdevcom/empty-transport-mode-allowed
Browse files Browse the repository at this point in the history
Empty transport mode allowed for topic
  • Loading branch information
thjarvin authored Sep 12, 2024
2 parents b233609 + d24c13e commit aeb2884
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fi.hsl</groupId>
<artifactId>transitdata-common</artifactId>
<version>1.6.2-RC</version>
<version>1.6.3-RC</version>
<packaging>jar</packaging>
<name>Common utilities for Transitdata projects</name>
<properties>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/fi/hsl/common/hfp/HfpParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public static Hfp.Topic parseTopic(@NotNull String topic, long receivedAtMs) thr
final Hfp.Topic.TransportMode transportMode = safeValueOf(Hfp.Topic.TransportMode.class, strTransportMode).orElseThrow(() -> new InvalidHfpTopicException("Unknown transport mode: " + topic));
builder.setTransportMode(transportMode);
} else {
throw new InvalidHfpTopicException("Transport mode missing");
log.info("Transport mode is empty for topic: " + topic);
}

final String operatorIdStr = parts[index++];
Expand All @@ -237,11 +237,11 @@ public static Hfp.Topic parseTopic(@NotNull String topic, long receivedAtMs) thr
throw new InvalidHfpTopicException("Operator id is not number: " + operatorIdStr);
}

final String vehicleNumberString = parts[index++];
final String vehicleNumberStr = parts[index++];
try {
builder.setVehicleNumber(Integer.parseInt(vehicleNumberString));
builder.setVehicleNumber(Integer.parseInt(vehicleNumberStr));
} catch (NumberFormatException e) {
throw new InvalidHfpTopicException("Vehicle number is not number: " + vehicleNumberString);
throw new InvalidHfpTopicException("Vehicle number is not number: " + vehicleNumberStr);
}

builder.setUniqueVehicleId(createUniqueVehicleId(builder.getOperatorId(), builder.getVehicleNumber()));
Expand Down

0 comments on commit aeb2884

Please sign in to comment.