Move contracts to ElasticcontractResolver

Author: Tasteful

src/Nest/ElasticClient-MappingIndex.cs

@@ -37,17 +37,18 @@ public IIndexSettingsResponse GetIndexSettings(string index)
 				var settingsObject = o.First.First.First.First;
 
 				var settingsContainer = new JObject();
+				// In indexsettings response all analyzers etc are delivered as settings so need to split up the settings key and make proper json
 				foreach (JProperty s in settingsObject.Children<JProperty>())
 				{
 					var name = StripIndex.Replace(s.Name, "");
 					if (name.StartsWith("analysis"))
 					{
 						var key = name.Split('.');
-						WriteJObject(settingsContainer, key, s.Value);
+						RewriteIndexSettingsResponseToIndexSettingsJSon(settingsContainer, key, s.Value);
 					}
 					else
 					{
-						WriteJObject(settingsContainer, new[] { name }, s.Value);
+						RewriteIndexSettingsResponseToIndexSettingsJSon(settingsContainer, new[] { name }, s.Value);
 					}
 				}
 
@@ -59,45 +60,6 @@ public IIndexSettingsResponse GetIndexSettings(string index)
 			return response;
 		}
 
-		private JToken WriteJObject(JContainer container, string[] key, JToken value)
-		{
-			var thisKey = key.First();
-			int indexer;
-			if (key.Length > 2 || (key.Length == 2 && !int.TryParse(key.Last(), out indexer)))
-			{
-				var property = (JContainer)((JObject)container).GetValue(thisKey);
-				if (property == null)
-				{
-					property = new JObject();
-					((JObject)container).Add(thisKey, property);
-				}
-				var innerValue = WriteJObject(property, key.Skip(1).ToArray(), value);
-
-				//property.Add(new JValue(innerValue));
-				//return property;
-				return property;
-			}
-			
-			if (key.Length == 2 && int.TryParse(key.Last(), out indexer))
-			{
-				var property = ((JObject)container).Property(thisKey);
-				if (property == null)
-				{
-					property = new JProperty(thisKey, new JArray());
-					container.Add(property);
-				}
-				var jArray = (JArray)property.Value;
-				jArray.Add(value);
-				return property;
-			}
-
-			{
-				var property = new JProperty(thisKey, value);
-				container.Add(property);
-				return property;
-			}
-		}
-
 		/// <summary>
 		/// Update the index settings for the default index
 		/// </summary>
@@ -152,5 +114,44 @@ public IIndicesResponse DeleteIndex(string index)
 			return r;
 		}
 
+		/// <summary>
+		/// Rewrites the index settings response to index settings json.
+		/// </summary>
+		/// <param name="container">The container.</param>
+		/// <param name="key">The key.</param>
+		/// <param name="value">The value.</param>
+		private void RewriteIndexSettingsResponseToIndexSettingsJSon(JContainer container, string[] key, JToken value)
+		{
+			var thisKey = key.First();
+			int indexer;
+			
+			if (key.Length > 2 || (key.Length == 2 && !int.TryParse(key.Last(), out indexer)))
+			{
+				var property = (JContainer)((JObject)container).GetValue(thisKey);
+				if (property == null)
+				{
+					property = new JObject();
+					((JObject)container).Add(thisKey, property);
+				}
+				RewriteIndexSettingsResponseToIndexSettingsJSon(property, key.Skip(1).ToArray(), value);
+			}
+			else if (key.Length == 2 && int.TryParse(key.Last(), out indexer))
+			{
+				var property = ((JObject)container).Property(thisKey);
+				if (property == null)
+				{
+					property = new JProperty(thisKey, new JArray());
+					container.Add(property);
+				}
+				var jArray = (JArray)property.Value;
+				jArray.Add(value);
+			}
+			else
+			{
+				var property = new JProperty(thisKey, value);
+				container.Add(property);
+			}
+		}
+
 	}
 }

src/Nest/ExposedInternals/ElasticSerializer.cs

@@ -18,14 +18,6 @@ public class ElasticSerializer
 		private readonly PropertyNameResolver _propertyNameResolver;
 		private readonly JsonSerializerSettings _serializationSettings;
 
-		private static readonly JsonConverter[] _defaultConverters =
-		{
-			new AnalyzerCollectionConverter(), 
-			new TokenFilterCollectionConverter(), 
-			new TokenizerCollectionConverter(), 
-			new CharFilterCollectionConverter()
-		};
-
 		public ElasticSerializer(IConnectionSettings settings)
 		{
 			this._settings = settings;
@@ -103,15 +95,15 @@ internal T DeserializeInternal<T>(
 		internal JsonSerializerSettings CreateSettings(IList<JsonConverter> extraConverters = null, JsonConverter piggyBackJsonConverter = null)
 		{
 			var converters = extraConverters.HasAny()
-				? extraConverters.Concat(_defaultConverters)
-				: _defaultConverters;
+				? extraConverters.ToList()
+				: null;
 			var piggyBackState = new JsonConverterPiggyBackState { ActualJsonConverter = piggyBackJsonConverter };
             var settings = new JsonSerializerSettings()
 			{
 				ContractResolver = new ElasticContractResolver(this._settings) { PiggyBackState = piggyBackState },
 				DefaultValueHandling = DefaultValueHandling.Include,
 				NullValueHandling = NullValueHandling.Ignore,
-				Converters = converters.ToList(),
+				Converters = converters,
 			};
 
             if (_settings.ModifyJsonSerializerSettings != null)

src/Nest/Resolvers/ElasticContractResolver.cs

@@ -55,6 +55,18 @@ protected override JsonContract CreateContract(Type objectType)
 			if (objectType == typeof(MultiSearchResponse))
 				contract.Converter = new MultiSearchConverter();
 
+			if (objectType == typeof(IDictionary<string, AnalyzerBase>))
+				contract.Converter = new AnalyzerCollectionConverter();
+
+			if (objectType == typeof(IDictionary<string, TokenizerBase>))
+				contract.Converter = new TokenFilterCollectionConverter();
+
+			if (objectType == typeof(MultiSearchResponse))
+				contract.Converter = new TokenizerCollectionConverter();
+
+			if (objectType == typeof(IDictionary<string, CharFilterBase>))
+				contract.Converter = new CharFilterCollectionConverter();
+
 			if (this.ConnectionSettings.ContractConverters.HasAny())
 			{
 				foreach (var c in this.ConnectionSettings.ContractConverters)