Fixing the NPE.

entur · Oct 19, 2024 · 4691cf8 · 4691cf8
1 parent 2ffffc9
commit 4691cf8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/no/entur/antu/validation/AntuNetexData.java b/src/main/java/no/entur/antu/validation/AntuNetexData.java
@@ -132,6 +132,13 @@ public Map.Entry<ScheduledStopPointId, QuayCoordinates> coordinatesPerQuayId(
       : Map.entry(scheduledStopPointId, coordinatesForQuayId);
   }
 
+  public QuayCoordinates coordinatesForScheduledStopPoint(
+    ScheduledStopPointId scheduledStopPointId
+  ) {
+    QuayId quayId = quayIdForScheduledStopPoint(scheduledStopPointId);
+    return quayId == null ? null : coordinatesForQuayId(quayId);
+  }
+
   public String stopPointName(ScheduledStopPointId scheduledStopPointId) {
     QuayId quayId = quayIdForScheduledStopPoint(scheduledStopPointId);
     if (quayId == null) {

diff --git a/.../antu/validation/validator/interchange/distance/UnexpectedInterchangeDistanceContext.java b/.../antu/validation/validator/interchange/distance/UnexpectedInterchangeDistanceContext.java
@@ -22,9 +22,7 @@ public static UnexpectedInterchangeDistanceContext of(
       scheduledStopPointId ->
         new ScheduledStopPointCoordinates(
           scheduledStopPointId,
-          antuNetexData.coordinatesForQuayId(
-            antuNetexData.quayIdForScheduledStopPoint(scheduledStopPointId)
-          )
+          antuNetexData.coordinatesForScheduledStopPoint(scheduledStopPointId)
         );
 
     return new UnexpectedInterchangeDistanceContext(
@@ -36,6 +34,7 @@ public static UnexpectedInterchangeDistanceContext of(
           )
         )
         .map(scheduledStopPointCoordinates)
+        .filter(ScheduledStopPointCoordinates::isValid)
         .orElse(null),
       Optional
         .ofNullable(
@@ -44,6 +43,7 @@ public static UnexpectedInterchangeDistanceContext of(
           )
         )
         .map(scheduledStopPointCoordinates)
+        .filter(ScheduledStopPointCoordinates::isValid)
         .orElse(null)
     );
   }