refactor(MobilityProfileParser): Use EnumMap

src/ext-test/java/org/opentripplanner/ext/mobilityprofile/MobilityProfileRoutingTest.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.openstreetmap.model.OSMWay;
@@ -67,7 +67,7 @@ void canPreserveWalkPermissionOnFootway() {
 
   @Test
   void canProRateProfileCosts() {
-    Map<MobilityProfile, Float> profileCost = new HashMap<>();
+    Map<MobilityProfile, Float> profileCost = new EnumMap<>(MobilityProfile.class);
     profileCost.put(MobilityProfile.NONE, 10.0f);
     profileCost.put(MobilityProfile.DEVICE, 100.0f);
 

src/ext/java/org/opentripplanner/ext/mobilityprofile/MobilityProfileParser.java

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 import org.slf4j.Logger;
@@ -67,9 +68,7 @@ private static void parseRow(
       String key = getKey(id, fromNode, toNode);
       float lengthMeters = ONE_MILE_IN_METERS * Float.parseFloat(reader.get("Link Length"));
 
-      // The weight map has to be a HashMap instead of an EnumMap so that it is correctly
-      // persisted in the graph.
-      var weightMap = new HashMap<MobilityProfile, Float>();
+      var weightMap = new EnumMap<MobilityProfile, Float>(MobilityProfile.class);
       for (var profile : MobilityProfile.values()) {
         currentColumnHeader = profile.getText();
         try {

src/ext/java/org/opentripplanner/ext/mobilityprofile/MobilityProfileRouting.java

@@ -3,7 +3,6 @@
 import static java.util.Map.entry;
 
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
 import org.opentripplanner.openstreetmap.model.OSMWay;
 import org.opentripplanner.street.model.StreetTraversalPermission;
@@ -85,7 +84,7 @@ public static Map<MobilityProfile, Float> getProRatedProfileCosts(
     float ratio
   ) {
     // Has to be a HashMap for graph serialization
-    Map<MobilityProfile, Float> result = new HashMap<>();
+    Map<MobilityProfile, Float> result = new EnumMap<>(MobilityProfile.class);
     cost.forEach((k, v) -> result.put(k, v * ratio));
     return result;
   }

src/main/java/org/opentripplanner/routing/graph/kryosupport/KryoBuilder.java

@@ -3,6 +3,7 @@
 import com.conveyal.kryo.TIntArrayListSerializer;
 import com.conveyal.kryo.TIntIntHashMapSerializer;
 import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.serializers.EnumMapSerializer;
 import com.esotericsoftware.kryo.serializers.ExternalizableSerializer;
 import com.esotericsoftware.kryo.util.DefaultInstantiatorStrategy;
 import com.google.common.collect.ArrayListMultimap;
@@ -12,11 +13,13 @@
 import gnu.trove.impl.hash.TPrimitiveHash;
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.map.hash.TIntIntHashMap;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.objenesis.strategy.SerializingInstantiatorStrategy;
+import org.opentripplanner.ext.mobilityprofile.MobilityProfile;
 import org.opentripplanner.kryo.BuildConfigSerializer;
 import org.opentripplanner.kryo.RouterConfigSerializer;
 import org.opentripplanner.kryo.UnmodifiableCollectionsSerializer;
@@ -65,6 +68,7 @@ public static Kryo create() {
     kryo.register(RouterConfig.class, new RouterConfigSerializer());
     kryo.register(BuildConfig.class, new BuildConfigSerializer());
     kryo.register(AtomicInteger.class, new AtomicIntegerSerializer());
+    kryo.register(EnumMap.class, new EnumMapSerializer(MobilityProfile.class));
 
     UnmodifiableCollectionsSerializer.registerSerializers(kryo);
     // Instantiation strategy: how should Kryo make new instances of objects when they are deserialized?

src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java

@@ -42,7 +42,7 @@ public class StreetEdgeBuilder<B extends StreetEdgeBuilder<B>> {
   private float bicycleSafetyFactor;
   private short flags;
   private StreetElevationExtension streetElevationExtension;
-  private Map<MobilityProfile, Float> profileCosts = new HashMap<>(); // new EnumMap<>(MobilityProfile.class);
+  private Map<MobilityProfile, Float> profileCosts = new EnumMap<>(MobilityProfile.class);
 
   public StreetEdgeBuilder() {
     this.defaultLength = true;