fix #535 serialization of the term filter values hardwired to write value instead of serialize

Author: Mpdreamz

Diff for: src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs

@@ -30,22 +30,22 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 			writer.WriteStartObject();
 			{
-				WriteProperty(writer, f, field, f.Value);
-				WriteProperty(writer, f, "boost", f.Boost);
-				WriteProperty(writer, f, "_cache", f.Cache);
-				WriteProperty(writer, f, "_cache_key", f.CacheKey);
-				WriteProperty(writer, f, "_name", f.FilterName);
+				WriteProperty(writer, serializer, field, f.Value);
+				WriteProperty(writer, serializer, "boost", f.Boost);
+				WriteProperty(writer, serializer, "_cache", f.Cache);
+				WriteProperty(writer, serializer, "_cache_key", f.CacheKey);
+				WriteProperty(writer, serializer, "_name", f.FilterName);
 
 			}
 			writer.WriteEndObject();
 		}
 
-		private static void WriteProperty(JsonWriter writer, IFilter filter, string field, object value)
+		private static void WriteProperty(JsonWriter writer, JsonSerializer serializer, string field, object value)
 		{
 			if ((field.IsNullOrEmpty() || value == null))
 				return;
 			writer.WritePropertyName(field);
-			writer.WriteValue(value);
+			serializer.Serialize(writer, value);
 		}
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)

Diff for: src/Tests/Nest.Tests.Unit/Internals/Serialize/CustomConvertersTests.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.Serialization;
+using FluentAssertions;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Nest.Tests.MockData.Domain;
+using Elasticsearch.Net;
+
+namespace Nest.Tests.Unit.Internals.Serialize
+{
+	[TestFixture]
+	public class CustomConvertersTests : BaseJsonTests
+	{
+		private readonly ElasticClient _serializationClient;
+
+		public class MyObject
+		{
+			public MyEnum MyEnum { get; set; }
+			public NestedObject Nested { get; set; }
+		}
+		public enum MyEnum
+		{
+			Foo = 0,
+			Bar = 1
+		}
+
+		public class NestedObject
+		{
+			public string Name { get; set; }
+		}
+
+		public CustomConvertersTests()
+		{
+			var settings = new ConnectionSettings(new Uri("http://localhost:9200"))
+				.SetDefaultIndex("nest_test_data")
+				.AddContractJsonConverters(
+					t => typeof(Enum).IsAssignableFrom(t) ? new Newtonsoft.Json.Converters.StringEnumConverter() : null,
+					t => typeof(NestedObject).IsAssignableFrom(t) ? new CustomConverter() : null
+				);
+
+			 _serializationClient = new ElasticClient(settings);
+		}
+
+
+		[Test]
+		public void ObjectSerializationTakesConvertersIntoAccount()
+		{
+			var o = new MyObject() { MyEnum = MyEnum.Foo, Nested = new NestedObject() };
+			var serializedObject = _serializationClient.Serializer.Serialize(o).Utf8String();
+			serializedObject.JsonEquals(@"
+				{
+					""myEnum"" : ""Foo"",
+					""nested"" : ""something""
+				}").Should().BeTrue();
+
+		}
+
+		[Test]
+		public void StringificationTakesConvertersIntoAccount()
+		{
+			var query = new FilterDescriptor<MyObject>().Term(t => t.MyEnum, MyEnum.Foo);
+			var serialized = _serializationClient.Serializer.Serialize(query).Utf8String();
+			serialized.JsonEquals(@"
+				{
+					""term"" : {
+						""myEnum"" : ""Foo""
+					}
+				}").Should().BeTrue();
+		}
+
+		public class CustomConverter : JsonConverter
+		{
+			public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+			{
+				writer.WriteValue("something");
+			}
+
+			public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+			{
+				return new NestedObject();
+			}
+
+			public override bool CanConvert(Type objectType)
+			{
+				return true;
+			}
+		}
+	}
+}

Diff for: src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -235,6 +235,7 @@
     <Compile Include="Internals\Inferno\MapTypeNamesTests.cs" />
     <Compile Include="Internals\Serialize\ConnectionSettingsTests.cs" />
     <Compile Include="Internals\Serialize\OptOutTests.cs" />
+    <Compile Include="Internals\Serialize\CustomConvertersTests.cs" />
     <Compile Include="ObjectInitializer\Aliases\GetAliasMoreUrlTests.cs" />
     <Compile Include="ObjectInitializer\Aliases\GetAliasesMoreUrlTests.cs" />
     <Compile Include="ObjectInitializer\Aliases\GetAliasRequestTests.cs" />