Merge pull request #1422 from elastic/fix/1409-raw-filters-are-not-written

Mpdreamz · Mpdreamz · commit a139f054d3c6 · 2015-06-18T11:33:20.000+02:00
Added JsonCoverter for IFilterContainer
diff --git a/src/Nest/DSL/Facets/FacetContainer.cs b/src/Nest/DSL/Facets/FacetContainer.cs
@@ -32,6 +32,7 @@ public interface IFacetContainer
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer Filter { get; set; }
 
 		[JsonProperty(PropertyName = "statistical")]
@@ -71,6 +72,7 @@ public class FacetContainer : IFacetContainer
 		public IQueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		public IFilterContainer Filter { get; set; }
 
 		[JsonProperty(PropertyName = "statistical")]
diff --git a/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs b/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs
@@ -17,6 +17,7 @@ public interface IHasChildFilter : IFilter
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer Filter { get; set; }
 
 		[JsonProperty("inner_hits")]
diff --git a/src/Nest/DSL/MultiPercolate/IPercolateOperation.cs b/src/Nest/DSL/MultiPercolate/IPercolateOperation.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using Elasticsearch.Net;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -32,6 +33,7 @@ public interface IPercolateOperation
 		QueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		FilterContainer Filter { get; set; }
 
 		[JsonProperty(PropertyName = "aggs")]
diff --git a/src/Nest/DSL/PutAliasDescriptor.cs b/src/Nest/DSL/PutAliasDescriptor.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Nest.Resolvers.Converters;
 
 namespace Nest
 {
@@ -15,6 +16,7 @@ public interface IPutAliasRequest : IIndexOptionalNamePath<PutAliasRequestParame
 		string Routing { get; set; }
 
 		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer Filter { get; set; }
 	}
 
