Merge branch '2.x' into enhancement/2.x-get-aliases-converter

Author: russcam

src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs

@@ -8,11 +8,6 @@ namespace Nest
 {
 	internal class ScriptQueryConverter : JsonConverter
 	{
-		private readonly VerbatimDictionaryKeysJsonConverter _dictionaryConverter =
-		new VerbatimDictionaryKeysJsonConverter();
-
-		private readonly PropertyJsonConverter _elasticTypeConverter = new PropertyJsonConverter();
-
 		public override bool CanRead => true;
 		public override bool CanWrite => true;
 		public override bool CanConvert(Type objectType) => true;
@@ -40,7 +35,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			var r = new ScriptQuery();
+			var query = new ScriptQuery();
 			JObject o = JObject.Load(reader);
 			var properties = o.Properties().ToListOrNullIfEmpty();
 			var scriptProperty = properties.FirstOrDefault(p => p.Name == "script");
@@ -52,102 +47,29 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				switch (p.Name)
 				{
 					case "_name":
-						r.Name = p.Value.Value<string>();
-						break;
-					case "boost":
-						r.Boost = p.Value.Value<double>();
-						break;
-					case "id":
-						r.Id = p.Value.Value<string>();
-						break;
-					case "file":
-						r.File = p.Value.Value<string>();
-						break;
-					case "inline":
-						r.Inline = p.Value.Value<string>();
-						break;
-					case "lang":
-						r.Lang = p.Value.Value<string>();
-						break;
-					case "params":
-						r.Params = p.Value.ToObject<Dictionary<string, object>>();
-						break;
-				}
-			}
-			return r;
-		}
-	}
-
-
-
-	internal class SimpleScriptQueryConverter : JsonConverter
-	{
-		private readonly VerbatimDictionaryKeysJsonConverter _dictionaryConverter =
-		new VerbatimDictionaryKeysJsonConverter();
-
-		private readonly PropertyJsonConverter _elasticTypeConverter = new PropertyJsonConverter();
-
-		public override bool CanRead => true;
-		public override bool CanWrite => true;
-		public override bool CanConvert(Type objectType) => true;
-
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			var v = value as IScriptQuery;
-			if (v == null) return;
-
-			writer.WriteStartObject();
-			if (!v.Name.IsNullOrEmpty()) writer.WriteProperty(serializer, "_name", v.Name);
-			if (v.Boost != null) writer.WriteProperty(serializer, "boost", v.Boost);
-			//writer.WritePropertyName("script");
-			writer.WriteStartObject();
-			{
-				if (v.Id != null) writer.WriteProperty(serializer, "id", v.Id);
-				if (v.File != null) writer.WriteProperty(serializer, "file", v.File);
-				if (v.Inline != null) writer.WriteProperty(serializer, "inline", v.Inline);
-				if (v.Lang != null) writer.WriteProperty(serializer, "lang", v.Lang);
-				if (v.Params != null) writer.WriteProperty(serializer, "params", v.Params);
-			}
-			//writer.WriteEndObject();
-			writer.WriteEndObject();
-		}
-
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			var r = new ScriptQuery();
-			JObject o = JObject.Load(reader);
-			var properties = o.Properties().ToListOrNullIfEmpty();
-			//var scriptProperty = properties.First(p=>p.Name == "script");
-			//properties.AddRange(scriptProperty.Value.Value<JObject>().Properties());
-
-			foreach (var p in properties)
-			{
-				switch (p.Name)
-				{
-					case "_name":
-						r.Name = p.Value.Value<string>();
+						query.Name = p.Value.Value<string>();
 						break;
 					case "boost":
-						r.Boost = p.Value.Value<double>();
+						query.Boost = p.Value.Value<double>();
 						break;
 					case "id":
-						r.Id = p.Value.Value<string>();
+						query.Id = p.Value.Value<string>();
 						break;
 					case "file":
-						r.File = p.Value.Value<string>();
+						query.File = p.Value.Value<string>();
 						break;
 					case "inline":
-						r.Inline = p.Value.Value<string>();
+						query.Inline = p.Value.Value<string>();
 						break;
 					case "lang":
-						r.Lang = p.Value.Value<string>();
+						query.Lang = p.Value.Value<string>();
 						break;
 					case "params":
-						r.Params = p.Value.ToObject<Dictionary<string, object>>();
+						query.Params = p.Value.ToObject<Dictionary<string, object>>();
 						break;
 				}
 			}
-			return r;
+			return query;
 		}
 	}
 }