diff options
author | Tanguy Leroux <tlrx.dev@gmail.com> | 2017-05-10 14:05:43 +0200 |
---|---|---|
committer | Tanguy Leroux <tlrx.dev@gmail.com> | 2017-05-10 14:05:43 +0200 |
commit | 3201e2271032e348d82c0725b381066e149a0e37 (patch) | |
tree | bc58e1e1d7c7ad98ace0d9e0cf0ca49f40ce3722 /core/src/main/java/org/elasticsearch/search/aggregations/pipeline | |
parent | bf718a686fa9ba51a8292178740c15670d0f0ec5 (diff) |
Fix merging conflicts
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/aggregations/pipeline')
5 files changed, 5 insertions, 5 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java index 7d1bcec3bc..7449ce6666 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java @@ -29,7 +29,7 @@ import java.io.IOException; public class ParsedSimpleValue extends ParsedSingleValueNumericMetricsAggregation implements SimpleValue { @Override - protected String getType() { + public String getType() { return InternalSimpleValue.NAME; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java index 9008c56c5c..69e9935263 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java @@ -38,7 +38,7 @@ public class ParsedBucketMetricValue extends ParsedSingleValueNumericMetricsAggr } @Override - protected String getType() { + public String getType() { return InternalBucketMetricValue.NAME; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java index 4738ad7d9d..c7ddcc6ee9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.metrics.stats.ParsedStats; public class ParsedStatsBucket extends ParsedStats implements StatsBucket { @Override - protected String getType() { + public String getType() { return StatsBucketPipelineAggregationBuilder.NAME; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java index 08bfbfe587..d292249242 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.metrics.stats.extended.ParsedExtend public class ParsedExtendedStatsBucket extends ParsedExtendedStats implements ExtendedStatsBucket { @Override - protected String getType() { + public String getType() { return ExtendedStatsBucketPipelineAggregationBuilder.NAME; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java index 5469b8b65c..2b871a99d9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java @@ -42,7 +42,7 @@ public class ParsedDerivative extends ParsedSimpleValue implements Derivative { } @Override - protected String getType() { + public String getType() { return DerivativePipelineAggregationBuilder.NAME; } |