This is an automated email from the ASF dual-hosted git repository. malka pushed a commit to branch Sedona-17_Shape&WKBSerDe in repository https://gitbox.apache.org/repos/asf/incubator-sedona.git
commit 35fe9eca0ac6a2a0ffbc13d981337b9903db5bf2 Author: Netanel Malka <[email protected]> AuthorDate: Mon Mar 29 21:16:14 2021 +0300 Moved SpatialIndexSerde to serde dir->SpatialIndex Removed unused GeometrySerde object from SpatialIndexSerde (eliminate the requirement to handle WKB and Shape GeometrySerde) --- .../spatialindex}/SpatialIndexSerde.java | 17 ++++++----------- .../core/geometryObjects/SpatialIndexSerdeTest.java | 3 ++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerde.java b/core/src/main/java/org/apache/sedona/core/serde/spatialindex/SpatialIndexSerde.java similarity index 92% rename from core/src/main/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerde.java rename to core/src/main/java/org/apache/sedona/core/serde/spatialindex/SpatialIndexSerde.java index a8e5cbe..084c892 100644 --- a/core/src/main/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerde.java +++ b/core/src/main/java/org/apache/sedona/core/serde/spatialindex/SpatialIndexSerde.java @@ -17,17 +17,21 @@ * under the License. */ -package org.apache.sedona.core.geometryObjects; +package org.apache.sedona.core.serde.spatialindex; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import org.apache.log4j.Logger; +import org.apache.sedona.core.geometryObjects.GeometrySerde; +import org.apache.sedona.core.geometryObjects.WKBGeometrySerde; import org.locationtech.jts.index.quadtree.IndexSerde; import org.locationtech.jts.index.quadtree.Quadtree; import org.locationtech.jts.index.strtree.STRtree; +import java.util.Objects; + /** * Provides methods to efficiently serialize and deserialize spatialIndex types. * <p> @@ -41,18 +45,9 @@ public class SpatialIndexSerde private static final Logger log = Logger.getLogger(SpatialIndexSerde.class); - private final GeometrySerde geometrySerde; - public SpatialIndexSerde() { super(); - geometrySerde = new GeometrySerde(); - } - - public SpatialIndexSerde(GeometrySerde geometrySerde) - { - super(); - this.geometrySerde = geometrySerde; } @Override @@ -83,7 +78,7 @@ public class SpatialIndexSerde { byte typeID = input.readByte(); Type indexType = Type.fromId(typeID); - switch (indexType) { + switch (Objects.requireNonNull(indexType, "indexType cannot be null")) { case QUADTREE: { IndexSerde indexSerde = new IndexSerde(); return indexSerde.read(kryo, input); diff --git a/core/src/test/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerdeTest.java b/core/src/test/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerdeTest.java index b44ee21..99bb46c 100644 --- a/core/src/test/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerdeTest.java +++ b/core/src/test/java/org/apache/sedona/core/geometryObjects/SpatialIndexSerdeTest.java @@ -22,6 +22,7 @@ package org.apache.sedona.core.geometryObjects; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; +import org.apache.sedona.core.serde.spatialindex.SpatialIndexSerde; import org.junit.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; @@ -69,7 +70,7 @@ public class SpatialIndexSerdeTest compareSize(Quadtree.class); compareSize(STRtree.class); -// // workbench of compare time + // workbench of compare time compareTime(Quadtree.class); compareTime(STRtree.class); }
