Merge pull request opentripplanner#6685 from leonardehrenfried/remove-validation

Move validation of TripPatternForDate into RealTimeRaptorTransitDataUpdater

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java

@@ -94,7 +94,6 @@ public TripPatternForDate(
         serviceDate,
         last.getArrivalTime(last.getNumStops() - 1)
       ).toLocalDate();
-      assertValidRunningPeriod(startOfRunningPeriod, endOfRunningPeriod, first, last);
     }
   }
 
@@ -224,23 +223,22 @@ public TripPatternForDate newWithFilteredTripTimes(Predicate<TripTimes> filter)
     return new TripPatternForDate(tripPattern, filteredTripTimes, filteredFrequencies, serviceDate);
   }
 
-  private static void assertValidRunningPeriod(
-    LocalDate startOfRunningPeriod,
-    LocalDate endOfRunningPeriod,
-    TripTimes first,
-    TripTimes last
-  ) {
-    if (first.getTrip().getRoute().getFlexibleLineType() != null) {
-      // do not validate running period for flexible trips
-      return;
-    }
+  /**
+   * Asserts that the running period is valid and throws an {@link IllegalArgumentException} if it
+   * is not.
+   * This validation is only needed for real-time updates and should not be applied to flex trips
+   * where it would fail.
+   */
+  public void assertValidRunningPeriod() throws IllegalArgumentException {
     if (startOfRunningPeriod.isAfter(endOfRunningPeriod)) {
+      var firstTrip = tripTimes[0].getTrip();
+      var lastTrip = tripTimes[tripTimes.length - 1].getTrip();
       LOG.warn(
         "Could not construct as start of the running period {} in trip {} is after the end {} in trip {}",
         startOfRunningPeriod,
-        first.getTrip().getId(),
+        firstTrip.getId(),
         endOfRunningPeriod,
-        last.getTrip().getId()
+        lastTrip.getId()
       );
       throw new IllegalArgumentException(
         "Start of the running period is after end of the running period"

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RealTimeRaptorTransitDataUpdater.java

@@ -122,7 +122,10 @@ public void update(
       TripPatternForDate newTripPatternForDate;
 
       try {
-        newTripPatternForDate = tripPatternForDateMapper.map(timetable, timetable.getServiceDate());
+        newTripPatternForDate = tripPatternForDateMapper.mapAndValidate(
+          timetable,
+          timetable.getServiceDate()
+        );
       } catch (IllegalArgumentException exception) {
         // There is some issue with finding the correct running period, using old pattern instead
         newTripPatternForDate = oldTripPatternForDate;

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java

@@ -101,4 +101,21 @@ public TripPatternForDate map(Timetable timetable, LocalDate serviceDate) {
       serviceDate
     );
   }
+
+  /**
+   * Calls {@link TripPatternForDateMapper#map(Timetable, LocalDate)} and validates that the result
+   * is valid. Since it would cause exceptions with flex trips during start up this method should
+   * be used during real-time updates as flex trip cannot have real-time (as of now).
+   *
+   * @throws IllegalArgumentException
+   */
+  @Nullable
+  public TripPatternForDate mapAndValidate(Timetable timetable, LocalDate serviceDate)
+    throws IllegalArgumentException {
+    var result = map(timetable, serviceDate);
+    if (result != null) {
+      result.assertValidRunningPeriod();
+    }
+    return result;
+  }
 }