Merge pull request #5415 from entur/fix_query_with_empty_quay_id

Fix Transmodel GraphQL query with empty quay id
opentripplanner · Oct 13, 2023 · 5c5d08f · 5c5d08f
2 parents acc39ba + 059cc9d
commit 5c5d08f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/main/java/org/opentripplanner/transit/service/StopModel.java b/src/main/java/org/opentripplanner/transit/service/StopModel.java
@@ -248,6 +248,9 @@ private void reindex() {
   @Nullable
   @SafeVarargs
   private static <V> V getById(FeedScopedId id, Map<FeedScopedId, ? extends V>... maps) {
+    if (id == null) {
+      return null;
+    }
     for (Map<FeedScopedId, ? extends V> map : maps) {
       V v = map.get(id);
       if (v != null) {

diff --git a/src/test/java/org/opentripplanner/transit/service/StopModelTest.java b/src/test/java/org/opentripplanner/transit/service/StopModelTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
@@ -132,4 +133,10 @@ void testGroupOfStations() {
     assertEquals(COOR_B, m.getCoordinateById(ID));
     assertFalse(m.hasAreaStops());
   }
+
+  @Test
+  void testNullStopLocationId() {
+    var m = StopModel.of().build();
+    assertNull(m.getStopLocation(null));
+  }
 }