honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated registration methods 

Removes deprecated registration methods from SearchModule and
NamedWriteableRegistry and removes the "shims" used to migrate
aggregations to the new registration methods.

Relates to #17085
This commit is contained in:
Nik Everett 2016-04-18 12:06:56 -04:00
parent bbe03c92c2
commit 7a2b923ad1
52 changed files with 11 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java
View File

@ -48,17 +48,6 @@ public class NamedWriteableRegistry {
innerRegistry.register(name, reader);
}
/**
* Registers a {@link NamedWriteable} prototype given its category.
* @deprecated Prefer {@link #register(Class, String, org.elasticsearch.common.io.stream.Writeable.Reader)}
*/
@Deprecated
@SuppressWarnings("rawtypes") // TODO remove this method entirely before 5.0.0 GA
public synchronized <T extends NamedWriteable> void registerPrototype(Class<T> categoryClass,
NamedWriteable<? extends T> namedWriteable) {
register(categoryClass, namedWriteable.getWriteableName(), namedWriteable::readFrom);
}
/**
* Returns a prototype of the {@link NamedWriteable} object identified by the name provided as argument and its category
*/

24
core/src/main/java/org/elasticsearch/search/SearchModule.java
View File

@ -381,18 +381,6 @@ public class SearchModule extends AbstractModule {
namedWriteableRegistry.register(AggregatorBuilder.class, aggregationName.getPreferredName(), reader);
}
/**
* Register an aggregation.
*
* @deprecated prefer {@link #registerPipelineAggregation(Writeable.Reader, PipelineAggregator.Parser, ParseField)}. Will be removed
* before 5.0.0GA.
*/
@Deprecated // NORELEASE remove this before 5.0.0GA
public void registerAggregatorParser(Aggregator.Parser parser) {
aggregationParserRegistry.register(parser, new ParseField(parser.type()));
namedWriteableRegistry.registerPrototype(AggregatorBuilder.class, parser.getFactoryPrototypes());
}
/**
* Register a pipeline aggregation.
*
@ -407,18 +395,6 @@ public class SearchModule extends AbstractModule {
namedWriteableRegistry.register(PipelineAggregatorBuilder.class, aggregationName.getPreferredName(), reader);
}
/**
* Register a pipeline aggregation.
*
* @deprecated prefer {@link #registerPipelineAggregation(Writeable.Reader, PipelineAggregator.Parser, ParseField)}. Will be removed
* before 5.0.0GA.
*/
@Deprecated // NORELEASE remove this before 5.0.0GA
public void registerPipelineParser(PipelineAggregator.Parser parser) {
pipelineAggregationParserRegistry.register(parser, new ParseField(parser.type()));
namedWriteableRegistry.registerPrototype(PipelineAggregatorBuilder.class, parser.getFactoryPrototype());
}
public AggregatorParsers getAggregatorParsers() {
return aggregatorParsers;
}

16
core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java
View File

