Fixed other potential JSON.NET deserialization of DateTime property values

Author: Ashkan Daie

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

@@ -199,8 +199,7 @@ private IAggregation GetStatsAggregation(JsonReader reader, JsonSerializer seria
 
 		private IAggregation GetDateHistogramAggregation(JsonReader reader, JsonSerializer serializer)
 		{
-			reader.Read();
-			var keyAsString = reader.Value as string;
+		    var keyAsString = reader.ReadAsString();
 			reader.Read(); reader.Read();
 			var key = (reader.Value as long?).GetValueOrDefault(0);
 			reader.Read(); reader.Read();
@@ -215,21 +214,19 @@ private IAggregation GetDateHistogramAggregation(JsonReader reader, JsonSerializ
 
 		private IAggregation GetKeyedBucketItem(JsonReader reader, JsonSerializer serializer)
 		{
-			reader.Read();
-			var key = reader.Value;
+			var key = reader.ReadAsString();
 			reader.Read();
 			var property = reader.Value as string;
 			if (property == "from" || property == "to")
-				return GetRangeAggregation(reader, serializer, key.ToString());
+				return GetRangeAggregation(reader, serializer, key);
 
 
 			var keyItem = new KeyItem();
-			keyItem.Key = key.ToString();
+			keyItem.Key = key;
 
 			if (property == "key_as_string")
 			{
-				reader.Read();
-				keyItem.KeyAsString = reader.Value.ToString();
+				keyItem.KeyAsString = reader.ReadAsString();
 				reader.Read();
 			}
 
@@ -361,8 +358,7 @@ public IAggregation GetRangeAggregation(JsonReader reader, JsonSerializer serial
 						reader.Read();
 						break;
 					case "key":
-						reader.Read();
-						key = reader.Value as string;
+						key = reader.ReadAsString();
 						reader.Read();
 						break;
 					case "from_as_string":

src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs

@@ -42,8 +42,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var depth = reader.Depth;
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
-			reader.Read();
-			var fieldName = reader.Value as string;
+			var fieldName = reader.ReadAsString();
 			reader.Read();
 			var query = this._reader.ReadJson(reader, objectType, existingValue, serializer);
 			var setter = query as IFieldNameQuery;

src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs

@@ -79,16 +79,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 						f.Cache = reader.Value as bool?;
 						break;
 					case "_name":
-						reader.Read();
-						f.FilterName = reader.Value as string;
+						f.FilterName = reader.ReadAsString();
 						break;
 					case "_cache_key":
-						reader.Read();
-						f.CacheKey = reader.Value as string;
+						f.CacheKey = reader.ReadAsString();
 						break;
 					case "type":
-						reader.Read();
-						f.GeoExecution = (reader.Value as string).ToEnum<GeoExecution>();
+						f.GeoExecution = reader.ReadAsString().ToEnum<GeoExecution>();
 						break;
 					default:
 						f.Field = property;

src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs

@@ -185,16 +185,16 @@ public void DateRangeItem()
 		    firstRange.Should().NotBeNull();
 		    firstRange.To.Should().HaveValue();
 		    firstRange.ToAsString.Should().NotBeNull();
-		    var firstRangeToDateLeft = firstRange.To.Value.JavaTimeStampToDateTime();
-		    var firstRangeToDateRight = DateTime.Parse(firstRange.ToAsString);
-		    firstRangeToDateLeft.Should().Be(firstRangeToDateRight);
-		    var lastRange = grams.LastOrDefault();
+            var firstRangeToDateLeft = firstRange.To.Value.JavaTimeStampToDateTime();
+            var firstRangeToDateRight = DateTime.Parse(firstRange.ToAsString);
+            firstRangeToDateLeft.Should().Be(firstRangeToDateRight);
+            var lastRange = grams.LastOrDefault();
             lastRange.Should().NotBeNull();
             lastRange.From.Should().HaveValue();
             lastRange.FromAsString.Should().NotBeNull();
-            var LastRangeFromDateLeft = lastRange.From.Value.JavaTimeStampToDateTime();
-            var LastRangeFromDateRight = DateTime.Parse(lastRange.FromAsString);
-            LastRangeFromDateLeft.Should().Be(LastRangeFromDateRight);
+            var lastRangeFromDateLeft = lastRange.From.Value.JavaTimeStampToDateTime();
+            var lastRangeFromDateRight = DateTime.Parse(lastRange.FromAsString);
+            lastRangeFromDateLeft.Should().Be(lastRangeFromDateRight);
 	    }
 		[Test]
 	    public void IpRangeItem()