Add deserialization method for TermsIncludeExclude (#2508)

* Add deserialization method for TermsIncludeExclude

Fixes #2503

* moved manual deserializing to RoundTripper

Conflicts:
	src/Nest/Aggregations/Bucket/Terms/TermsIncludeExcludeJsonConverter.cs
	src/Tests/Tests.csproj

Author: russcam

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -7,11 +8,42 @@ internal class TermsIncludeExcludeJsonConverter : JsonConverter
 	{
 		public override bool CanConvert(Type objectType) => true;
 
-		public override bool CanRead => false;
-
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			throw new NotSupportedException();
+			if (reader.TokenType == JsonToken.Null) return null;
+
+			var termsInclude = new TermsIncludeExclude();
+
+			switch (reader.TokenType)
+			{
+				case JsonToken.StartArray:
+					termsInclude.Values = serializer.Deserialize<IEnumerable<string>>(reader);
+					break;
+				case JsonToken.StartObject:
+					while (reader.TokenType != JsonToken.EndObject)
+					{
+						reader.Read();
+
+						if (reader.TokenType == JsonToken.PropertyName)
+						{
+							var propertyName = (string)reader.Value;
+							switch (propertyName)
+							{
+								case "pattern":
+									termsInclude.Pattern = reader.ReadAsString();
+									break;
+								case "flags":
+									termsInclude.Flags = reader.ReadAsString();
+									break;
+							}
+						}
+					}
+					break;
+				default:
+					throw new JsonSerializationException($"Unexpected token {reader.TokenType} when deserializing {nameof(TermsIncludeExclude)}");
+			}
+
+			return termsInclude;
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)

src/Tests/Framework/SerializationTests/Roundtrip.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Tests.Framework
@@ -28,6 +31,24 @@ internal RoundTripper(
 			this._serializerFactory = _serializerFactory;
 		}
 
+		public virtual void DeserializesTo<T>(Action<string, T> assert)
+		{
+			var json = (this.ExpectJson is string) ? (string) ExpectJson : JsonConvert.SerializeObject(this.ExpectJson);
+
+			T sut;
+			using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+				sut = this.Client.Serializer.Deserialize<T>(stream);
+			sut.Should().NotBeNull();
+			assert("first deserialization", sut);
+
+			var serialized = this.Client.Serializer.SerializeToString(sut);
+			using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(serialized)))
+				sut = this.Client.Serializer.Deserialize<T>(stream);
+			sut.Should().NotBeNull();
+			assert("second deserialization", sut);
+		}
+
+
 		public virtual RoundTripper<T> WhenSerializing<T>(T actual)
 		{
 			var sut = this.AssertSerializesAndRoundTrips(actual);

src/Tests/Reproduce/GithubIssue2503.cs

@@ -0,0 +1,64 @@
+using System.IO;
+using System.Text;
+using FluentAssertions;
+using Nest;
+using Tests.Framework;
+using static Tests.Framework.RoundTripper;
+
+namespace Tests.Reproduce
+{
+	public class GithubIssue2503
+	{
+		[U] public void DeserializeTermsIncludeExcludeValues()
+		{
+			Expect(new
+			{
+				aggs = new
+				{
+					sizes = new
+					{
+						terms =  new
+						{
+							field= "size",
+							size= 20,
+							include= new [] { "35", "50", "70", "75", "100" }
+						}
+					}
+				}
+			}).DeserializesTo<SearchRequest>((message, request) =>
+			{
+				request.Should().NotBeNull(message);
+				request.Aggregations.Should().NotBeNull(message).And.HaveCount(1, message);
+				var termsAggregation = request.Aggregations["sizes"].Terms;
+				termsAggregation.Should().NotBeNull(message);
+				termsAggregation.Include.Should().NotBeNull(message);
+				termsAggregation.Include.Values.Should().NotBeNull(message).And.HaveCount(5, message);
+			});
+		}
+
+		[U] public void DeserializeTermsIncludeExcludePattern()
+		{
+			Expect(@"{
+			  ""aggs"": {
+				""sizes"": {
+				  ""terms"": {
+					""field"": ""size"",
+					""size"": 20,
+					""include"": {
+					  ""pattern"" : ""\\d+""
+					}
+				  }
+				}
+			  }
+			}").DeserializesTo<SearchRequest>((message, request) =>
+			{
+				request.Should().NotBeNull(message);
+				request.Aggregations.Should().NotBeNull(message).And.HaveCount(1, message);
+				var termsAggregation = request.Aggregations["sizes"].Terms;
+				termsAggregation.Should().NotBeNull(message);
+				termsAggregation.Include.Should().NotBeNull(message);
+				termsAggregation.Include.Pattern.Should().NotBeNull(message);
+			});
+		}
+	}
+}

src/Tests/Tests.csproj

@@ -661,6 +661,7 @@
     <Compile Include="Search\Request\SlicedScrollSearchUsageTests.cs" />
     <Compile Include="Search\Request\SearchAfterUsageTests.cs" />
     <Compile Include="Search\Scroll\Scroll\SlicedScrollSearchApiTests.cs" />
+    <Compile Include="Reproduce\GithubIssue2503.cs" />
     <Compile Include="Search\Search\Rescoring\RescoreUsageTests.cs" />
     <Compile Include="Search\Search\InvalidSearchApiTests.cs" />
     <Compile Include="Search\Suggesters\SuggestUrlTests.cs" />