diff --git a/src/Nest/DSL/Query/FilterScoreQueryDescriptor.cs b/src/Nest/DSL/Query/FilterScoreQueryDescriptor.cs
@@ -11,6 +11,7 @@ namespace Nest.DSL.Query
 	public interface IFilterScoreQuery : IQuery
 	{
 		[JsonProperty(PropertyName = "filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		FilterContainer Filter { get; set; }
 		
 		[JsonProperty(PropertyName = "lang")]
diff --git a/src/Nest/DSL/Query/Functions/IFunctionScoreFunction.cs b/src/Nest/DSL/Query/Functions/IFunctionScoreFunction.cs
@@ -23,8 +23,9 @@ public class FunctionScoreFunction<T> : IFunctionScoreFunction
 		where T : class
 	{
 		IFunctionScoreFunction Self { get { return this; } }
-		
+
 		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		FilterContainer IFunctionScoreFunction.Filter { get; set; }
 
 		long? IFunctionScoreFunction.Weight
diff --git a/src/Nest/DSL/Suggest/PhraseSuggestCollateDescriptor.cs b/src/Nest/DSL/Suggest/PhraseSuggestCollateDescriptor.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Nest.Resolvers.Converters;
 
 namespace Nest
 {
@@ -13,6 +14,7 @@ public interface IPhraseSuggestCollate
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer Filter { get; set; }
 
 		[JsonProperty(PropertyName = "params")]
diff --git a/src/Nest/Domain/Alias/AliasAddOperation.cs b/src/Nest/Domain/Alias/AliasAddOperation.cs
@@ -1,4 +1,5 @@
-﻿using Newtonsoft.Json;
+﻿using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,14 +10,20 @@ public class AliasAddOperation
 	{
 		[JsonProperty("index")]
 		public IndexNameMarker Index { get; set; }
+
 		[JsonProperty("alias")]
 		public string Alias { get; set; }
+
 		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		public FilterContainer FilterDescriptor { get; set; }
+
 		[JsonProperty("routing")]
 		public string Routing { get; set; }
+
 		[JsonProperty("index_routing")]
 		public string IndexRouting { get; set; }
+
 		[JsonProperty("search_routing")]
 		public string SearchRouting { get; set; }
 	}
diff --git a/src/Nest/Domain/Alias/AliasDefinition.cs b/src/Nest/Domain/Alias/AliasDefinition.cs
@@ -1,4 +1,5 @@
-﻿using Newtonsoft.Json;
+﻿using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -7,6 +8,7 @@ public class AliasDefinition
 		public string Name { get; set; }
 
 		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		public IFilterContainer Filter { get; internal set; }
 	
 		[JsonProperty("routing")]
diff --git a/src/Nest/Domain/Alias/CreateAliasDescriptor.cs b/src/Nest/Domain/Alias/CreateAliasDescriptor.cs
@@ -1,11 +1,13 @@
 ﻿using System;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
 {
 	public interface ICreateAliasOperation
 	{
 		[JsonProperty("filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		FilterContainer Filter { get; set; }
 
 		[JsonProperty("routing")]
diff --git a/src/Nest/Domain/Analysis/Analyzers/CustomAnalyzer.cs b/src/Nest/Domain/Analysis/Analyzers/CustomAnalyzer.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,24 +10,24 @@ namespace Nest
 	/// <para>The custom analyzer accepts a logical/registered name of the tokenizer to use, and a list of logical/registered names of token filters.</para>
 	/// </summary>
 	public class CustomAnalyzer : AnalyzerBase
-    {
-	    public CustomAnalyzer(string type)
-	    {
-	        Type = type;
-	    }
+	{
+		public CustomAnalyzer(string type)
+		{
+			Type = type;
+		}
 
-        public CustomAnalyzer() : this("custom") {}
+		public CustomAnalyzer() : this("custom") { }
 
-	    [JsonProperty("tokenizer")]
-        public string Tokenizer { get; set; }
+		[JsonProperty("tokenizer")]
+		public string Tokenizer { get; set; }
 
-        [JsonProperty("filter")]
-        public IList<string> Filter { get; set; }
+		[JsonProperty("filter")]
+		public IList<string> Filter { get; set; }
 
-        [JsonProperty("char_filter")]
-        public IList<string> CharFilter { get; set; }
+		[JsonProperty("char_filter")]
+		public IList<string> CharFilter { get; set; }
 
 		[JsonProperty("alias")]
 		public IList<string> Alias { get; set; }
-    }
+	}
 }
diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj
@@ -261,6 +261,7 @@
     <Compile Include="Internals\Serialize\NullValueHandlingTests.cs" />
     <Compile Include="Internals\Serialize\OptOutTests.cs" />
     <Compile Include="Internals\Serialize\CustomConvertersTests.cs" />
+    <Compile Include="ObjectInitializer\Aliases\AliasFilterRequestTests.cs" />
     <Compile Include="ObjectInitializer\Aliases\GetAliasMoreUrlTests.cs" />
     <Compile Include="ObjectInitializer\Aliases\GetAliasesMoreUrlTests.cs" />
     <Compile Include="ObjectInitializer\Aliases\GetAliasRequestTests.cs" />
@@ -735,6 +736,9 @@
     <None Include="Internals\Serialize\OptOutDuringMapping.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ObjectInitializer\Aliases\AliasFilterBody.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ObjectInitializer\Aliases\AliasBody.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasFilterBody.json b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasFilterBody.json
@@ -0,0 +1,11 @@
+{
+  "actions": [
+    {
+      "add": {
+        "index": "myindex-2014-2-2",
+        "alias": "myindex",
+        "filter":  { "term" : { "test" : "this_test" } }
+      }
+    }
+  ]
+}
diff --git a/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasFilterRequestTests.cs b/src/Tests/Nest.Tests.Unit/ObjectInitializer/Aliases/AliasFilterRequestTests.cs
@@ -0,0 +1,29 @@
+﻿using System.Reflection;
+using Elasticsearch.Net;
+using NUnit.Framework;
+
+namespace Nest.Tests.Unit.ObjectInitializer.Aliases
+{
+	[TestFixture]
+	public class AliasFilterRequestTests : BaseJsonTests
+	{
+		private readonly IElasticsearchResponse _status;
+
+		public AliasFilterRequestTests()
+		{
+			var response = _client.Alias(x => x.Add(
+					addAction => addAction
+						.Index("myindex-2014-2-2")
+						.Alias("myindex")
+						.Filter<object>(filter => filter.Raw(" { \"term\" : { \"test\" : \"this_test\" } }"))
+				));
+			_status = response.ConnectionStatus;
+		}
+
+		[Test]
+		public void AliasFilterBody()
+		{
+			JsonEquals(_status.Request, MethodBase.GetCurrentMethod());
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using System.Text;`
	`7`	`+using Nest.Resolvers.Converters;`
`7`	`8`
`8`	`9`	`namespace Nest`
`9`	`10`	`{`
`@@ -15,6 +16,7 @@ public interface IPutAliasRequest : IIndexOptionalNamePath<PutAliasRequestParame`
`15`	`16`	`string Routing { get; set; }`
`16`	`17`
`17`	`18`	`[JsonProperty("filter")]`
	`19`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`18`	`20`	`IFilterContainer Filter { get; set; }`
`19`	`21`	`}`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace Nest.DSL.Query`
`11`	`11`	`public interface IFilterScoreQuery : IQuery`
`12`	`12`	`{`
`13`	`13`	`[JsonProperty(PropertyName = "filter")]`
	`14`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`14`	`15`	`FilterContainer Filter { get; set; }`
`15`	`16`
`16`	`17`	`[JsonProperty(PropertyName = "lang")]`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`using System;`
	`2`	`+using Nest.Resolvers.Converters;`
`2`	`3`	`using Newtonsoft.Json;`
`3`	`4`
`4`	`5`	`namespace Nest`
`5`	`6`	`{`
`6`	`7`	`public interface ICreateAliasOperation`
`7`	`8`	`{`
`8`	`9`	`[JsonProperty("filter")]`
	`10`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`9`	`11`	`FilterContainer Filter { get; set; }`
`10`	`12`
`11`	`13`	`[JsonProperty("routing")]`