Merge Percentile class with interface (#24154)

This commit merges the Percentile interface with the InternalPercentile
class, as we don't need to maintain both.

Author: tlrx

core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentile.java

@@ -19,10 +19,41 @@
 
 package org.elasticsearch.search.aggregations.metrics.percentiles;
 
-public interface Percentile {
+import java.util.Objects;
 
-    double getPercent();
+public class Percentile {
 
-    double getValue();
+    private final double percent;
+    private final double value;
 
+    public Percentile(double percent, double value) {
+        this.percent = percent;
+        this.value = value;
+    }
+
+    public double getPercent() {
+        return percent;
+    }
+
+    public double getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Percentile that = (Percentile) o;
+        return Double.compare(that.percent, percent) == 0
+                && Double.compare(that.value, value) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(percent, value);
+    }
 }

core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java

@@ -21,7 +21,6 @@
 import org.HdrHistogram.DoubleHistogram;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanks;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
@@ -109,7 +108,7 @@ public boolean hasNext() {
 
         @Override
         public Percentile next() {
-            final Percentile next = new InternalPercentile(percentileRank(state, values[i]), values[i]);
+            final Percentile next = new Percentile(percentileRank(state, values[i]), values[i]);
             ++i;
             return next;
         }

core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java

@@ -21,7 +21,6 @@
 import org.HdrHistogram.DoubleHistogram;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
@@ -99,7 +98,7 @@ public boolean hasNext() {
 
         @Override
         public Percentile next() {
-            final Percentile next = new InternalPercentile(percents[i], state.getValueAtPercentile(percents[i]));
+            final Percentile next = new Percentile(percents[i], state.getValueAtPercentile(percents[i]));
             ++i;
             return next;
         }

core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java

@@ -20,7 +20,6 @@
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanks;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
@@ -106,7 +105,7 @@ public boolean hasNext() {
 
         @Override
         public Percentile next() {
-            final Percentile next = new InternalPercentile(percentileRank(state, values[i]), values[i]);
+            final Percentile next = new Percentile(percentileRank(state, values[i]), values[i]);
             ++i;
             return next;
         }

core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java

@@ -20,7 +20,6 @@
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
@@ -95,7 +94,7 @@ public boolean hasNext() {
 
         @Override
         public Percentile next() {
-            final Percentile next = new InternalPercentile(percents[i], state.quantile(percents[i] / 100));
+            final Percentile next = new Percentile(percents[i], state.quantile(percents[i] / 100));
             ++i;
             return next;
         }

core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java

@@ -26,7 +26,6 @@
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.metrics.InternalNumericMetricsAggregation;
 import org.elasticsearch.search.aggregations.metrics.max.InternalMax;
-import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
 import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
 
@@ -136,7 +135,7 @@ public boolean hasNext() {
 
         @Override
         public Percentile next() {
-            final Percentile next = new InternalPercentile(percents[i], percentiles[i]);
+            final Percentile next = new Percentile(percents[i], percentiles[i]);
             ++i;
             return next;
         }