Implemented decode methods for the Geometry codecs

JAVA-2247

Author: rozza

driver-core/src/main/com/mongodb/client/model/geojson/codecs/AbstractGeometryCodec.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.client.model.geojson.Geometry;
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import static com.mongodb.client.model.geojson.codecs.GeometryDecoderHelper.decodeGeometry;
+import static com.mongodb.client.model.geojson.codecs.GeometryEncoderHelper.encodeGeometry;
+
+abstract class AbstractGeometryCodec<T extends Geometry> implements Codec<T> {
+    private final CodecRegistry registry;
+    private final Class<T> encoderClass;
+
+    AbstractGeometryCodec(final CodecRegistry registry, final Class<T> encoderClass) {
+        this.registry = registry;
+        this.encoderClass = encoderClass;
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final T value, final EncoderContext encoderContext) {
+        encodeGeometry(writer, value, encoderContext, registry);
+    }
+
+    @Override
+    public T decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return decodeGeometry(reader, getEncoderClass());
+    }
+
+    @Override
+    public Class<T> getEncoderClass() {
+        return encoderClass;
+    }
+}

driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeoJsonCodecProvider.java

@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model.geojson.codecs;
 
+import com.mongodb.client.model.geojson.Geometry;
 import com.mongodb.client.model.geojson.GeometryCollection;
 import com.mongodb.client.model.geojson.LineString;
 import com.mongodb.client.model.geojson.MultiLineString;
@@ -53,6 +54,8 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
             return (Codec<T>) new GeometryCollectionCodec(registry);
         } else if (clazz.equals(NamedCoordinateReferenceSystem.class)) {
             return (Codec<T>) new NamedCoordinateReferenceSystemCodec();
+        } else if (clazz.equals(Geometry.class)) {
+            return (Codec<T>) new GeometryCodec(registry);
         }
 
         return null;

driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodec.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.client.model.geojson.Geometry;
+import org.bson.codecs.configuration.CodecRegistry;
+
+/**
+ * A Codec for a GeoJSON Geometry.
+ *
+ * @since 3.5
+ */
+public final class GeometryCodec extends AbstractGeometryCodec<Geometry> {
+
+    /**
+     * Construct a new instance
+     *
+     * @param registry the CodecRegistry
+     */
+    public GeometryCodec(final CodecRegistry registry) {
+        super(registry, Geometry.class);
+    }
+}

driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodecHelper.java

@@ -14,66 +14,22 @@
 
 package com.mongodb.client.model.geojson.codecs;
 
-import com.mongodb.client.model.geojson.Geometry;
 import com.mongodb.client.model.geojson.GeometryCollection;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeCoordinateReferenceSystem;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeType;
-
 /**
  * A Codec for a GeoJSON GeometryCollection.
  *
  * @since 3.1
  */
-public class GeometryCollectionCodec implements Codec<GeometryCollection> {
-    private final CodecRegistry registry;
+public class GeometryCollectionCodec extends AbstractGeometryCodec<GeometryCollection> {
 
     /**
      * Constructs an instance.
      *
      * @param registry the registry
      */
     public GeometryCollectionCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final GeometryCollection value, final EncoderContext encoderContext) {
-        writer.writeStartDocument();
-        encodeType(writer, value);
-
-        writer.writeName("geometries");
-
-        writer.writeStartArray();
-        for (Geometry geometry : value.getGeometries()) {
-            encodeGeometry(writer, geometry, encoderContext);
-        }
-        writer.writeEndArray();
-
-        encodeCoordinateReferenceSystem(writer, value, encoderContext, registry);
-        writer.writeEndDocument();
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    private void encodeGeometry(final BsonWriter writer, final Geometry geometry, final EncoderContext encoderContext) {
-        Codec codec = registry.get(geometry.getClass());
-        encoderContext.encodeWithChildContext(codec, writer, geometry);
-    }
-
-    @Override
-    public Class<GeometryCollection> getEncoderClass() {
-        return GeometryCollection.class;
-    }
-
-    @Override
-    public GeometryCollection decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, GeometryCollection.class);
     }
 }