Geo: Make rest of ShapeBuilders implement Writable

This is the second part of making ShapeBuilders implement Writable.

This PR add serialization, equality and hashCode to all remaining
ShapeBuilders that don't implement it yet.

core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java

@@ -36,8 +36,6 @@ public class CircleBuilder extends ShapeBuilder {
     public static final String FIELD_RADIUS = "radius";
     public static final GeoShapeType TYPE = GeoShapeType.CIRCLE;
 
-    public static final CircleBuilder PROTOTYPE = new CircleBuilder();
-
     private DistanceUnit unit;
     private double radius;
     private Coordinate center;

core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java

@@ -33,7 +33,6 @@ import java.util.Objects;
 public class EnvelopeBuilder extends ShapeBuilder {
 
     public static final GeoShapeType TYPE = GeoShapeType.ENVELOPE;
-    public static final EnvelopeBuilder PROTOTYPE = new EnvelopeBuilder();
 
     protected Coordinate topLeft;
     protected Coordinate bottomRight;

core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java

@@ -22,16 +22,18 @@ package org.elasticsearch.common.geo.builders;
 import com.spatial4j.core.shape.Point;
 import com.spatial4j.core.shape.Shape;
 import com.vividsolutions.jts.geom.Coordinate;
-import org.elasticsearch.common.geo.XShapeCollection;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 
+import org.elasticsearch.common.geo.XShapeCollection;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.XContentBuilder;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class MultiPointBuilder extends PointCollection<MultiPointBuilder> {
 
-
     public static final GeoShapeType TYPE = GeoShapeType.MULTIPOINT;
 
     @Override
@@ -61,4 +63,39 @@ public class MultiPointBuilder extends PointCollection<MultiPointBuilder> {
     public GeoShapeType type() {
         return TYPE;
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(points);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        MultiPointBuilder other = (MultiPointBuilder) obj;
+        return Objects.equals(points, other.points);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeVInt(points.size());
+        for (Coordinate point : points) {
+            writeCoordinateTo(point, out);
+        }
+    }
+
+    @Override
+    public ShapeBuilder readFrom(StreamInput in) throws IOException {
+        MultiPointBuilder multiPointBuilder = new MultiPointBuilder();
+        int size = in.readVInt();
+        for (int i=0; i < size; i++) {
+            multiPointBuilder.point(readCoordinateFrom(in));
+        }
+        return multiPointBuilder;
+    }
 }

core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java

@@ -33,8 +33,6 @@ public class PointBuilder extends ShapeBuilder {
 
     public static final GeoShapeType TYPE = GeoShapeType.POINT;
 
-    public static final PointBuilder PROTOTYPE = new PointBuilder();
-
     private Coordinate coordinate;
 
     public PointBuilder coordinate(Coordinate coordinate) {

core/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java

@@ -44,9 +44,10 @@ public abstract class AbstractShapeBuilderTestCase<SB extends ShapeBuilder> exte
     public static void init() {
         if (namedWriteableRegistry == null) {
             namedWriteableRegistry = new NamedWriteableRegistry();
-            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, PointBuilder.PROTOTYPE);
-            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, CircleBuilder.PROTOTYPE);
-            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, EnvelopeBuilder.PROTOTYPE);
+            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, new PointBuilder());
+            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, new CircleBuilder());
+            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, new EnvelopeBuilder());
+            namedWriteableRegistry.registerPrototype(ShapeBuilder.class, new MultiPointBuilder());
         }
     }
 

core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you 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 org.elasticsearch.common.geo.builders;
+
+import com.vividsolutions.jts.geom.Coordinate;
+
+import org.elasticsearch.test.geo.RandomShapeGenerator;
+import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType;
+
+import java.io.IOException;
+
+public class MultiPointBuilderTests extends AbstractShapeBuilderTestCase<MultiPointBuilder> {
+
+    @Override
+    protected MultiPointBuilder createTestShapeBuilder() {
+        return (MultiPointBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.MULTIPOINT);
+    }
+
+    @Override
+    protected MultiPointBuilder mutate(MultiPointBuilder original) throws IOException {
+        MultiPointBuilder mutation = copyShape(original);
+        Coordinate[] coordinates = original.coordinates(false);
+        Coordinate coordinate = randomFrom(coordinates);
+        if (randomBoolean()) {
+            if (coordinate.x != 0.0) {
+                coordinate.x = coordinate.x / 2;
+            } else {
+                coordinate.x = randomDoubleBetween(-180.0, 180.0, true);
+            }
+        } else {
+            if (coordinate.y != 0.0) {
+                coordinate.y = coordinate.y / 2;
+            } else {
+                coordinate.y = randomDoubleBetween(-90.0, 90.0, true);
+            }
+        }
+        return mutation.points(coordinates);
+    }
+}