Change how EnumSet is copied and make EnumSet immutable in Transfer.

opentripplanner · Dec 9, 2024 · 984d34e · 984d34e
1 parent 012f149
commit 984d34e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/application/src/main/java/org/opentripplanner/model/PathTransfer.java b/application/src/main/java/org/opentripplanner/model/PathTransfer.java
@@ -57,7 +57,7 @@ public List<Edge> getEdges() {
   }
 
   public EnumSet<StreetMode> getModes() {
-    return modes.clone();
+    return EnumSet.copyOf(modes);
   }
 
   public PathTransfer withAddedMode(StreetMode mode) {

diff --git a/...n/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java b/...n/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java
@@ -1,5 +1,7 @@
 package org.opentripplanner.routing.algorithm.raptoradapter.transit;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -33,20 +35,20 @@ public class Transfer {
 
   private final List<Edge> edges;
 
-  private final EnumSet<StreetMode> modes;
+  private final ImmutableSet<StreetMode> modes;
 
   public Transfer(int toStop, List<Edge> edges, EnumSet<StreetMode> modes) {
     this.toStop = toStop;
     this.edges = edges;
     this.distanceMeters = (int) edges.stream().mapToDouble(Edge::getDistanceMeters).sum();
-    this.modes = modes;
+    this.modes = Sets.immutableEnumSet(modes);
   }
 
   public Transfer(int toStopIndex, int distanceMeters, EnumSet<StreetMode> modes) {
     this.toStop = toStopIndex;
     this.distanceMeters = distanceMeters;
     this.edges = null;
-    this.modes = modes;
+    this.modes = Sets.immutableEnumSet(modes);
   }
 
   public List<Coordinate> getCoordinates() {
@@ -74,8 +76,8 @@ public List<Edge> getEdges() {
     return edges;
   }
 
-  public EnumSet<StreetMode> getModes() {
-    return modes.clone();
+  public ImmutableSet<StreetMode> getModes() {
+    return modes;
   }
 
   public Optional<RaptorTransfer> asRaptorTransfer(StreetSearchRequest request) {