@ -46,14 +46,6 @@ public abstract class Aggregator extends BucketCollector implements Releasable {
*/
@FunctionalInterface
public interface Parser {
/**
* @return The aggregation type this parser is associated with.
*/
default String type() {
throw new UnsupportedOperationException(); // NORELEASE remove before 5.0.0GA
}
/**
* Returns the aggregator factory with which this parser is associated, may return {@code null} indicating the
* aggregation should be skipped (e.g. when trying to aggregate on unmapped fields).
@ -64,14 +56,6 @@ public abstract class Aggregator extends BucketCollector implements Releasable {
* @throws java.io.IOException When parsing fails
*/
AggregatorBuilder<?> parse(String aggregationName, QueryParseContext context) throws IOException;
/**
* @return an empty {@link AggregatorBuilder} instance for this parser
* that can be used for deserialization
*/
default AggregatorBuilder<?> getFactoryPrototypes() {
throw new UnsupportedOperationException(); // NORELEASE remove before 5.0.0GA
}
}
/**

32
core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java
View File

@ -71,39 +71,16 @@ public abstract class AggregatorBuilder<AB extends AggregatorBuilder<AB>> extend
metaData = in.readMap();
}
protected boolean usesNewStyleSerialization() { // NORELEASE remove this before 5.0.0GA, when all the aggregations have been migrated
return false;
}
@Override
public final void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
if (false == usesNewStyleSerialization()) {
doWriteTo(out);
}
factoriesBuilder.writeTo(out);
out.writeMap(metaData);
if (usesNewStyleSerialization()) {
doWriteTo(out);
}
doWriteTo(out);
}
protected abstract void doWriteTo(StreamOutput out) throws IOException;
@Override
public final AB readFrom(StreamInput in) throws IOException {
// NORELEASE remove when all aggregations have StreamInput constructor
String name = in.readString();
AB factory = doReadFrom(name, in);
factory.factoriesBuilder = AggregatorFactories.Builder.PROTOTYPE.readFrom(in);
factory.metaData = in.readMap();
return factory;
}
protected AB doReadFrom(String name, StreamInput in) throws IOException {
throw new UnsupportedOperationException(); // NORELEASE remove before 5.0.0GA
}
/**
* Add a sub aggregation to this aggregation.
*/
@ -188,13 +165,6 @@ public abstract class AggregatorBuilder<AB extends AggregatorBuilder<AB>> extend
protected abstract XContentBuilder internalXContent(XContentBuilder builder, Params params) throws IOException;
@Override
public String getWriteableName() {
// NORELEASE remove this before 5.0.0GA - all builders will implement this method on their own.
assert usesNewStyleSerialization() == false: "migrated aggregations should just return their NAME";
return type.stream().toUtf8();
}
@Override
public int hashCode() {
return Objects.hash(factoriesBuilder, metaData, name, type, doHashCode());

3
core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
View File

@ -69,7 +69,8 @@ public abstract class InternalAggregation implements Aggregation, ToXContent, St
}
/**
* @return The name of the type (mainly used for registering the parser for the aggregator (see {@link org.elasticsearch.search.aggregations.Aggregator.Parser#type()}).
* @return The name of the type of aggregation. This is the key for parsing the aggregation from XContent and is the name of the
* aggregation's builder when serialized.
*/
public String name() {
return name;

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenAggregatorBuilder.java
View File

@ -80,11 +80,6 @@ public class ChildrenAggregatorBuilder extends ValuesSourceAggregatorBuilder<Par
out.writeString(childType);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected ValuesSourceAggregatorFactory<ParentChild, ?> innerBuild(AggregationContext context,
ValuesSourceConfig<ParentChild> config, AggregatorFactory<?> parent, Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorBuilder.java
View File

@ -76,11 +76,6 @@ public class FilterAggregatorBuilder extends AggregatorBuilder<FilterAggregatorB
out.writeQuery(filter);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected AggregatorFactory<?> doBuild(AggregationContext context, AggregatorFactory<?> parent,
AggregatorFactories.Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregatorBuilder.java
View File

@ -128,11 +128,6 @@ public class FiltersAggregatorBuilder extends AggregatorBuilder<FiltersAggregato
out.writeString(otherBucketKey);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set whether to include a bucket for documents not matching any filter
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorBuilder.java
View File

@ -74,11 +74,6 @@ public class GeoGridAggregatorBuilder extends ValuesSourceAggregatorBuilder<Valu
out.writeVInt(shardSize);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public GeoGridAggregatorBuilder precision(int precision) {
this.precision = GeoHashGridParams.checkPrecision(precision);
return this;

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorBuilder.java
View File

@ -51,11 +51,6 @@ public class GlobalAggregatorBuilder extends AggregatorBuilder<GlobalAggregatorB
// Nothing to write
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected AggregatorFactory<?> doBuild(AggregationContext context, AggregatorFactory<?> parent, Builder subFactoriesBuilder)
throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/AbstractHistogramBuilder.java
View File

@ -79,11 +79,6 @@ public abstract class AbstractHistogramBuilder<AB extends AbstractHistogramBuild
}
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public long interval() {
return interval;
}

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class MissingAggregatorBuilder extends ValuesSourceAggregatorBuilder<Valu
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected boolean serializeTargetValueType() {
return true;

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorBuilder.java
View File

@ -68,11 +68,6 @@ public class NestedAggregatorBuilder extends AggregatorBuilder<NestedAggregatorB
out.writeString(path);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Get the path to use for this nested aggregation.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorBuilder.java
View File

@ -57,11 +57,6 @@ public class ReverseNestedAggregatorBuilder extends AggregatorBuilder<ReverseNes
out.writeOptionalString(path);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the path to use for this nested aggregation. The path must match
* the path to a nested object in the mappings. If it is not specified

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
View File

@ -64,11 +64,6 @@ public abstract class AbstractRangeBuilder<AB extends AbstractRangeBuilder<AB, R
out.writeBoolean(keyed);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public AB addRange(R range) {
if (range == null) {
throw new IllegalArgumentException("[range] must not be null: [" + name + "]");

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceAggregatorBuilder.java
View File

@ -95,11 +95,6 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
unit.writeTo(out);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public GeoDistanceAggregatorBuilder addRange(Range range) {
if (range == null) {
throw new IllegalArgumentException("[range] must not be null: [" + name + "]");

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorBuilder.java
View File

@ -68,11 +68,6 @@ public class DiversifiedAggregatorBuilder extends ValuesSourceAggregatorBuilder<
out.writeOptionalString(executionHint);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the max num docs to be returned from each shard.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorBuilder.java
View File

@ -59,11 +59,6 @@ public class SamplerAggregatorBuilder extends AggregatorBuilder<SamplerAggregato
out.writeVInt(shardSize);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the max num docs to be returned from each shard.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorBuilder.java
View File

@ -99,11 +99,6 @@ public class SignificantTermsAggregatorBuilder extends ValuesSourceAggregatorBui
SignificanceHeuristicStreams.writeTo(significanceHeuristic, out);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected boolean serializeTargetValueType() {
return true;

5
core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorBuilder.java
View File

@ -99,11 +99,6 @@ public class TermsAggregatorBuilder extends ValuesSourceAggregatorBuilder<Values
out.writeBoolean(showTermDocCountError);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public TermsAggregator.BucketCountThresholds bucketCountThresholds() {
return bucketCountThresholds;
}

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class AvgAggregatorBuilder extends ValuesSourceAggregatorBuilder.LeafOnly
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected AvgAggregatorFactory innerBuild(AggregationContext context, ValuesSourceConfig<Numeric> config,
AggregatorFactory<?> parent, Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorBuilder.java
View File

@ -66,11 +66,6 @@ public final class CardinalityAggregatorBuilder extends ValuesSourceAggregatorBu
}
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected boolean serializeTargetValueType() {
return true;

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorBuilder.java
View File

@ -58,11 +58,6 @@ public class GeoBoundsAggregatorBuilder extends ValuesSourceAggregatorBuilder<Va
out.writeBoolean(wrapLongitude);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set whether to wrap longitudes. Defaults to true.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class GeoCentroidAggregatorBuilder
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected GeoCentroidAggregatorFactory innerBuild(AggregationContext context, ValuesSourceConfig<ValuesSource.GeoPoint> config,
AggregatorFactory<?> parent, Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class MaxAggregatorBuilder extends ValuesSourceAggregatorBuilder.LeafOnly
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected MaxAggregatorFactory innerBuild(AggregationContext context, ValuesSourceConfig<Numeric> config,
AggregatorFactory<?> parent, Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class MinAggregatorBuilder extends ValuesSourceAggregatorBuilder.LeafOnly
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected MinAggregatorFactory innerBuild(AggregationContext context, ValuesSourceConfig<Numeric> config,
AggregatorFactory<?> parent, Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregatorBuilder.java
View File

@ -76,11 +76,6 @@ public class PercentileRanksAggregatorBuilder extends LeafOnly<ValuesSource.Nume
method.writeTo(out);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the values to compute percentiles from.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregatorBuilder.java
View File

@ -76,11 +76,6 @@ public class PercentilesAggregatorBuilder extends LeafOnly<ValuesSource.Numeric,
method.writeTo(out);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the values to compute percentiles from.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorBuilder.java
View File

@ -89,11 +89,6 @@ public class ScriptedMetricAggregatorBuilder extends AggregatorBuilder<ScriptedM
}
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the <tt>init</tt> script.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorBuilder.java
View File

@ -61,11 +61,6 @@ public class StatsAggregatorBuilder extends ValuesSourceAggregatorBuilder.LeafOn
return new StatsAggregatorFactory(name, type, config, context, parent, subFactoriesBuilder, metaData);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
public XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException {
return builder;

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorBuilder.java
View File

@ -60,11 +60,6 @@ public class ExtendedStatsAggregatorBuilder
out.writeDouble(sigma);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public ExtendedStatsAggregatorBuilder sigma(double sigma) {
if (sigma < 0.0) {
throw new IllegalArgumentException("[sigma] must be greater than or equal to 0. Found [" + sigma + "] in [" + name + "]");

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class SumAggregatorBuilder extends ValuesSourceAggregatorBuilder.LeafOnly
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected SumAggregatorFactory innerBuild(AggregationContext context, ValuesSourceConfig<Numeric> config,
AggregatorFactory<?> parent, Builder subFactoriesBuilder) throws IOException {

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorBuilder.java
View File

@ -156,11 +156,6 @@ public class TopHitsAggregatorBuilder extends AggregatorBuilder<TopHitsAggregato
out.writeBoolean(version);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* From index to start the search from. Defaults to <tt>0</tt>.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorBuilder.java
View File

@ -54,11 +54,6 @@ public class ValueCountAggregatorBuilder extends ValuesSourceAggregatorBuilder.L
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected boolean serializeTargetValueType() {
return true;

18
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java
View File

@ -39,19 +39,10 @@ public abstract class PipelineAggregator implements Streamable {
*/
@FunctionalInterface
public static interface Parser {
public static final ParseField BUCKETS_PATH = new ParseField("buckets_path");
public static final ParseField FORMAT = new ParseField("format");
public static final ParseField GAP_POLICY = new ParseField("gap_policy");
/**
* @return The aggregation type this parser is associated with.
*/
default String type() {
throw new UnsupportedOperationException(); // NORELEASE remove before 5.0.0GA
}
/**
* Returns the pipeline aggregator factory with which this parser is
* associated.
@ -66,15 +57,6 @@ public abstract class PipelineAggregator implements Streamable {
*/
PipelineAggregatorBuilder<?> parse(String pipelineAggregatorName, QueryParseContext context)
throws IOException;
/**
* @return an empty {@link PipelineAggregatorBuilder} instance for this
* parser that can be used for deserialization
*/
default PipelineAggregatorBuilder<?> getFactoryPrototype() {
throw new UnsupportedOperationException(); // NORELEASE remove before 5.0.0GA
}
}
private String name;

32
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java
View File

@ -86,34 +86,12 @@ public abstract class PipelineAggregatorBuilder<PAB extends PipelineAggregatorBu
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
out.writeStringArray(bucketsPaths);
if (usesNewStyleSerialization()) {
out.writeMap(metaData);
doWriteTo(out);
} else {
doWriteTo(out);
out.writeMap(metaData);
}
out.writeMap(metaData);
doWriteTo(out);
}
protected abstract void doWriteTo(StreamOutput out) throws IOException;
protected boolean usesNewStyleSerialization() {
return false; // NORELEASE remove this before 5.0.0GA, when all the aggregations have been migrated
}
@Override
public PipelineAggregatorBuilder<PAB> readFrom(StreamInput in) throws IOException {
String name = in.readString();
String[] bucketsPaths = in.readStringArray();
PipelineAggregatorBuilder<PAB> factory = doReadFrom(name, bucketsPaths, in);
factory.metaData = in.readMap();
return factory;
}
protected PipelineAggregatorBuilder<PAB> doReadFrom(String name, String[] bucketsPaths, StreamInput in) throws IOException {
throw new UnsupportedOperationException(); // NORELEASE remove this before 5.0.0GA, when all the aggregations have been migrated
}
public String name() {
return name;
}
@ -161,12 +139,6 @@ public abstract class PipelineAggregatorBuilder<PAB extends PipelineAggregatorBu
return bucketsPaths;
}
@Override
public String getWriteableName() {
assert false == usesNewStyleSerialization() : "Migrated aggregations should just return NAME";
return type;
}
@Override
public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(getName());

21
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregatorBuilder.java
View File

@ -54,32 +54,13 @@ public abstract class BucketMetricsPipelineAggregatorBuilder<AF extends BucketMe
@Override
protected final void doWriteTo(StreamOutput out) throws IOException {
if (false == usesNewStyleSerialization()) {
innerWriteTo(out);
}
out.writeOptionalString(format);
gapPolicy.writeTo(out);
if (usesNewStyleSerialization()) {
innerWriteTo(out);
}
innerWriteTo(out);
}
protected abstract void innerWriteTo(StreamOutput out) throws IOException;
@Override
protected final PipelineAggregatorBuilder<AF> doReadFrom(String name, String[] bucketsPaths, StreamInput in) throws IOException {
BucketMetricsPipelineAggregatorBuilder<AF> factory = innerReadFrom(name, bucketsPaths, in);
factory.format = in.readOptionalString();
factory.gapPolicy = GapPolicy.readFrom(in);
return factory;
}
protected BucketMetricsPipelineAggregatorBuilder<AF> innerReadFrom(String name, String[] bucketsPaths, StreamInput in)
throws IOException {
throw new UnsupportedOperationException(); // NORELEASE remove before 5.0.0 GA
}
/**
* Sets the format to use on the output of this aggregation.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregatorBuilder.java
View File

@ -53,11 +53,6 @@ public class AvgBucketPipelineAggregatorBuilder extends BucketMetricsPipelineAgg
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected PipelineAggregator createInternal(Map<String, Object> metaData) throws IOException {
return new AvgBucketPipelineAggregator(name, bucketsPaths, gapPolicy(), formatter(), metaData);

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregatorBuilder.java
View File

@ -53,11 +53,6 @@ public class MaxBucketPipelineAggregatorBuilder extends BucketMetricsPipelineAgg
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected PipelineAggregator createInternal(Map<String, Object> metaData) throws IOException {
return new MaxBucketPipelineAggregator(name, bucketsPaths, gapPolicy(), formatter(), metaData);

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregatorBuilder.java
View File

@ -53,11 +53,6 @@ public class MinBucketPipelineAggregatorBuilder extends BucketMetricsPipelineAgg
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected PipelineAggregator createInternal(Map<String, Object> metaData) throws IOException {
return new MinBucketPipelineAggregator(name, bucketsPaths, gapPolicy(), formatter(), metaData);

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregatorBuilder.java
View File

@ -63,11 +63,6 @@ public class PercentilesBucketPipelineAggregatorBuilder
out.writeDoubleArray(percents);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Get the percentages to calculate percentiles for in this aggregation
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregatorBuilder.java
View File

@ -55,11 +55,6 @@ public class StatsBucketPipelineAggregatorBuilder extends BucketMetricsPipelineA
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected PipelineAggregator createInternal(Map<String, Object> metaData) throws IOException {
return new StatsBucketPipelineAggregator(name, bucketsPaths, gapPolicy(), formatter(), metaData);

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregatorBuilder.java
View File

@ -58,11 +58,6 @@ public class ExtendedStatsBucketPipelineAggregatorBuilder
out.writeDouble(sigma);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Set the value of sigma to use when calculating the standard deviation
* bounds

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregatorBuilder.java
View File

@ -53,11 +53,6 @@ public class SumBucketPipelineAggregatorBuilder extends BucketMetricsPipelineAgg
// Do nothing, no extra state to write to stream
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
@Override
protected PipelineAggregator createInternal(Map<String, Object> metaData) throws IOException {
return new SumBucketPipelineAggregator(name, bucketsPaths, gapPolicy(), formatter(), metaData);

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregatorBuilder.java
View File

@ -93,11 +93,6 @@ public class BucketScriptPipelineAggregatorBuilder extends PipelineAggregatorBui
gapPolicy.writeTo(out);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
private static Map<String, String> convertToBucketsPathMap(String[] bucketsPaths) {
Map<String, String> bucketsPathsMap = new HashMap<>();
for (int i = 0; i < bucketsPaths.length; i++) {

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregatorBuilder.java
View File

@ -88,11 +88,6 @@ public class BucketSelectorPipelineAggregatorBuilder extends PipelineAggregatorB
gapPolicy.writeTo(out);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
private static Map<String, String> convertToBucketsPathMap(String[] bucketsPaths) {
Map<String, String> bucketsPathsMap = new HashMap<>();
for (int i = 0; i < bucketsPaths.length; i++) {

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregatorBuilder.java
View File

@ -65,11 +65,6 @@ public class CumulativeSumPipelineAggregatorBuilder extends PipelineAggregatorBu
out.writeOptionalString(format);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Sets the format to use on the output of this aggregation.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregatorBuilder.java
View File

@ -86,11 +86,6 @@ public class DerivativePipelineAggregatorBuilder extends PipelineAggregatorBuild
out.writeOptionalString(units);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
public DerivativePipelineAggregatorBuilder format(String format) {
if (format == null) {
throw new IllegalArgumentException("[format] must not be null: [" + name + "]");

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregatorBuilder.java
View File

@ -93,11 +93,6 @@ public class MovAvgPipelineAggregatorBuilder extends PipelineAggregatorBuilder<M
out.writeOptionalBoolean(minimize);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Sets the format to use on the output of this aggregation.
*/

5
core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregatorBuilder.java
View File

@ -72,11 +72,6 @@ public class SerialDiffPipelineAggregatorBuilder extends PipelineAggregatorBuild
out.writeVInt(lag);
}
@Override
protected boolean usesNewStyleSerialization() {
return true;
}
/**
* Sets the lag to use when calculating the serial difference.
*/

4
core/src/main/java/org/elasticsearch/search/aggregations/support/AbstractValuesSourceParser.java
View File

@ -122,8 +122,8 @@ public abstract class AbstractValuesSourceParser<VS extends ValuesSource>
valueType = ValueType.resolveForScript(parser.text());
if (targetValueType != null && valueType.isNotA(targetValueType)) {
throw new ParsingException(parser.getTokenLocation(),
type() + " aggregation [" + aggregationName + "] was configured with an incompatible value type ["
+ valueType + "]. [" + type() + "] aggregation can only work on value of type ["
"Aggregation [" + aggregationName + "] was configured with an incompatible value type ["
+ valueType + "]. It can only work on value of type ["
+ targetValueType + "]");
}
} else if (!token(aggregationName, currentFieldName, token, parser, context.getParseFieldMatcher(), otherOptions)) {

47
core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorBuilder.java
View File

@ -140,18 +140,8 @@ public abstract class ValuesSourceAggregatorBuilder<VS extends ValuesSource, AB
@Override
protected final void doWriteTo(StreamOutput out) throws IOException {
if (usesNewStyleSerialization()) {
if (serializeTargetValueType()) {
out.writeOptionalWriteable(targetValueType);
}
} else {
valuesSourceType.writeTo(out);
boolean hasTargetValueType = targetValueType != null;
out.writeBoolean(hasTargetValueType);
if (hasTargetValueType) {
targetValueType.writeTo(out);
}
innerWriteTo(out);
if (serializeTargetValueType()) {
out.writeOptionalWriteable(targetValueType);
}
out.writeOptionalString(field);
boolean hasScript = script != null;
@ -171,9 +161,7 @@ public abstract class ValuesSourceAggregatorBuilder<VS extends ValuesSource, AB
if (hasTimeZone) {
out.writeString(timeZone.getID());
}
if (usesNewStyleSerialization()) {
innerWriteTo(out);
}
innerWriteTo(out);
}
/**
@ -181,35 +169,6 @@ public abstract class ValuesSourceAggregatorBuilder<VS extends ValuesSource, AB
*/
protected abstract void innerWriteTo(StreamOutput out) throws IOException;
@SuppressWarnings("unchecked")
@Override
protected final AB doReadFrom(String name, StreamInput in) throws IOException {
ValuesSourceType valuesSourceType = ValuesSourceType.ANY.readFrom(in);
ValueType targetValueType = null;
if (in.readBoolean()) {
targetValueType = ValueType.readFromStream(in);
}
ValuesSourceAggregatorBuilder<VS, AB> factory = innerReadFrom(name, valuesSourceType, targetValueType, in);
factory.field = in.readOptionalString();
if (in.readBoolean()) {
factory.script = Script.readScript(in);
}
if (in.readBoolean()) {
factory.valueType = ValueType.readFromStream(in);
}
factory.format = in.readOptionalString();
factory.missing = in.readGenericValue();
if (in.readBoolean()) {
factory.timeZone = DateTimeZone.forID(in.readString());
}
return (AB) factory;
}
protected ValuesSourceAggregatorBuilder<VS, AB> innerReadFrom(String name, ValuesSourceType valuesSourceType,
ValueType targetValueType, StreamInput in) throws IOException {
throw new UnsupportedOperationException(); // NORELEASE remove when no longer overridden
}
/**
* Should this builder serialize its targetValueType? Defaults to false. All subclasses that override this to true should use the three
* argument read constructor rather than the four argument version.