Use CollectionsView in DefaultTransitService

opentripplanner · Aug 21, 2024 · f34b32d · f34b32d
1 parent 9baf38b
commit f34b32d
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -22,6 +22,7 @@
 import org.locationtech.jts.geom.Envelope;
 import org.opentripplanner.ext.flex.FlexIndex;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
+import org.opentripplanner.framework.collection.CollectionsView;
 import org.opentripplanner.model.FeedInfo;
 import org.opentripplanner.model.PathTransfer;
 import org.opentripplanner.model.StopTimesInPattern;
@@ -298,23 +299,27 @@ public Trip getScheduledTripForId(FeedScopedId id) {
   @Override
   public Collection<Trip> getAllTrips() {
     OTPRequestTimeoutException.checkForTimeout();
-    Collection<Trip> trips = new HashSet<>(transitModelIndex.getTripForId().values());
     TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
     if (currentSnapshot != null) {
-      trips.addAll(currentSnapshot.getAllRealTimeAddedTrips());
+      return new CollectionsView<>(
+        transitModelIndex.getTripForId().values(),
+        currentSnapshot.getAllRealTimeAddedTrips()
+      );
     }
-    return trips;
+    return Collections.unmodifiableCollection(transitModelIndex.getTripForId().values());
   }
 
   @Override
   public Collection<Route> getAllRoutes() {
     OTPRequestTimeoutException.checkForTimeout();
-    Collection<Route> routes = new HashSet<>(transitModelIndex.getAllRoutes());
     TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
     if (currentSnapshot != null) {
-      routes.addAll(currentSnapshot.getAllRealTimeAddedRoutes());
+      return new CollectionsView<>(
+        transitModelIndex.getAllRoutes(),
+        currentSnapshot.getAllRealTimeAddedRoutes()
+      );
     }
-    return routes;
+    return Collections.unmodifiableCollection(transitModelIndex.getAllRoutes());
   }
 
   @Override
@@ -558,14 +563,16 @@ public TripOnServiceDate getTripOnServiceDateById(FeedScopedId datedServiceJourn
 
   @Override
   public Collection<TripOnServiceDate> getAllTripOnServiceDates() {
-    Collection<TripOnServiceDate> tripOnServiceDates = new HashSet<>(
-      transitModelIndex.getTripOnServiceDateForTripAndDay().values()
-    );
     TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
     if (currentSnapshot != null) {
-      tripOnServiceDates.addAll(currentSnapshot.getAllRealTimeAddedTripOnServiceDate());
+      return new CollectionsView<>(
+        transitModelIndex.getTripOnServiceDateForTripAndDay().values(),
+        currentSnapshot.getAllRealTimeAddedTripOnServiceDate()
+      );
     }
-    return tripOnServiceDates;
+    return Collections.unmodifiableCollection(
+      transitModelIndex.getTripOnServiceDateForTripAndDay().values()
+    );
   }
 
   @Override