@@ -201,8 +201,7 @@ private IAggregation GetStatsAggregation(JsonReader reader, JsonSerializer seria
201
201
202
202
private IAggregation GetDateHistogramAggregation ( JsonReader reader , JsonSerializer serializer )
203
203
{
204
- reader . Read ( ) ;
205
- var keyAsString = reader . Value as string ;
204
+ var keyAsString = reader . ReadAsString ( ) ;
206
205
reader . Read ( ) ; reader . Read ( ) ;
207
206
var key = ( reader . Value as long ? ) . GetValueOrDefault ( 0 ) ;
208
207
reader . Read ( ) ; reader . Read ( ) ;
@@ -217,21 +216,18 @@ private IAggregation GetDateHistogramAggregation(JsonReader reader, JsonSerializ
217
216
218
217
private IAggregation GetKeyedBucketItem ( JsonReader reader , JsonSerializer serializer )
219
218
{
220
- reader . Read ( ) ;
221
- var key = reader . Value ;
219
+ var key = reader . ReadAsString ( ) ;
222
220
reader . Read ( ) ;
223
221
var property = reader . Value as string ;
224
222
if ( property == "from" || property == "to" )
225
- return GetRangeAggregation ( reader , serializer , key . ToString ( ) ) ;
226
-
223
+ return GetRangeAggregation ( reader , serializer , key ) ;
227
224
228
225
var keyItem = new KeyItem ( ) ;
229
- keyItem . Key = key . ToString ( ) ;
226
+ keyItem . Key = key ;
230
227
231
228
if ( property == "key_as_string" )
232
229
{
233
- reader . Read ( ) ;
234
- keyItem . KeyAsString = reader . Value . ToString ( ) ;
230
+ keyItem . KeyAsString = reader . ReadAsString ( ) ;
235
231
reader . Read ( ) ;
236
232
}
237
233
@@ -407,18 +403,15 @@ public IAggregation GetRangeAggregation(JsonReader reader, JsonSerializer serial
407
403
reader . Read ( ) ;
408
404
break ;
409
405
case "key" :
410
- reader . Read ( ) ;
411
- key = reader . Value as string ;
406
+ key = reader . ReadAsString ( ) ;
412
407
reader . Read ( ) ;
413
408
break ;
414
409
case "from_as_string" :
415
- reader . Read ( ) ;
416
- fromAsString = reader . Value as string ;
410
+ fromAsString = reader . ReadAsString ( ) ;
417
411
reader . Read ( ) ;
418
412
break ;
419
413
case "to_as_string" :
420
- reader . Read ( ) ;
421
- toAsString = reader . Value as string ;
414
+ toAsString = reader . ReadAsString ( ) ;
422
415
reader . Read ( ) ;
423
416
break ;
424
417
case "doc_count" :
0 commit comments