added another hook for properties of type object that need optionally flow through the source converter. (#2997)

Author: Mpdreamz

src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs

@@ -117,8 +117,7 @@ private static ObjectActivator<T> GetActivator<T>(ConstructorInfo ctor)
 		internal static IList<JsonProperty> GetCachedObjectProperties(this Type t,
 			MemberSerialization memberSerialization = MemberSerialization.OptIn)
 		{
-			IList<JsonProperty> propertyDictionary;
-			if (CachedTypeProperties.TryGetValue(t, out propertyDictionary))
+			if (CachedTypeProperties.TryGetValue(t, out var propertyDictionary))
 				return propertyDictionary;
 			propertyDictionary = JsonContract.PropertiesOfAll(t, memberSerialization);
 			CachedTypeProperties.TryAdd(t, propertyDictionary);

src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReadAsTypeJsonConverter.cs

@@ -11,9 +11,7 @@ internal class ReadAsTypeJsonConverter<T> : JsonConverter
 
 		public override bool CanConvert(Type objectType) => true;
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-		}
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { }
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			FromJson.ReadAs<T>(reader, serializer);

src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReserializeJsonConverter.cs

@@ -23,16 +23,18 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			return reader.ReadToEnd(depth, deserialized);
 		}
 
-		protected TReadAs ReadAs(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
-			this.Reader.ReadJson(reader, objectType, existingValue, serializer) as TReadAs;
+		protected TReadAs ReadAs(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+
+			return this.Reader.ReadJson(reader, objectType, existingValue, serializer) as TReadAs;
+		}
 
 		protected virtual object DeserializeJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) =>
 			this.ReadAs(reader, objectType, existingValue, serializer);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
-			var v = value as TInterface;
-			if (v == null) return;
+			if (!(value is TInterface v)) return;
 			this.SerializeJson(writer, value, v, serializer);
 		}
 
@@ -53,7 +55,10 @@ protected void Reserialize(JsonWriter writer, object value, JsonSerializer seria
 				var vv = p.ValueProvider.GetValue(value);
 				if (vv == null) continue;
 				writer.WritePropertyName(p.PropertyName);
-				serializer.Serialize(writer, vv);
+				if (p.Converter?.GetType() == typeof(SourceValueWriteConverter))
+					SourceValueWriteConverter.Write(writer, vv, serializer);
+				else
+					serializer.Serialize(writer, vv);
 			}
 			writer.WriteEndObject();
 		}

src/Nest/CommonAbstractions/SerializationBehavior/SourceConverter.cs

@@ -36,4 +36,28 @@ internal class CollapsedSourceConverter : SourceConverter
 	{
 		public override SerializationFormatting? ForceFormatting { get; } = None;
 	}
+	internal class SourceValueWriteConverter : JsonConverter
+	{
+		public override bool CanRead => false;
+		public override bool CanWrite => true;
+		public override bool CanConvert(Type objectType) => true;
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			Write(writer, value, serializer);
+		}
+
+		public static void Write(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			var sourceSerializer = serializer.GetConnectionSettings().SourceSerializer;
+			var f = writer.Formatting == Formatting.Indented ? Indented : None;
+			var v = sourceSerializer.SerializeToString(value, f);
+			writer.WriteRawValue(v);
+		}
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+			throw new NotImplementedException("CanRead is false so this is not expected to be called");
+		}
+	}
 }

src/Nest/Ingest/Processors/SetProcessor.cs

@@ -15,6 +15,7 @@ public interface ISetProcessor : IProcessor
 		Field Field { get; set; }
 
 		[JsonProperty("value")]
+		[JsonConverter(typeof(SourceValueWriteConverter))]
 		object Value { get; set; }
 	}
 

src/Nest/QueryDsl/TermLevel/Term/TermQuery.cs

@@ -7,12 +7,14 @@ namespace Nest
 	public interface ITermQuery : IFieldNameQuery
 	{
 		[JsonProperty("value")]
+		[JsonConverter(typeof(SourceValueWriteConverter))]
 		object Value { get; set; }
 	}
 
 	public class TermQuery : FieldNameQueryBase, ITermQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
+		[JsonConverter(typeof(SourceValueWriteConverter))]
 		public object Value { get; set; }
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Term = this;

src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs

@@ -36,4 +36,4 @@ public class WildcardQueryDescriptor<T> : TermQueryDescriptorBase<WildcardQueryD
 
 		public WildcardQueryDescriptor<T> Rewrite(MultiTermQueryRewrite rewrite) => Assign(a => a.Rewrite = rewrite);
 		}
-		}
+	}

src/Tests/ClientConcepts/HighLevel/Serialization/SendsUsingSourceSerializer.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using Elasticsearch.Net;
 using Nest;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Tests.Framework;
 using Tests.Framework.ManagedElasticsearch.SourceSerializers;
+using Tests.Framework.MockData;
 using static Tests.Framework.RoundTripper;
 
 namespace Tests.ClientConcepts.HighLevel.Serialization
@@ -42,6 +45,11 @@ protected override JsonSerializerSettings CreateJsonSerializerSettings()
 				};
 			}
 
