Fix EnumMap serialization

ibi-group · Jan 23, 2024 · 797d727 · 797d727
1 parent 77c8307
commit 797d727
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/main/java/org/opentripplanner/routing/graph/kryosupport/KryoBuilder.java b/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,6 +13,7 @@
 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;
@@ -22,6 +24,7 @@
 import org.opentripplanner.kryo.UnmodifiableCollectionsSerializer;
 import org.opentripplanner.standalone.config.BuildConfig;
 import org.opentripplanner.standalone.config.RouterConfig;
+import org.opentripplanner.street.search.TraverseMode;
 
 public final class KryoBuilder {
 
@@ -57,6 +60,7 @@ public static Kryo create() {
     kryo.register(Set.of(1).getClass(), new JavaImmutableSetSerializer());
     kryo.register(Map.of().getClass(), new JavaImmutableMapSerializer());
     kryo.register(Map.of(1, 1).getClass(), new JavaImmutableMapSerializer());
+    kryo.register(EnumMap.class, new EnumMapSerializer(TraverseMode.class));
 
     kryo.register(HashMultimap.class, new HashMultimapSerializer());
     kryo.register(ArrayListMultimap.class, new ArrayListMultimapSerializer());

diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java
@@ -4,8 +4,10 @@
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -67,6 +69,8 @@ public class StreetEdge
 
   private StreetEdgeCostExtension costExtension;
 
+  private Map<TraverseMode, Float> enumMapTest = new EnumMap<>(TraverseMode.class);
+
   /** back, roundabout, stairs, ... */
   private short flags;
 
@@ -146,6 +150,8 @@ protected StreetEdge(StreetEdgeBuilder<?> builder) {
     inAngle = lineStringInOutAngles.inAngle();
     outAngle = lineStringInOutAngles.outAngle();
     elevationExtension = builder.streetElevationExtension();
+    enumMapTest.put(TraverseMode.WALK, 20438f);
+    enumMapTest.put(TraverseMode.SCOOTER, 23438f);
   }
 
   public StreetEdgeBuilder<?> toBuilder() {