Serialize (#189)

osmlab · Aug 6, 2018 · d6deecf · d6deecf
1 parent 07241ee
commit d6deecf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/org/openstreetmap/atlas/utilities/collections/ShardBucketCollection.java b/src/main/java/org/openstreetmap/atlas/utilities/collections/ShardBucketCollection.java
@@ -42,7 +42,7 @@ public abstract class ShardBucketCollection<LocatedType extends Located & Serial
      * A helper class that associates a shard with the index that its collection is at in the
      * collectionBuckets array.
      */
-    private static class ShardToCollectionIndex implements Located
+    private static class ShardToCollectionIndex implements Located, Serializable
     {
         private static final long serialVersionUID = 4050100671815503794L;
         private final int index;

diff --git a/src/test/java/org/openstreetmap/atlas/utilities/collections/ShardBucketCollectionTest.java b/src/test/java/org/openstreetmap/atlas/utilities/collections/ShardBucketCollectionTest.java
@@ -16,6 +16,7 @@
 import org.openstreetmap.atlas.geography.sharding.SlippyTile;
 import org.openstreetmap.atlas.utilities.maps.MultiMap;
 import org.openstreetmap.atlas.utilities.scalars.Distance;
+import org.openstreetmap.atlas.utilities.testing.FreezeDryFunction;
 
 /**
  * Test for example {@link ShardBucketCollection}s
@@ -31,7 +32,7 @@ public void testMultiPolygonSort()
         final Rectangle maxBounds = SlippyTile.forName("1-0-0").bounds()
                 .contract(Distance.ONE_METER);
 
-        final ShardBucketCollectionTestClasses.MultiPolygonSort multiPolygonSort = new ShardBucketCollectionTestClasses.MultiPolygonSort(
+        ShardBucketCollectionTestClasses.MultiPolygonSort multiPolygonSort = new ShardBucketCollectionTestClasses.MultiPolygonSort(
                 maxBounds, 4);
 
         final MultiPolygon firstShardMultiPolygon = this
@@ -47,6 +48,12 @@ public void testMultiPolygonSort()
         Assert.assertTrue(multiPolygonSort.contains(firstShardMultiPolygon));
         Assert.assertTrue(multiPolygonSort.contains(secondShardMultiPolygon));
 
+        // test serialization
+        multiPolygonSort = new FreezeDryFunction<ShardBucketCollectionTestClasses.MultiPolygonSort>()
+                .apply(multiPolygonSort);
+        Assert.assertTrue(multiPolygonSort.contains(firstShardMultiPolygon));
+        Assert.assertTrue(multiPolygonSort.contains(secondShardMultiPolygon));
+
         // make a multipolygon with an outer for every shard and ensure they all get sorted into
         // their proper buckets
         multiPolygonSort.clear();