Advance reader when not expected JSON token (#3833)

This commit advances the JSON reader when a JSON token is one that is unexpected e.g. when the JSON token is null.

Author: russcam

src/Nest/Aggregations/Bucket/Terms/TermsExcludeFormatter.cs

@@ -10,7 +10,10 @@ public TermsExclude Deserialize(ref JsonReader reader, IJsonFormatterResolver fo
 		{
 			var token = reader.GetCurrentJsonToken();
 			if (token == JsonToken.Null)
+			{
+				reader.ReadNext();
 				return null;
+			}
 
 			TermsExclude termsExclude;
 			switch (token)

src/Nest/Aggregations/Bucket/Terms/TermsIncludeFormatter.cs

@@ -17,7 +17,10 @@ public TermsInclude Deserialize(ref JsonReader reader, IJsonFormatterResolver fo
 		{
 			var token = reader.GetCurrentJsonToken();
 			if (token == JsonToken.Null)
+			{
+				reader.ReadNext();
 				return null;
+			}
 
 			TermsInclude termsInclude;
 			switch (token)

src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationFormatter.cs

@@ -23,7 +23,10 @@ internal class PercentileRanksAggregationFormatter : IJsonFormatter<IPercentileR
 		public IPercentileRanksAggregation Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var count = 0;
 			var percentiles = new PercentileRanksAggregation();

src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationFormatter.cs

@@ -23,7 +23,10 @@ internal class PercentilesAggregationFormatter : IJsonFormatter<IPercentilesAggr
 		public IPercentilesAggregation Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var count = 0;
 			var percentiles = new PercentilesAggregation();

src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationFormatter.cs

@@ -31,7 +31,10 @@ internal class MovingAverageAggregationFormatter : IJsonFormatter<IMovingAverage
 		public IMovingAverageAggregation Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var count = 0;
 			var aggregation = new MovingAverageAggregation();

src/Nest/CommonAbstractions/Fields/FieldValuesFormatter.cs

@@ -10,7 +10,10 @@ internal class FieldValuesFormatter : IJsonFormatter<FieldValues>
 		public FieldValues Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var count = 0;
 			var fields = new Dictionary<string, LazyDocument>();

src/Nest/CommonAbstractions/Infer/IndexName/IndexNameFormatter.cs

@@ -6,7 +6,11 @@ internal class IndexNameFormatter : IJsonFormatter<IndexName>, IObjectPropertyNa
 	{
 		public IndexName Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
-			if (reader.GetCurrentJsonToken() != JsonToken.String) return null;
+			if (reader.GetCurrentJsonToken() != JsonToken.String)
+			{
+				reader.ReadNextBlock();
+				return null;
+			}
 
 			IndexName indexName = reader.ReadString();
 			return indexName;

src/Nest/CommonAbstractions/Infer/Indices/IndicesFormatter.cs

@@ -9,7 +9,7 @@ public Indices Deserialize(ref JsonReader reader, IJsonFormatterResolver formatt
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginArray)
 			{
-				reader.ReadNext();
+				reader.ReadNextBlock();
 				return null;
 			}
 

src/Nest/CommonAbstractions/Infer/PropertyName/PropertyNameFormatter.cs

@@ -8,7 +8,7 @@ public PropertyName Deserialize(ref JsonReader reader, IJsonFormatterResolver fo
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.String)
 			{
-				reader.ReadNext();
+				reader.ReadNextBlock();
 				return null;
 			}
 

src/Nest/CommonAbstractions/Infer/RelationName/RelationNameFormatter.cs

@@ -12,6 +12,7 @@ public RelationName Deserialize(ref JsonReader reader, IJsonFormatterResolver fo
 				return relationName;
 			}
 
+			reader.ReadNextBlock();
 			return null;
 		}
 

src/Nest/CommonAbstractions/LazyDocument/LazyDocumentFormatter.cs

@@ -25,7 +25,10 @@ public void Serialize(ref JsonWriter writer, ILazyDocument value, IJsonFormatter
 		public ILazyDocument Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() == JsonToken.Null)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var arraySegment = reader.ReadNextBlockSegment();
 
@@ -50,7 +53,7 @@ internal static void WriteUnindented(ref JsonReader reader, ref JsonWriter write
                         var c = 0;
                         while (reader.ReadIsInObject(ref c))
                         {
-                            if (c != 1) 
+                            if (c != 1)
 								writer.WriteRaw((byte)',');
 							writer.WritePropertyName(reader.ReadPropertyName());
 							WriteUnindented(ref reader, ref writer);
@@ -64,7 +67,7 @@ internal static void WriteUnindented(ref JsonReader reader, ref JsonWriter write
                         var c = 0;
                         while (reader.ReadIsInArray(ref c))
                         {
-                            if (c != 1) 
+                            if (c != 1)
 								writer.WriteRaw((byte)',');
 							WriteUnindented(ref reader, ref writer);
                         }
@@ -108,7 +111,7 @@ public void Serialize(ref JsonWriter writer, LazyDocument value, IJsonFormatterR
 
 		public LazyDocument Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
-			if (reader.GetCurrentJsonToken() == JsonToken.Null)
+			if (reader.ReadIsNull())
 				return null;
 
 			var arraySegment = reader.ReadNextBlockSegment();

src/Nest/CommonAbstractions/SerializationBehavior/JsonFormatters/DateTimeOffsetEpochMillisecondsFormatter.cs

@@ -18,22 +18,25 @@ internal class NullableDateTimeOffsetEpochMillisecondsFormatter : IJsonFormatter
 		{
 			var token = reader.GetCurrentJsonToken();
 
-			if (token == JsonToken.String)
+			switch (token)
 			{
-				var formatter = formatterResolver.GetFormatter<DateTimeOffset>();
-				return formatter.Deserialize(ref reader, formatterResolver);
+				case JsonToken.String:
+				{
+					var formatter = formatterResolver.GetFormatter<DateTimeOffset>();
+					return formatter.Deserialize(ref reader, formatterResolver);
+				}
+				case JsonToken.Null:
+					reader.ReadNext();
+					return null;
+				case JsonToken.Number:
+				{
+					var millisecondsSinceEpoch = reader.ReadDouble();
+					var dateTimeOffset = DateTimeUtil.Epoch.AddMilliseconds(millisecondsSinceEpoch);
+					return dateTimeOffset;
+				}
+				default:
+					throw new Exception($"Cannot deserialize {nameof(DateTimeOffset)} from token {token}");
 			}
-			if (token == JsonToken.Null)
-				return null;
-
-			if (token == JsonToken.Number)
-			{
-				var millisecondsSinceEpoch = reader.ReadDouble();
-				var dateTimeOffset = DateTimeUtil.Epoch.AddMilliseconds(millisecondsSinceEpoch);
-				return dateTimeOffset;
-			}
-
-			throw new Exception($"Cannot deserialize {nameof(DateTimeOffset)} from token {token}");
 		}
 
 		public void Serialize(ref JsonWriter writer, DateTimeOffset? value, IJsonFormatterResolver formatterResolver)

src/Nest/CommonAbstractions/SerializationBehavior/JsonFormatters/IndicesBoostFormatter.cs

@@ -52,6 +52,7 @@ public IDictionary<IndexName, double> Deserialize(ref JsonReader reader, IJsonFo
 					}
 					return dictionary;
 				default:
+					reader.ReadNextBlock();
 					return null;
 			}
 		}

src/Nest/CommonAbstractions/SerializationBehavior/JsonFormatters/NullableDateTimeOffsetEpochSecondsFormatter.cs

@@ -8,7 +8,10 @@ internal class NullableDateTimeOffsetEpochSecondsFormatter : IJsonFormatter<Date
 		public DateTimeOffset? Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.Number)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var secondsSinceEpoch = reader.ReadDouble();
 			var dateTimeOffset = DateTimeUtil.Epoch.AddSeconds(secondsSinceEpoch);

src/Nest/CommonAbstractions/SerializationBehavior/JsonFormatters/SortOrderFormatter.cs

@@ -8,7 +8,10 @@ internal class SortOrderFormatter<TSortOrder> : IJsonFormatter<TSortOrder>
 		public TSortOrder Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var count = 0;
 			var sortOrder = new TSortOrder();

src/Nest/CommonOptions/Fuzziness/FuzzinessFormatter.cs

@@ -70,7 +70,8 @@ public Fuzziness Deserialize(ref JsonReader reader, IJsonFormatterResolver forma
 					var high = NumberConverter.ReadInt32(rawAuto.Array, commaIndex + 1, out _);
 					return Fuzziness.AutoLength(low, high);
 				}
-				case JsonToken.Number: {
+				case JsonToken.Number:
+				{
 					var value = reader.ReadNumberSegment();
 
 					if (value.IsDouble())
@@ -85,6 +86,7 @@ public Fuzziness Deserialize(ref JsonReader reader, IJsonFormatterResolver forma
 					}
 				}
 				default:
+					reader.ReadNextBlock();
 					return null;
 			}
 		}

src/Nest/CommonOptions/Geo/DistanceFormatter.cs

@@ -7,7 +7,10 @@ internal class DistanceFormatter : IJsonFormatter<Distance>
 		public Distance Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.String)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var value = reader.ReadString();
 			return value == null

src/Nest/CommonOptions/Scripting/ScriptFormatter.cs

@@ -20,7 +20,10 @@ internal class ScriptFormatter : IJsonFormatter<IScript>
 		public IScript Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			var count = 0;
 			IScript script = null;

src/Nest/QueryDsl/MultiTermQueryRewrite/MultiTermQueryRewriteFormatter.cs

@@ -10,7 +10,10 @@ public MultiTermQueryRewrite Deserialize(ref JsonReader reader, IJsonFormatterRe
 			var token = reader.GetCurrentJsonToken();
 
 			if (token == JsonToken.Null)
+			{
+				reader.ReadNext();
 				return null;
+			}
 
 			if (token != JsonToken.String)
 				throw new Exception($"Invalid token type {token} to deserialize {nameof(MultiTermQueryRewrite)} from");

src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryFormatter.cs

@@ -50,7 +50,7 @@ public override void SerializeInternal(ref JsonWriter writer, IFuzzyQuery value,
 
 		public override IFuzzyQuery Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
-			if (reader.GetCurrentJsonToken() == JsonToken.Null)
+			if (reader.ReadIsNull())
 				return null;
 
 			var count = 0;

src/Nest/QueryDsl/TermLevel/Terms/TermsQueryFormatter.cs

@@ -27,7 +27,10 @@ internal class TermsQueryFormatter : IJsonFormatter<ITermsQuery>
 		public ITermsQuery Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
 			if (reader.GetCurrentJsonToken() != JsonToken.BeginObject)
+			{
+				reader.ReadNextBlock();
 				return null;
+			}
 
 			ITermsQuery query = new TermsQuery();
 			var count = 0;

src/Nest/Search/Suggesters/ContextSuggester/SuggestContextFormatter.cs

@@ -15,7 +15,7 @@ internal class SuggestContextFormatter : IJsonFormatter<ISuggestContext>
 
 		public ISuggestContext Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
 		{
-			if (reader.GetCurrentJsonToken() == JsonToken.Null)
+			if (reader.ReadIsNull())
 				return null;
 
 			var segment = reader.ReadNextBlockSegment();