diff --git a/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs index 515869fc303..65d35465d66 100644 --- a/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs +++ b/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs @@ -207,5 +207,14 @@ public DateHistogramAggregationDescriptor OrderDescending(string key) return this; } + [JsonProperty("extended_bounds")] + internal IDictionary _ExtendedBounds { get; set; } + + public DateHistogramAggregationDescriptor ExtendedBounds(string min, string max) + { + this._ExtendedBounds = new Dictionary { { "min", min }, { "max", max } }; + return this; + } + } } \ No newline at end of file diff --git a/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs b/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs index 9613f6de956..1b4491ff049 100644 --- a/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs +++ b/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs @@ -30,12 +30,16 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize if (reader.TokenType != JsonToken.PropertyName) return null; - var property = reader.Value as string; + var property = reader.Value as string; + + // Is this still needed? if (_numeric.IsMatch(property)) return GetPercentilesMetricAggregation(reader, serializer); switch (property) { + case "values": + return GetPercentilesMetricAggregation(reader, serializer); case "value": return GetValueMetricOrAggregation(reader, serializer); case "buckets": @@ -59,6 +63,9 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize private IAggregation GetPercentilesMetricAggregation(JsonReader reader, JsonSerializer serializer) { + reader.Read(); // JsonToken.PropertyName "values" + reader.Read(); // JsonToken.StartObject + var metric = new PercentilesMetric(); var percentileItems = new List(); while (reader.TokenType != JsonToken.EndObject)