Skip to content

Commit d2d5e09

Browse files
committed
upgraded aggregations to work with 1.2, hopefully if elastic/elasticsearch#6465 is good enough to be merged starting from Elasticsearch 1.3 we can use _meta to greatly simplify parsing
1 parent dbee3e6 commit d2d5e09

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize
3737
switch (property)
3838
{
3939
case "values":
40+
reader.Read();
41+
reader.Read();
4042
return GetPercentilesMetricAggregation(reader, serializer);
4143
case "value":
4244
return GetValueMetricOrAggregation(reader, serializer);
@@ -105,7 +107,6 @@ private IAggregation GetSingleBucketAggregation(JsonReader reader, JsonSerialize
105107
return bucket;
106108
}
107109

108-
109110
private IAggregation GetStatsAggregation(JsonReader reader, JsonSerializer serializer)
110111
{
111112
reader.Read();
@@ -166,7 +167,6 @@ private IAggregation GetDateHistogramAggregation(JsonReader reader, JsonSerializ
166167

167168
}
168169

169-
170170
private IAggregation GetKeyedBucketItem(JsonReader reader, JsonSerializer serializer)
171171
{
172172
reader.Read();
@@ -260,7 +260,6 @@ private IAggregation GetBucketAggregation(JsonReader reader, JsonSerializer seri
260260
return bucket;
261261
}
262262

263-
264263
private IAggregation GetValueMetricOrAggregation(JsonReader reader, JsonSerializer serializer)
265264
{
266265
reader.Read();
@@ -274,7 +273,6 @@ private IAggregation GetValueMetricOrAggregation(JsonReader reader, JsonSerializ
274273
return metric;
275274
}
276275

277-
278276
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
279277
{
280278
return this.ReadAggregation(reader, serializer);

0 commit comments

Comments
 (0)