refactor: Update TripPattern to enforce feed ID consistency

Author: t2gran

application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java

@@ -1,7 +1,5 @@
 package org.opentripplanner.ext.stopconsolidation;
 
-import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
-
 import java.util.List;
 import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
 import org.opentripplanner.transit.model.framework.Deduplicator;
@@ -39,7 +37,7 @@ class TestStopConsolidationModel {
     .withId(new FeedScopedId(SECONDARY_FEED_ID, "secondary-stop-D"))
     .build();
 
-  static final TripPattern PATTERN = TripPattern.of(id("123"))
+  static final TripPattern PATTERN = TripPattern.of(new FeedScopedId(SECONDARY_FEED_ID, "123"))
     .withRoute(ROUTE)
     .withStopPattern(STOP_PATTERN)
     .build();

application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java

@@ -142,6 +142,8 @@ public final class TripPattern
 
     this.hopGeometries = builder.hopGeometries();
     this.routingTripPattern = new RoutingTripPattern(this);
+
+    getId().requireSameFeedId(route.getId());
   }
 
   public static TripPatternBuilder of(FeedScopedId id) {
@@ -445,7 +447,7 @@ public TripPattern clone() {
    */
   public String getFeedId() {
     // The feed id is the same as the agency id on the route, this allows us to obtain it from there.
-    return route.getId().getFeedId();
+    return getId().getFeedId();
   }
 
   public RoutingTripPattern getRoutingTripPattern() {

application/src/test/java/org/opentripplanner/model/TripPatternTest.java

@@ -105,7 +105,7 @@ public TripPattern setupTripPattern(
     var stopPattern = builder.build();
     var route = TimetableRepositoryForTest.route("R1").build();
 
-    return TripPattern.of(new FeedScopedId("Test", "T1"))
+    return TripPattern.of(new FeedScopedId(route.getId().getFeedId(), "T1"))
       .withRoute(route)
       .withStopPattern(stopPattern)
       .withOriginalTripPattern(originalTripPattern)

application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java

@@ -282,7 +282,7 @@ private TripPattern getOriginalPattern(TestTripPattern pattern) {
       stopTimes.add(stopTime);
     }
 
-    var builder = TripPattern.of(new FeedScopedId("TestFeed", "TestId"))
+    var builder = TripPattern.of(new FeedScopedId(pattern.route().getId().getFeedId(), "TestId"))
       .withRoute(pattern.route())
       .withStopPattern(new StopPattern(stopTimes));
     return builder.build();