Merge branch 'master' into feature/client_aggs_parsing

3 files changed, 21 insertions, 10 deletions

diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java
index bd65cd28af..da69115ac6 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java
@@ -30,6 +30,7 @@ import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Serialization and merge logic for {@link GeoCentroidAggregator}.
@@ -154,4 +155,24 @@ public class InternalGeoCentroid extends InternalAggregation implements GeoCentr
         }
         return builder;
     }
+
+    @Override
+    public boolean doEquals(Object o) {
+        InternalGeoCentroid that = (InternalGeoCentroid) o;
+        return count == that.count &&
+                Objects.equals(centroid, that.centroid);
+    }
+
+    @Override
+    protected int doHashCode() {
+        return Objects.hash(centroid, count);
+    }
+
+    @Override
+    public String toString() {
+        return "InternalGeoCentroid{" +
+                "centroid=" + centroid +
+                ", count=" + count +
+                '}';
+    }
 }
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
index 08c9292d54..b0b2ea73d3 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
@@ -113,11 +113,6 @@ public class InternalStats extends InternalNumericMetricsAggregation.MultiValue
     }
 
     @Override
-    public String getCountAsString() {
-        return valueAsString(Metrics.count.name());
-    }
-
-    @Override
     public String getMinAsString() {
         return valueAsString(Metrics.min.name());
     }
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java
index 4910dc1400..46620f51dc 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java
@@ -51,11 +51,6 @@ public interface Stats extends NumericMetricsAggregation.MultiValue {
     double getSum();
 
     /**
-     * @return The number of values that were aggregated as a String.
-     */
-    String getCountAsString();
-
-    /**
      * @return The minimum value of all aggregated values as a String.
      */
     String getMinAsString();