From 80ae0434b2198f2d620aec78e81e9695ab2739cc Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 30 Nov 2020 12:52:22 +0000 Subject: [PATCH 1/2] Handle additional JSON properties --- src/Nest/Aggregations/AggregateFormatter.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Nest/Aggregations/AggregateFormatter.cs b/src/Nest/Aggregations/AggregateFormatter.cs index e18346931e4..bb5d1a7f584 100644 --- a/src/Nest/Aggregations/AggregateFormatter.cs +++ b/src/Nest/Aggregations/AggregateFormatter.cs @@ -258,6 +258,20 @@ private IAggregate GetBoxplotAggregate(ref JsonReader reader, IJsonFormatterReso reader.ReadNext(); // "q3" reader.ReadNext(); // : boxplot.Q3 = reader.ReadDouble(); + + var token = reader.GetCurrentJsonToken(); + if (token != JsonToken.EndObject) + { + reader.ReadNext(); // , + reader.ReadNext(); // "lower" + reader.ReadNext(); // : + reader.ReadDouble(); + reader.ReadNext(); // , + reader.ReadNext(); // "upper" + reader.ReadNext(); // : + reader.ReadDouble(); + } + return boxplot; } From b974fd9e018c29dfb381f53a79216455aa5c35f9 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 30 Nov 2020 13:19:40 +0000 Subject: [PATCH 2/2] PR feedback - add comment --- src/Nest/Aggregations/AggregateFormatter.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Nest/Aggregations/AggregateFormatter.cs b/src/Nest/Aggregations/AggregateFormatter.cs index bb5d1a7f584..4e85f945162 100644 --- a/src/Nest/Aggregations/AggregateFormatter.cs +++ b/src/Nest/Aggregations/AggregateFormatter.cs @@ -259,6 +259,10 @@ private IAggregate GetBoxplotAggregate(ref JsonReader reader, IJsonFormatterReso reader.ReadNext(); // : boxplot.Q3 = reader.ReadDouble(); + // ES 7.11.0 adds these two additional properties on the payload + // When present on a 7.11 response, we avoid an exception by + // handling (and skipping) over the properties. The 7.11 client + // will add support for these new properties on BoxplotAggregate. var token = reader.GetCurrentJsonToken(); if (token != JsonToken.EndObject) {