Merge pull request #705 from funnelfire/wrapped-contract

Mpdreamz · Mpdreamz · commit b66008f5c2f4 · 2014-06-10T10:42:10.000+02:00
Wrapped the contract after user-adjustable settings
diff --git a/src/Nest/ExposedInternals/NestSerializer.cs b/src/Nest/ExposedInternals/NestSerializer.cs
@@ -89,14 +89,16 @@ internal JsonSerializerSettings CreateSettings(JsonConverter piggyBackJsonConver
 			var piggyBackState = new JsonConverterPiggyBackState { ActualJsonConverter = piggyBackJsonConverter };
 			var settings = new JsonSerializerSettings()
 			{
-				ContractResolver = new ElasticContractResolver(this._settings) { PiggyBackState = piggyBackState },
+				ContractResolver = new ElasticContractResolver(this._settings),
 				DefaultValueHandling = DefaultValueHandling.Include,
 				NullValueHandling = NullValueHandling.Ignore
 			};
 
 			if (_settings.ModifyJsonSerializerSettings != null)
 				_settings.ModifyJsonSerializerSettings(settings);
 
+			settings.ContractResolver = new SettingsContractResolver(settings.ContractResolver, this._settings) { PiggyBackState = piggyBackState };
+
 			return settings;
 		}
 
