diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended')
2 files changed, 25 insertions, 29 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java index 996adfd649..698af21387 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java @@ -29,11 +29,6 @@ public class ExtendedStatsBucketParser extends BucketMetricsParser { static final ParseField SIGMA = new ParseField("sigma"); @Override - public String type() { - return ExtendedStatsBucketPipelineAggregator.TYPE.name(); - } - - @Override protected ExtendedStatsBucketPipelineAggregatorBuilder buildFactory(String pipelineAggregatorName, String bucketsPath, Map<String, Object> unparsedParams) throws ParseException { @@ -56,9 +51,4 @@ public class ExtendedStatsBucketParser extends BucketMetricsParser { } return factory; } - - @Override - public ExtendedStatsBucketPipelineAggregatorBuilder getFactoryPrototype() { - return ExtendedStatsBucketPipelineAggregatorBuilder.PROTOTYPE; - } } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregatorBuilder.java index 6121a49d13..8856def674 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregatorBuilder.java @@ -19,13 +19,14 @@ package org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended; +import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.AggregatorFactory; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilder; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator.Parser; +import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilder; import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.BucketMetricsPipelineAggregatorBuilder; import java.io.IOException; @@ -35,17 +36,31 @@ import java.util.Objects; public class ExtendedStatsBucketPipelineAggregatorBuilder extends BucketMetricsPipelineAggregatorBuilder<ExtendedStatsBucketPipelineAggregatorBuilder> { - - static final ExtendedStatsBucketPipelineAggregatorBuilder PROTOTYPE = new ExtendedStatsBucketPipelineAggregatorBuilder("", ""); + public static final String NAME = ExtendedStatsBucketPipelineAggregator.TYPE.name(); + public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); private double sigma = 2.0; public ExtendedStatsBucketPipelineAggregatorBuilder(String name, String bucketsPath) { - this(name, new String[] { bucketsPath }); + super(name, ExtendedStatsBucketPipelineAggregator.TYPE.name(), new String[] { bucketsPath }); + } + + /** + * Read from a stream. + */ + public ExtendedStatsBucketPipelineAggregatorBuilder(StreamInput in) throws IOException { + super(in, ExtendedStatsBucketPipelineAggregator.TYPE.name()); + sigma = in.readDouble(); } - private ExtendedStatsBucketPipelineAggregatorBuilder(String name, String[] bucketsPaths) { - super(name, ExtendedStatsBucketPipelineAggregator.TYPE.name(), bucketsPaths); + @Override + protected void innerWriteTo(StreamOutput out) throws IOException { + out.writeDouble(sigma); + } + + @Override + protected boolean usesNewStyleSerialization() { + return true; } /** @@ -94,19 +109,6 @@ public class ExtendedStatsBucketPipelineAggregatorBuilder } @Override - protected ExtendedStatsBucketPipelineAggregatorBuilder innerReadFrom(String name, String[] bucketsPaths, StreamInput in) - throws IOException { - ExtendedStatsBucketPipelineAggregatorBuilder factory = new ExtendedStatsBucketPipelineAggregatorBuilder(name, bucketsPaths); - factory.sigma = in.readDouble(); - return factory; - } - - @Override - protected void innerWriteTo(StreamOutput out) throws IOException { - out.writeDouble(sigma); - } - - @Override protected int innerHashCode() { return Objects.hash(sigma); } @@ -117,4 +119,8 @@ public class ExtendedStatsBucketPipelineAggregatorBuilder return Objects.equals(sigma, other.sigma); } + @Override + public String getWriteableName() { + return NAME; + } }
\ No newline at end of file |