+			protected override IEnumerable<JsonConverter> CreateJsonConverters()
+			{
+				foreach (var c in base.CreateJsonConverters()) yield return c;
+				yield return new StringEnumConverter();
+			}
 		}
 
 		private static void CanAlterSource<T>(Func<IElasticClient, T> call, object usingDefaults, object withSourceSerializer)
@@ -54,6 +62,24 @@ private static void CanAlterSource<T>(Func<IElasticClient, T> call, object using
 				.FromRequest(call);
 		}
 
+		private static void Serializes<T>(T o, object usingDefaults, object withSourceSerializer)
+		{
+			SerializesDefault(o, usingDefaults);
+			SerializesSourceSerializer(o, withSourceSerializer);
+		}
+
+		private static void SerializesSourceSerializer<T>(T o, object withSourceSerializer)
+		{
+			WithSourceSerializer((s, c) => new CustomSettingsSerializerBase(s, c))
+				.Expect(withSourceSerializer)
+				.WhenSerializing(o);
+		}
+
+		private static void SerializesDefault<T>(T o, object usingDefaults)
+		{
+			Expect(usingDefaults).WhenSerializing(o);
+		}
+
 		[U] public void IndexRequest()
 		{
 			CanAlterSource(
@@ -155,5 +181,35 @@ [U] public void MultiTermVectorsRequest()
 				withSourceSerializer: ExpectMultiTermVectors(IncludesNullAndType)
 			);
 		}
+
+		public enum SomeEnum
+		{
+			Value,
+			[EnumMember(Value = "different")]
+			AnotherValue
+		}
+
+		[U] public void TermQuery() =>
+			SerializesEnumValue(new TermQuery { Field = Infer.Field<Project>(p=>p.Name), Value = SomeEnum.AnotherValue});
+
+		[U] public void WildcardQuery() =>
+			SerializesEnumValue(new WildcardQuery {Field = Infer.Field<Project>(p => p.Name), Value = SomeEnum.AnotherValue});
+
+		[U] public void PrefixQuery() =>
+			SerializesEnumValue(new PrefixQuery { Field = Infer.Field<Project>(p=>p.Name), Value = SomeEnum.AnotherValue});
+
+		[U] public void SpanTermQueryInitializer() =>
+			SerializesEnumValue(new SpanTermQuery { Field = Infer.Field<Project>(p=>p.Name), Value = SomeEnum.AnotherValue});
+
+		[U] public void SpanTermQueryFluent() =>
+			SerializesEnumValue<ISpanTermQuery>(new SpanTermQueryDescriptor<Project>().Field(p=>p.Name).Value(SomeEnum.AnotherValue));
+
+		private static void SerializesEnumValue<T>(T query)
+		{
+			Serializes(query,
+				usingDefaults: new {name = new {value = 1}},
+				withSourceSerializer: new {name = new {value = "different"}}
+			);
+		}
 	}
 }

src/Tests/Framework/Configuration/YamlConfiguration.cs

@@ -28,9 +28,8 @@ public YamlConfiguration(string configurationFile)
 
 			this.Mode = GetTestMode(_config["mode"]);
 			this.ElasticsearchVersion = ElasticsearchVersion.GetOrAdd(_config["elasticsearch_version"]);
-			this.ForceReseed = bool.Parse(_config["force_reseed"]);
-			this.TestAgainstAlreadyRunningElasticsearch =
-				_config.TryGetValue("test_against_already_running_elasticsearch", out var tar) && bool.Parse(tar);
+			this.ForceReseed = BoolConfig("force_reseed", false);
+			this.TestAgainstAlreadyRunningElasticsearch = BoolConfig("test_against_already_running_elasticsearch", false);
 			this.ClusterFilter = _config.ContainsKey("cluster_filter") ? _config["cluster_filter"] : null;
 			this.TestFilter = _config.ContainsKey("test_filter") ? _config["test_filter"] : null;
 
@@ -39,12 +38,15 @@ public YamlConfiguration(string configurationFile)
 			var randomizer = new Randomizer();
 			this.Random = new RandomConfiguration
 			{
-				SourceSerializer = BoolConfig("source_serializer", randomizer),
-				TypedKeys = BoolConfig("typed_keys", randomizer)
+				SourceSerializer = RandomBool("source_serializer", randomizer),
+				TypedKeys = RandomBool("typed_keys", randomizer)
 			};
 		}
 
-		private bool BoolConfig(string key, Randomizer randomizer) =>
+		private bool BoolConfig(string key, bool @default) =>
+			_config.TryGetValue(key, out var v) ? bool.Parse(v) : @default;
+
+		private bool RandomBool(string key, Randomizer randomizer) =>
 			_config.TryGetValue($"random_{key}", out var v) ? bool.Parse(v) : randomizer.Bool();
 
 		private static string ConfigName(string configLine) => Parse(configLine, 0);

src/Tests/Framework/ManagedElasticsearch/SourceSerializers/TestSourceSerializerBase.cs

@@ -3,6 +3,7 @@
 using Nest;
 using Nest.JsonNetSerializer;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Tests.Framework.MockData;
 
@@ -29,5 +30,6 @@ protected override void ModifyContractResolver(ConnectionSettingsAwareContractRe
 		{
 			resolver.NamingStrategy = new CamelCaseNamingStrategy();
 		}
+
 	}
 }