Refactor: clean up operator related stuff in TransitModel

opentripplanner · Oct 10, 2024 · 014824b · 014824b
1 parent 9e58db4
commit 014824b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/org/opentripplanner/netex/NetexModule.java b/src/main/java/org/opentripplanner/netex/NetexModule.java
@@ -90,7 +90,7 @@ public void buildGraph() {
         // TODO OTP2 - Move this into the AddTransitModelEntitiesToGraph
         //           - and make sure they also work with GTFS feeds - GTFS do no
         //           - have operators and notice assignments.
-        transitModel.getOperators().addAll(otpService.getAllOperators());
+        transitModel.addOperators(otpService.getAllOperators());
         transitModel.addNoticeAssignments(otpService.getNoticeAssignments());
 
         AddTransitModelEntitiesToGraph.addToGraph(

diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -122,11 +122,6 @@ public void addFeedInfo(FeedInfo info) {
     this.transitModel.addFeedInfo(info);
   }
 
-  @Override
-  public Collection<Operator> getOperators() {
-    return this.transitModel.getOperators();
-  }
-
   @Override
   public Collection<Notice> getNoticesByEntity(AbstractTransitEntity<?, ?> entity) {
     return this.transitModel.getNoticesByElement().get(entity);

diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
@@ -13,6 +13,7 @@
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -349,7 +350,11 @@ public Set<ZoneId> getAgencyTimeZones() {
   }
 
   public Collection<Operator> getOperators() {
-    return operators;
+    return Collections.unmodifiableCollection(operators);
+  }
+
+  public void addOperators(Collection<Operator> operators) {
+    this.operators.addAll(operators);
   }
 
   /**

diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java
@@ -71,8 +71,6 @@ public interface TransitService {
 
   FeedInfo getFeedInfo(String feedId);
 
-  Collection<Operator> getOperators();
-
   Collection<Notice> getNoticesByEntity(AbstractTransitEntity<?, ?> entity);
 
   /**

diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java
@@ -68,7 +68,7 @@ private Trip createTrip(TripInput tripInput) {
     transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate);
 
     if (tripInput.route().getOperator() != null) {
-      transitModel.getOperators().add(tripInput.route().getOperator());
+      transitModel.addOperators(List.of(tripInput.route().getOperator()));
     }
 
     var stopTimes = IntStream