diff --git a/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs b/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs index 02c3e84c065..8238d2aa27c 100644 --- a/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs +++ b/src/Nest/Aggregations/Bucket/Histogram/HistogramAggregation.cs @@ -26,12 +26,15 @@ public interface IHistogramAggregation : IBucketAggregation [JsonProperty("extended_bounds")] ExtendedBounds ExtendedBounds { get; set; } - [JsonProperty("pre_offset")] + [Obsolete("Removed in Elasticsearch 2.0. Will be removed in the next major version of NEST")] long? PreOffset { get; set; } - [JsonProperty("post_offset")] + [Obsolete("Removed in Elasticsearch 2.0. Will be removed in the next major version of NEST")] long? PostOffset { get; set; } + [JsonProperty("offset")] + double? Offset { get; set; } + [JsonProperty("missing")] double? Missing { get; set; } } @@ -46,6 +49,7 @@ public class HistogramAggregation : BucketAggregationBase, IHistogramAggregation public ExtendedBounds ExtendedBounds { get; set; } public long? PreOffset { get; set; } public long? PostOffset { get; set; } + public double? Offset { get; set; } public double? Missing { get; set; } internal HistogramAggregation() { } @@ -72,8 +76,10 @@ public class HistogramAggregationDescriptor ExtendedBounds IHistogramAggregation.ExtendedBounds { get; set; } long? IHistogramAggregation.PreOffset { get; set; } - + long? IHistogramAggregation.PostOffset { get; set; } + + double? IHistogramAggregation.Offset { get; set; } double? IHistogramAggregation.Missing { get; set; } @@ -102,9 +108,13 @@ public HistogramAggregationDescriptor OrderDescending(string key) => public HistogramAggregationDescriptor ExtendedBounds(double min, double max) => Assign(a => a.ExtendedBounds = new ExtendedBounds { Minimum = min, Maximum = max }); - public HistogramAggregationDescriptor PreOffset(long preOffset) => Assign(a => a.PreOffset = preOffset); + [Obsolete("Removed in Elasticsearch 2.0. Will be removed in the next major version of NEST")] + public HistogramAggregationDescriptor PreOffset(long preOffset) => this; - public HistogramAggregationDescriptor PostOffset(long postOffset) => Assign(a => a.PostOffset = postOffset); + [Obsolete("Removed in Elasticsearch 2.0. Will be removed in the next major version of NEST")] + public HistogramAggregationDescriptor PostOffset(long postOffset) => this; + + public HistogramAggregationDescriptor Offset(double offset) => Assign(a => a.Offset = offset); public HistogramAggregationDescriptor Missing(double missing) => Assign(a => a.Missing = missing); } diff --git a/src/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs b/src/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs index 383710783a9..07d1c2d22d6 100644 --- a/src/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs +++ b/src/Tests/Aggregations/Bucket/Histogram/HistogramAggregationUsageTests.cs @@ -27,7 +27,8 @@ public HistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : order = new { _key = "desc" - } + }, + offset = 1.1 } } } @@ -40,6 +41,7 @@ public HistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : .Interval(100) .Missing(0) .Order(HistogramOrder.KeyDescending) + .Offset(1.1) ) ); @@ -51,7 +53,8 @@ public HistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : Field = Field(p => p.NumberOfCommits), Interval = 100, Missing = 0, - Order = HistogramOrder.KeyDescending + Order = HistogramOrder.KeyDescending, + Offset = 1.1 } };