@@ -111,11 +113,11 @@ public string SerializeBulkDescriptor(BulkDescriptor bulkDescriptor)
 			{
 				var command = operation._Operation;
 				var index = operation._Index
-				            ?? inferrer.IndexName(bulkDescriptor._Index)
-				            ?? inferrer.IndexName(operation._ClrType);
+							?? inferrer.IndexName(bulkDescriptor._Index)
+							?? inferrer.IndexName(operation._ClrType);
 				var typeName = operation._Type
-				               ?? inferrer.TypeName(bulkDescriptor._Type)
-				               ?? inferrer.TypeName(operation._ClrType);
+							   ?? inferrer.TypeName(bulkDescriptor._Type)
+							   ?? inferrer.TypeName(operation._ClrType);
 
 				var id = operation.GetIdForObject(inferrer);
 				operation._Index = index;
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
@@ -822,6 +822,7 @@
     <Compile Include="Enums\NamingConvention.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resolvers\PropertyNameResolver.cs" />
+    <Compile Include="Resolvers\SettingsContractResolver.cs" />
     <Compile Include="Resolvers\TypeNameMarker.cs" />
     <Compile Include="Resolvers\TypeNameMarkerExtensions.cs" />
     <Compile Include="Resolvers\TypeNameResolver.cs" />
@@ -874,4 +875,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs b/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs
@@ -78,7 +78,7 @@ public ConcreteTypeConverter(Func<dynamic, Hit<dynamic>, Type> concreteTypeSelec
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver;
+			var elasticContractResolver = serializer.ContractResolver as SettingsContractResolver;
 			if (elasticContractResolver != null && elasticContractResolver.PiggyBackState != null
 				&& elasticContractResolver.PiggyBackState.ActualJsonConverter != null)
 			{
@@ -161,7 +161,7 @@ internal static Type GetConcreteTypeUsingSelector<T>(
 			JObject jObject, out object selection)
 			where T: class
 		{
-			var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver;
+			var elasticContractResolver = serializer.ContractResolver as SettingsContractResolver;
 			var baseType = realConcreteConverter._baseType;
 			var selector = realConcreteConverter._concreteTypeSelector;
 
diff --git a/src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs b/src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs
@@ -30,7 +30,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 
 			IDictionary dictionary = (IDictionary) value;
 			writer.WriteStartObject();
diff --git a/src/Nest/Resolvers/Converters/FieldNameFilterConverter.cs b/src/Nest/Resolvers/Converters/FieldNameFilterConverter.cs
@@ -84,7 +84,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			if (fieldName == null)
 				return;
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 
diff --git a/src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs b/src/Nest/Resolvers/Converters/FieldNameQueryConverter.cs
@@ -72,7 +72,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			if (fieldName == null)
 				return;
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var f = value as IGeoBoundingBoxFilter;
 			if (f == null || (f.IsConditionless && !f.IsVerbatim)) return;
 			
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 			
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoDistanceFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/GeoDistanceFilterConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var f = value as IGeoDistanceFilter;
 			if (f == null || (f.IsConditionless && !f.IsVerbatim)) return;
 			
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 			
diff --git a/src/Nest/Resolvers/Converters/Filters/GeoDistanceRangeFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/GeoDistanceRangeFilterConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var f = value as IGeoDistanceRangeFilter;
 			if (f == null || (f.IsConditionless && !f.IsVerbatim)) return;
 			
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 			
diff --git a/src/Nest/Resolvers/Converters/Filters/PrefixFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/PrefixFilterConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var f = value as IPrefixFilter;
 			if (f == null || (f.IsConditionless && !f.IsVerbatim)) return;
 			
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 			
diff --git a/src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/TermFilterConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var f = value as ITermFilter;
 			if (f == null || (f.IsConditionless && !f.IsVerbatim)) return;
 			
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 			
diff --git a/src/Nest/Resolvers/Converters/Filters/TermsFilterConverter.cs b/src/Nest/Resolvers/Converters/Filters/TermsFilterConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var f = value as ITermsBaseFilter;
 			if (f == null || (f.IsConditionless && !f.IsVerbatim)) return;
 			
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 			
diff --git a/src/Nest/Resolvers/Converters/IndexNameMarkerConverter.cs b/src/Nest/Resolvers/Converters/IndexNameMarkerConverter.cs
@@ -23,7 +23,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				return;
 			}
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract != null && contract.ConnectionSettings != null)
 			{
 				var indexName = contract.Infer.IndexName(marker);
diff --git a/src/Nest/Resolvers/Converters/IndexSettingsConverter.cs b/src/Nest/Resolvers/Converters/IndexSettingsConverter.cs
@@ -72,7 +72,7 @@ private static void WriteWarmers(JsonWriter writer, JsonSerializer serializer, I
 		private static void WriteMappings(JsonWriter writer, JsonSerializer serializer, IndexSettings indexSettings)
 		{
 			if (indexSettings.Mappings.Count <= 0) return;
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null || contract.ConnectionSettings == null) return;
 			
 			writer.WritePropertyName("mappings");
diff --git a/src/Nest/Resolvers/Converters/MultiGetHitConverter.cs b/src/Nest/Resolvers/Converters/MultiGetHitConverter.cs
@@ -41,7 +41,7 @@ private static void CreateMultiHit<T>(MultiHitTuple tuple, JsonSerializer serial
 			var reader = tuple.Hit.CreateReader();	
 			serializer.Populate(reader, hit);
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			var settings = contract.ConnectionSettings;
 			var f = new FieldSelection<T>(settings);
 			var source = tuple.Hit["fields"];
@@ -59,7 +59,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			if (this._descriptor == null)
 			{
-				var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver;
+				var elasticContractResolver = serializer.ContractResolver as SettingsContractResolver;
 				if (elasticContractResolver == null)
 					return new MultiGetResponse { IsValid = false };
 				var piggyBackState = elasticContractResolver.PiggyBackState;
diff --git a/src/Nest/Resolvers/Converters/MultiSearchConverter.cs b/src/Nest/Resolvers/Converters/MultiSearchConverter.cs
@@ -67,7 +67,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			if (this._settings == null)
 			{
-				var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver;
+				var elasticContractResolver = serializer.ContractResolver as SettingsContractResolver;
 				if (elasticContractResolver == null)
 					return new MultiSearchResponse { IsValid = false };
 				var piggyBackState = elasticContractResolver.PiggyBackState;
diff --git a/src/Nest/Resolvers/Converters/Queries/FuzzyQueryJsonConverter.cs b/src/Nest/Resolvers/Converters/Queries/FuzzyQueryJsonConverter.cs
@@ -98,7 +98,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			if (fieldName == null)
 				return;
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 
diff --git a/src/Nest/Resolvers/Converters/Queries/MatchQueryJsonConverter.cs b/src/Nest/Resolvers/Converters/Queries/MatchQueryJsonConverter.cs
@@ -85,7 +85,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			if (fieldName == null)
 				return;
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 
diff --git a/src/Nest/Resolvers/Converters/Queries/SpanTermQueryConverter.cs b/src/Nest/Resolvers/Converters/Queries/SpanTermQueryConverter.cs
@@ -62,7 +62,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			var sq = value as ISpanTermQuery;
 			if (sq == null) return;
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract == null)
 				return;
 
diff --git a/src/Nest/Resolvers/Converters/Queries/TermsQueryJsonConverter.cs b/src/Nest/Resolvers/Converters/Queries/TermsQueryJsonConverter.cs
@@ -24,7 +24,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 			string field = null;
 
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract != null && contract.ConnectionSettings != null)
 				field = contract.Infer.PropertyPath(t.Field);
 
diff --git a/src/Nest/Resolvers/Converters/TypeNameMarkerConverter.cs b/src/Nest/Resolvers/Converters/TypeNameMarkerConverter.cs
@@ -22,7 +22,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 				writer.WriteNull();
 				return;
 			}
-			var contract = serializer.ContractResolver as ElasticContractResolver;
+			var contract = serializer.ContractResolver as SettingsContractResolver;
 			if (contract != null && contract.ConnectionSettings != null)
 			{
 				var typeName = contract.Infer.TypeName(marker);
diff --git a/src/Nest/Resolvers/ElasticContractResolver.cs b/src/Nest/Resolvers/ElasticContractResolver.cs
@@ -24,19 +24,10 @@ public class ElasticContractResolver : DefaultContractResolver
 		/// </summary>
 		public IConnectionSettingsValues ConnectionSettings { get; private set; }
 
-		public ElasticInferrer Infer { get; private set; }
-
-		/// <summary>
-		/// Signals to custom converter that it can get serialization state from one of the converters
-		/// Ugly but massive performance gain
-		/// </summary>
-		internal JsonConverterPiggyBackState PiggyBackState { get; set; }
-
 		public ElasticContractResolver(IConnectionSettingsValues connectionSettings)
 			: base(true)
 		{
 			this.ConnectionSettings = connectionSettings;
-			this.Infer = new ElasticInferrer(this.ConnectionSettings);
 		}
 
 		protected override JsonContract CreateContract(Type objectType)
diff --git a/src/Nest/Resolvers/SettingsContractResolver.cs b/src/Nest/Resolvers/SettingsContractResolver.cs
@@ -0,0 +1,38 @@
+﻿using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest.Resolvers
+{
+	class SettingsContractResolver : IContractResolver
+	{
+		/// <summary>
+		/// ConnectionSettings can be requested by JsonConverter's.
+		/// </summary>
+		public IConnectionSettingsValues ConnectionSettings { get; private set; }
+
+		public ElasticInferrer Infer { get; private set; }
+
+		private IContractResolver _wrapped;
+
+		/// <summary>
+		/// Signals to custom converter that it can get serialization state from one of the converters
+		/// Ugly but massive performance gain
+		/// </summary>
+		internal JsonConverterPiggyBackState PiggyBackState { get; set; }
+
+		public SettingsContractResolver(IContractResolver wrapped, IConnectionSettingsValues connectionSettings)
+		{
+			this.ConnectionSettings = connectionSettings;
+			this.Infer = new ElasticInferrer(this.ConnectionSettings);
+			this._wrapped = wrapped;
+		}
+
+		public JsonContract ResolveContract(Type type)
+		{
+			return this._wrapped.ResolveContract(type);
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public ConcreteTypeConverter(Func<dynamic, Hit<dynamic>, Type> concreteTypeSelec`
`78`	`78`
`79`	`79`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`80`	`80`	`{`
`81`		`- var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver;`
	`81`	`+ var elasticContractResolver = serializer.ContractResolver as SettingsContractResolver;`
`82`	`82`	`if (elasticContractResolver != null && elasticContractResolver.PiggyBackState != null`
`83`	`83`	`&& elasticContractResolver.PiggyBackState.ActualJsonConverter != null)`
`84`	`84`	`{`
`@@ -161,7 +161,7 @@ internal static Type GetConcreteTypeUsingSelector<T>(`
`161`	`161`	`JObject jObject, out object selection)`
`162`	`162`	`where T: class`
`163`	`163`	`{`
`164`		`- var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver;`
	`164`	`+ var elasticContractResolver = serializer.ContractResolver as SettingsContractResolver;`
`165`	`165`	`var baseType = realConcreteConverter._baseType;`
`166`	`166`	`var selector = realConcreteConverter._concreteTypeSelector;`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`30`	`30`
`31`	`31`	`public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)`
`32`	`32`	`{`
`33`		`- var contract = serializer.ContractResolver as ElasticContractResolver;`
	`33`	`+ var contract = serializer.ContractResolver as SettingsContractResolver;`
`34`	`34`
`35`	`35`	`IDictionary dictionary = (IDictionary) value;`
`36`	`36`	`writer.WriteStartObject();`