Serializes format in RangeFilter

Also deserialize format and time_zone
Closes #2208

Author: russcam

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

@@ -46,6 +46,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 					SerializeProperty(writer, serializer, "gt", f.GreaterThan);
 					SerializeProperty(writer, serializer, "gte", f.GreaterThanOrEqualTo);
 					SerializeProperty(writer, serializer, "time_zone", f.TimeZone);
+					SerializeProperty(writer, serializer, "format", f.Format);
 				}
 				writer.WriteEndObject();
 
@@ -102,7 +103,15 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 						var lt = jv.Value["lt"];
 						if (lt != null)
 							filter.LowerThan = ToString(lt);
-						
+
+						var format = jv.Value["format"];
+						if (format != null)
+							filter.Format = ToString(format);
+
+						var timezone = jv.Value["time_zone"];
+						if (timezone != null)
+							filter.TimeZone = ToString(timezone);
+							
 						break;
 				}
 			}

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -431,6 +431,7 @@
     <Compile Include="Reproduce\Reproduce1528Tests.cs" />
     <Compile Include="Reproduce\Reproduce1464Tests.cs" />
     <Compile Include="Reproduce\Reproduce1427Tests.cs" />
+    <Compile Include="Reproduce\Reproduce2208Tests.cs" />
     <Compile Include="Reproduce\Reproduce629Tests.cs" />
     <Compile Include="Reproduce\Reproduce1187Tests.cs" />
     <Compile Include="Reproduce\Reproduce901Tests.cs" />

src/Tests/Nest.Tests.Unit/Reproduce/Reproduce2208Tests.cs

@@ -0,0 +1,83 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Elasticsearch.Net.Serialization;
+using NUnit.Framework;
+
+namespace Nest.Tests.Unit.Reproduce
+{
+	[TestFixture]
+	public class Reproduce2208Tests : BaseJsonTests
+	{
+		[Test]
+		public void SerializesFormat()
+		{
+			var weight = 1;
+			var earliestDate = new DateTime(2016,1,1);
+			var farthestDate = new DateTime(2016,8,1);
+
+			var function = new FunctionScoreFunction<GroupListSearchDataContract>()
+				.Weight(weight)
+				.Filter(fi => fi
+					.Bool(b => b
+						.Should(s => s
+							.Range(r => r
+								.OnField(f => f.RoleCriteria.TargetMoveIn)
+								.GreaterOrEquals(earliestDate)
+								.LowerOrEquals(farthestDate)
+								.Format("yyyy-MM-dd'T'HH:mm:ss.SSS")
+							)
+						)
+					)
+				);
+
+			var bytes = _client.Serializer.Serialize(function);
+			var json = Encoding.UTF8.GetString(bytes);
+			Assert.IsTrue(json.Contains("\"format\""));
+		}
+
+		[Test]
+		public void DeserializesFormatAndTimezone()
+		{
+			var json = @"{
+			  ""filter"": {
+				""bool"": {
+				  ""should"": [
+					{
+					  ""range"": {
+						""roleCriteria.targetMoveIn"": {
+						  ""lte"": ""2016-08-01T00:00:00.000"",
+						  ""gte"": ""2016-01-01T00:00:00.000"",
+						  ""format"": ""yyyy-MM-dd'T'HH:mm:ss.SSS"",
+						  ""time_zone"": ""+10:00""
+						}
+					  }
+					}
+				  ]
+				}
+			  },
+			  ""weight"": 1.0
+			}";
+
+			using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+			{
+				var deserializedFunction = _client.Serializer.Deserialize<IFunctionScoreFunction>(stream);
+				var rangeFilter = ((IFilterContainer)deserializedFunction.Filter).Bool.Should.First().Range;
+
+				Assert.IsNotNullOrEmpty(rangeFilter.Format);
+				Assert.IsNotNullOrEmpty(rangeFilter.TimeZone);
+			}
+		}
+
+		public class GroupListSearchDataContract
+		{
+			public RoleCriteria RoleCriteria { get; set; }
+		}
+
+		public class RoleCriteria
+		{
+			public DateTime TargetMoveIn { get; set; }
+		}
+	}
+}