fix #1566 Filter aggregation does not support raw json, also normalized all jsonconverters on props of type IQueryContainer and IFilterContainer

Mpdreamz · Mpdreamz · commit 0b60550982a9 · 2016-01-06T12:26:51.000+01:00
diff --git a/src/Nest/DSL/Aggregations/FilterAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/FilterAggregationDescriptor.cs
@@ -1,4 +1,5 @@
 using System;
+using Nest.Resolvers.Converters;
 using Nest.Resolvers.Converters.Aggregations;
 using Newtonsoft.Json;
 
@@ -8,6 +9,7 @@ namespace Nest
 	[JsonConverter(typeof(FilterAggregatorConverter))]
 	public interface IFilterAggregator : IBucketAggregator
 	{
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer Filter { get; set; }
 	}
 
diff --git a/src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs
@@ -47,6 +47,7 @@ public interface ISignificantTermsAggregator : IBucketAggregator
 		ScriptedHeuristic Script { get; set; }
 
 		[JsonProperty("background_filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer BackgroundFilter { get; set; }
 
 	}
diff --git a/src/Nest/DSL/CountDescriptor.cs b/src/Nest/DSL/CountDescriptor.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
+using Nest.Resolvers.Converters;
 
 namespace Nest
 {
@@ -10,6 +11,7 @@ public interface ICountRequest : IQueryPath<CountRequestParameters>
 	{
 		
 		[JsonProperty("query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 	}
 	public interface ICountRequest<T> : ICountRequest
diff --git a/src/Nest/DSL/DeleteByQueryDescriptor.cs b/src/Nest/DSL/DeleteByQueryDescriptor.cs
@@ -3,13 +3,15 @@
 using System.Linq;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
+using Nest.Resolvers.Converters;
 
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface IDeleteByQueryRequest : IQueryPath<DeleteByQueryRequestParameters>
 	{
 		[JsonProperty("query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 	}
 
diff --git a/src/Nest/DSL/ExplainDescriptor.cs b/src/Nest/DSL/ExplainDescriptor.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using Elasticsearch.Net;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -8,6 +9,7 @@ namespace Nest
     public interface IExplainRequest : IDocumentOptionalPath<ExplainRequestParameters>
     {
         [JsonProperty("query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
         IQueryContainer Query { get; set; }
     }
 	
diff --git a/src/Nest/DSL/Facets/FacetContainer.cs b/src/Nest/DSL/Facets/FacetContainer.cs
@@ -45,6 +45,7 @@ public interface IFacetContainer
 		IGeoDistanceFacetRequest GeoDistance { get; set; }
 
 		[JsonProperty(PropertyName = "facet_filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer FacetFilter { get; set; }
 	}
 
@@ -69,6 +70,7 @@ public class FacetContainer : IFacetContainer
 		public IDateHistogramFacetRequest DateHistogram { get; set; }
 
 		[JsonProperty(PropertyName = "query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		public IQueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "filter")]
@@ -85,6 +87,7 @@ public class FacetContainer : IFacetContainer
 		public IGeoDistanceFacetRequest GeoDistance { get; set; }
 
 		[JsonProperty(PropertyName = "facet_filter")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		public IFilterContainer FacetFilter { get; set; }
 	}
 }
diff --git a/src/Nest/DSL/Facets/FacetRequest.cs b/src/Nest/DSL/Facets/FacetRequest.cs
@@ -1,14 +1,19 @@
+using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
+
 namespace Nest
 {
 	public interface IFacetRequest
 	{
 		bool? Global { get; set; }
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		IFilterContainer FacetFilter { get; set; }
 		PropertyPathMarker Nested { get; set; }
 	}
 	public abstract class FacetRequest : IFacetRequest
 	{
 		public bool? Global { get; set; }
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]
 		public IFilterContainer FacetFilter { get; set; }
 		public PropertyPathMarker Nested { get; set; }
 	}
diff --git a/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs b/src/Nest/DSL/Filter/HasChildFilterDescriptor.cs
@@ -20,6 +20,7 @@ public interface IHasChildFilter : IFilter
 		int? MaxChildren { get; set; }
 
 		[JsonProperty("query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty("filter")]
diff --git a/src/Nest/DSL/Filter/TermsFilterDescriptor.cs b/src/Nest/DSL/Filter/TermsFilterDescriptor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using Nest.Resolvers.Converters.Filters;
 using Newtonsoft.Json;
 
diff --git a/src/Nest/DSL/Query/SpanMultiTermQueryDescriptor.cs b/src/Nest/DSL/Query/SpanMultiTermQueryDescriptor.cs
@@ -1,4 +1,5 @@
-﻿using Newtonsoft.Json;
+﻿using Nest.Resolvers.Converters;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,6 +11,7 @@ namespace Nest
 	public interface ISpanMultiTermQuery : ISpanSubQuery
 	{
 		[JsonProperty("match")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Match { get; set; }
 
 		[JsonProperty("boost")]
diff --git a/src/Nest/DSL/Query/TermQueryDescriptor.cs b/src/Nest/DSL/Query/TermQueryDescriptor.cs
@@ -104,7 +104,6 @@ public void SetFieldName(string fieldName)
 		}
 	}
 
-
 	public class TermQueryDescriptor<T> : TermQueryDescriptorBase<TermQueryDescriptor<T>, T>
 		where T : class
 	{
diff --git a/src/Nest/DSL/Rescore/RescoreQueryDescriptor.cs b/src/Nest/DSL/Rescore/RescoreQueryDescriptor.cs
@@ -9,6 +9,7 @@ namespace Nest
 	public interface IRescoreQuery
 	{
 		[JsonProperty("rescore_query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty("query_weight")]
diff --git a/src/Nest/DSL/Search/HighlightDescriptor.cs b/src/Nest/DSL/Search/HighlightDescriptor.cs
@@ -48,6 +48,7 @@ public interface IHighlightRequest
 		string BoundaryChars { get; set; }
 
 		[JsonProperty("highlight_query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer HighlightQuery { get; set; }
 	}
 
diff --git a/src/Nest/DSL/Search/HighlightFieldDescriptor.cs b/src/Nest/DSL/Search/HighlightFieldDescriptor.cs
@@ -59,6 +59,7 @@ public interface IHighlightField
 		IEnumerable<PropertyPathMarker> MatchedFields { get; set; }
 
         [JsonProperty("highlight_query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
         IQueryContainer HighlightQuery { get; set; }
     }
 
diff --git a/src/Nest/DSL/Search/IGlobalInnerHit.cs b/src/Nest/DSL/Search/IGlobalInnerHit.cs
@@ -3,12 +3,14 @@
 using System.Linq;
 using Newtonsoft.Json;
 using System.Linq.Expressions;
+using Nest.Resolvers.Converters;
 
 namespace Nest
 {
 	public interface IGlobalInnerHit : IInnerHits
 	{
 		[JsonProperty(PropertyName = "query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "inner_hits")]
diff --git a/src/Nest/DSL/Suggest/PhraseSuggestCollateDescriptor.cs b/src/Nest/DSL/Suggest/PhraseSuggestCollateDescriptor.cs
@@ -11,6 +11,7 @@ namespace Nest
 	public interface IPhraseSuggestCollate
 	{
 		[JsonProperty(PropertyName = "query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
 
 		[JsonProperty(PropertyName = "filter")]
diff --git a/src/Nest/DSL/ValidateQueryDescriptor.cs b/src/Nest/DSL/ValidateQueryDescriptor.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using Elasticsearch.Net;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -9,6 +10,7 @@ namespace Nest
     public interface IValidateQueryRequest : IQueryPath<ValidateQueryRequestParameters>
     {
         [JsonProperty("query")]
+		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
         IQueryContainer Query { get; set; }
     }
 
diff --git a/src/Nest/Resolvers/Converters/Aggregations/FilterAggregatorConverter.cs b/src/Nest/Resolvers/Converters/Aggregations/FilterAggregatorConverter.cs
@@ -18,8 +18,16 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		{
 			var f = value as IFilterAggregator;
 			if (f == null || f.Filter == null) return;
+			var custom = f.Filter as ICustomJson;
+			if (custom == null)
+				return;
 
-			serializer.Serialize(writer, f.Filter);
+			var json = custom.GetCustomJson();
+			var rawJson = json as RawJson;
+			if (rawJson != null)
+				writer.WriteRawValue(rawJson.Data);
+			else 
+				serializer.Serialize(writer, json);
 		}
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj
@@ -434,6 +434,7 @@
     <Compile Include="Reproduce\Reproduce901Tests.cs" />
     <Compile Include="Reproduce\Reproduce1320Tests.cs" />
     <Compile Include="Reproduce\Reproduce1435Tests.cs" />
+    <Compile Include="Reproduce\Reproduce1566Tests.cs" />
     <Compile Include="Reproduce\Reproduce990Tests.cs" />
     <Compile Include="Reproduce\Reproduce974Tests.cs" />
     <Compile Include="Reproduce\Reproduce928Tests.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using Nest.Resolvers.Converters;`
`2`	`3`	`using Nest.Resolvers.Converters.Aggregations;`
`3`	`4`	`using Newtonsoft.Json;`
`4`	`5`
`@@ -8,6 +9,7 @@ namespace Nest`
`8`	`9`	`[JsonConverter(typeof(FilterAggregatorConverter))]`
`9`	`10`	`public interface IFilterAggregator : IBucketAggregator`
`10`	`11`	`{`
	`12`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`11`	`13`	`IFilterContainer Filter { get; set; }`
`12`	`14`	`}`
`13`	`15`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public interface ISignificantTermsAggregator : IBucketAggregator`
`47`	`47`	`ScriptedHeuristic Script { get; set; }`
`48`	`48`
`49`	`49`	`[JsonProperty("background_filter")]`
	`50`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`50`	`51`	`IFilterContainer BackgroundFilter { get; set; }`
`51`	`52`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Elasticsearch.Net;`
`4`	`4`	`using Newtonsoft.Json;`
	`5`	`+using Nest.Resolvers.Converters;`
`5`	`6`
`6`	`7`	`namespace Nest`
`7`	`8`	`{`
`@@ -10,6 +11,7 @@ public interface ICountRequest : IQueryPath<CountRequestParameters>`
`10`	`11`	`{`
`11`	`12`
`12`	`13`	`[JsonProperty("query")]`
	`14`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]`
`13`	`15`	`IQueryContainer Query { get; set; }`
`14`	`16`	`}`
`15`	`17`	`public interface ICountRequest<T> : ICountRequest`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,15 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Elasticsearch.Net;`
`5`	`5`	`using Newtonsoft.Json;`
	`6`	`+using Nest.Resolvers.Converters;`
`6`	`7`
`7`	`8`	`namespace Nest`
`8`	`9`	`{`
`9`	`10`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`10`	`11`	`public interface IDeleteByQueryRequest : IQueryPath<DeleteByQueryRequestParameters>`
`11`	`12`	`{`
`12`	`13`	`[JsonProperty("query")]`
	`14`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]`
`13`	`15`	`IQueryContainer Query { get; set; }`
`14`	`16`	`}`
`15`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Elasticsearch.Net;`
	`3`	`+using Nest.Resolvers.Converters;`
`3`	`4`	`using Newtonsoft.Json;`
`4`	`5`
`5`	`6`	`namespace Nest`
`@@ -8,6 +9,7 @@ namespace Nest`
`8`	`9`	`public interface IExplainRequest : IDocumentOptionalPath<ExplainRequestParameters>`
`9`	`10`	`{`
`10`	`11`	`[JsonProperty("query")]`
	`12`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]`
`11`	`13`	`IQueryContainer Query { get; set; }`
`12`	`14`	`}`
`13`	`15`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public interface IFacetContainer`
`45`	`45`	`IGeoDistanceFacetRequest GeoDistance { get; set; }`
`46`	`46`
`47`	`47`	`[JsonProperty(PropertyName = "facet_filter")]`
	`48`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`48`	`49`	`IFilterContainer FacetFilter { get; set; }`
`49`	`50`	`}`
`50`	`51`
`@@ -69,6 +70,7 @@ public class FacetContainer : IFacetContainer`
`69`	`70`	`public IDateHistogramFacetRequest DateHistogram { get; set; }`
`70`	`71`
`71`	`72`	`[JsonProperty(PropertyName = "query")]`
	`73`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]`
`72`	`74`	`public IQueryContainer Query { get; set; }`
`73`	`75`
`74`	`76`	`[JsonProperty(PropertyName = "filter")]`
`@@ -85,6 +87,7 @@ public class FacetContainer : IFacetContainer`
`85`	`87`	`public IGeoDistanceFacetRequest GeoDistance { get; set; }`
`86`	`88`
`87`	`89`	`[JsonProperty(PropertyName = "facet_filter")]`
	`90`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`88`	`91`	`public IFilterContainer FacetFilter { get; set; }`
`89`	`92`	`}`
`90`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,19 @@`
	`1`	`+using Nest.Resolvers.Converters;`
	`2`	`+using Newtonsoft.Json;`
	`3`	`+`
`1`	`4`	`namespace Nest`
`2`	`5`	`{`
`3`	`6`	`public interface IFacetRequest`
`4`	`7`	`{`
`5`	`8`	`bool? Global { get; set; }`
	`9`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`6`	`10`	`IFilterContainer FacetFilter { get; set; }`
`7`	`11`	`PropertyPathMarker Nested { get; set; }`
`8`	`12`	`}`
`9`	`13`	`public abstract class FacetRequest : IFacetRequest`
`10`	`14`	`{`
`11`	`15`	`public bool? Global { get; set; }`
	`16`	`+ [JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<FilterContainer>, CustomJsonConverter>))]`
`12`	`17`	`public IFilterContainer FacetFilter { get; set; }`
`13`	`18`	`public PropertyPathMarker Nested { get; set; }`
`14`	`19`	`}`