From 5142ac233186028374912209294ae3fccdda9d3e Mon Sep 17 00:00:00 2001 From: Fabien Lavocat Date: Thu, 10 Aug 2017 07:54:43 -0700 Subject: [PATCH] Make the ExtendedBounds property of the DateHistogramAggregation to use DateMath instead of DateTime --- .../Bucket/DateHistogram/DateHistogramAggregation.cs | 10 +++++----- .../DateHistogramAggregationUsageTests.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs index 1eb6c6db288..fb337fa853f 100644 --- a/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs +++ b/src/Nest/Aggregations/Bucket/DateHistogram/DateHistogramAggregation.cs @@ -37,7 +37,7 @@ public interface IDateHistogramAggregation : IBucketAggregation HistogramOrder Order { get; set; } [JsonProperty("extended_bounds")] - ExtendedBounds ExtendedBounds { get; set; } + ExtendedBounds ExtendedBounds { get; set; } [JsonProperty("missing")] DateTime? Missing { get; set; } @@ -68,7 +68,7 @@ public string Format public string TimeZone { get; set; } public string Offset { get; set; } public HistogramOrder Order { get; set; } - public ExtendedBounds ExtendedBounds { get; set; } + public ExtendedBounds ExtendedBounds { get; set; } public DateTime? Missing { get; set; } internal DateHistogramAggregation() { } @@ -113,7 +113,7 @@ string IDateHistogramAggregation.Format HistogramOrder IDateHistogramAggregation.Order { get; set; } - ExtendedBounds IDateHistogramAggregation.ExtendedBounds { get; set; } + ExtendedBounds IDateHistogramAggregation.ExtendedBounds { get; set; } DateTime? IDateHistogramAggregation.Missing { get; set; } @@ -148,8 +148,8 @@ public DateHistogramAggregationDescriptor OrderAscending(string key) => public DateHistogramAggregationDescriptor OrderDescending(string key) => Assign(a => a.Order = new HistogramOrder { Key = key, Order = SortOrder.Descending }); - public DateHistogramAggregationDescriptor ExtendedBounds(DateTime min, DateTime max) => - Assign(a=>a.ExtendedBounds = new ExtendedBounds { Minimum = min, Maximum = max }); + public DateHistogramAggregationDescriptor ExtendedBounds(DateMath min, DateMath max) => + Assign(a=>a.ExtendedBounds = new ExtendedBounds { Minimum = min, Maximum = max }); public DateHistogramAggregationDescriptor Missing(DateTime missing) => Assign(a => a.Missing = missing); } diff --git a/src/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs b/src/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs index 4220f97bf85..269cf4e2acd 100644 --- a/src/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs +++ b/src/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs @@ -99,7 +99,7 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage Interval = DateInterval.Month, MinimumDocumentCount = 2, Format = "yyyy-MM-dd'T'HH:mm:ss", - ExtendedBounds = new ExtendedBounds + ExtendedBounds = new ExtendedBounds { Minimum = FixedDate.AddYears(-1), Maximum = FixedDate.AddYears(1),