make sure querycontainerjsonconverter is a contractjson converter

Author: Mpdreamz

src/Nest/CommonAbstractions/Extensions/JsonExtensions.cs

@@ -33,33 +33,33 @@ public static void WriteProperty(this JsonWriter writer, JsonSerializer serializ
 			serializer.Serialize(writer, value);
 		}
 
-		public static bool TryParseServerError(this JToken jToken, JsonSerializer serializer, out ServerError error)
-		{
-			error = null;
-			if (jToken == null) return false;
-
-			var errorProperty = jToken.Children<JProperty>().FirstOrDefault(c => c.Name == "error");
-			var rootCauseProperty = jToken.Children<JProperty>().FirstOrDefault(c => c.Name == "root_cause");
-			if (errorProperty == null && rootCauseProperty == null) return false;
-
-			var j = jToken;
-			if (rootCauseProperty != null)
+		public static bool TryParseServerError(this JToken jToken, JsonSerializer serializer, out ServerError error)
+		{
+			error = null;
+			if (jToken == null) return false;
+
+			var errorProperty = jToken.Children<JProperty>().FirstOrDefault(c => c.Name == "error");
+			var rootCauseProperty = jToken.Children<JProperty>().FirstOrDefault(c => c.Name == "root_cause");
+			if (errorProperty == null && rootCauseProperty == null) return false;
+
+			var j = jToken;
+			if (rootCauseProperty != null)
 			{
 				var o = new JObject
 				{
 					{"error", jToken}
 				};
-				j = o;
-			}
-
-			using (var sw = new StringWriter())
-			using (var localWriter = new JsonTextWriter(sw))
-			{
-				serializer.Serialize(localWriter, j);
-				using (var ms = new MemoryStream(sw.ToString().Utf8Bytes()))
-					error = ServerError.Create(ms);
-			}
-			return true;
+				j = o;
+			}
+
+			using (var sw = new StringWriter())
+			using (var localWriter = new JsonTextWriter(sw))
+			{
+				serializer.Serialize(localWriter, j);
+				using (var ms = new MemoryStream(sw.ToString().Utf8Bytes()))
+					error = ServerError.Create(ms);
+			}
+			return true;
 		}
 	}
 }

src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs

@@ -188,7 +188,6 @@ private static void ApplyBuildInSerializers(MemberInfo member, JsonProperty prop
 			if ((property.PropertyType == typeof(DateTime) || property.PropertyType == typeof(DateTime?))
 			    && (attributes.OfType<MachineLearningDateTimeAttribute>().Any()))
 				property.Converter = MachineLearningDateTimeConverter;
-
 		}
 
 		private static void ApplyBuildInSerializersForType(Type type, JsonContract contract)

src/Nest/Mapping/Types/Specialized/Attachment/Attachment.cs

@@ -4,7 +4,7 @@
 
 namespace Nest
 {
-	[JsonConverter(typeof(AttachmentConverter))]
+	[ContractJsonConverter(typeof(AttachmentConverter))]
 	public class Attachment
 	{
 		/// <summary>

src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs

@@ -4,7 +4,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	[JsonConverter(typeof(QueryContainerJsonConverter))]
+	[ContractJsonConverter(typeof(QueryContainerJsonConverter))]
 	public interface IQueryContainer
 	{
 		[JsonIgnore]

src/Nest/QueryDsl/Abstractions/Container/QueryContainerJsonConverter.cs

@@ -6,7 +6,7 @@
 
 namespace Nest
 {
-	internal class QueryContainerJsonConverter: ReserializeJsonConverter<QueryContainer, IQueryContainer>
+	internal class QueryContainerJsonConverter : ReserializeJsonConverter<QueryContainer, IQueryContainer>
 	{
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
@@ -28,7 +28,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		protected override void SerializeJson(JsonWriter writer, object value, IQueryContainer castValue, JsonSerializer serializer)
 		{
 			var rawQuery = castValue.RawQuery;
-			if (!rawQuery?.Raw.IsNullOrEmpty() ?? false && rawQuery.IsWritable)
+			if ((!rawQuery?.Raw.IsNullOrEmpty() ?? false) && rawQuery.IsWritable)
 			{
 				writer.WriteRawValue(rawQuery.Raw);
 				return;

src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs

@@ -9,16 +9,16 @@ namespace Nest.JsonNetSerializer
 {
 	public class ConnectionSettingsAwareContractResolver : DefaultContractResolver
 	{
-		private readonly IConnectionSettingsValues _connectionSettings;
+		public IConnectionSettingsValues ConnectionSettings { get; }
 
 		public ConnectionSettingsAwareContractResolver(IConnectionSettingsValues connectionSettings)
 		{
-			_connectionSettings = connectionSettings ?? throw new ArgumentNullException(nameof(connectionSettings));
+			ConnectionSettings = connectionSettings ?? throw new ArgumentNullException(nameof(connectionSettings));
 		}
 
 		protected override string ResolvePropertyName(string fieldName) =>
-			this._connectionSettings.DefaultFieldNameInferrer != null
-				? this._connectionSettings.DefaultFieldNameInferrer(fieldName)
+			this.ConnectionSettings.DefaultFieldNameInferrer != null
+				? this.ConnectionSettings.DefaultFieldNameInferrer(fieldName)
 				: base.ResolvePropertyName(fieldName);
 
 		protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
@@ -32,10 +32,10 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
 		/// <summary> Renames/Ignores a property based on the connection settings mapping or custom attributes for the property </summary>
 		private void ApplyPropertyOverrides(MemberInfo member, JsonProperty property)
 		{
-			if (!this._connectionSettings.PropertyMappings.TryGetValue(member, out var propertyMapping))
+			if (!this.ConnectionSettings.PropertyMappings.TryGetValue(member, out var propertyMapping))
 				propertyMapping = ElasticsearchPropertyAttributeBase.From(member);
 
-			var serializerMapping = this._connectionSettings.PropertyMappingProvider?.CreatePropertyMapping(member);
+			var serializerMapping = this.ConnectionSettings.PropertyMappingProvider?.CreatePropertyMapping(member);
 
 			var nameOverride = propertyMapping?.Name ?? serializerMapping?.Name;
 			if (!string.IsNullOrWhiteSpace(nameOverride)) property.PropertyName = nameOverride;

src/Serializers/Nest.JsonNetSerializer/Converters/RevertBackToBuiltinSerializer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using Elasticsearch.Net;
 using Newtonsoft.Json;
@@ -41,5 +42,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		};
 
 		public override bool CanConvert(Type objectType) => NestTypesThatCanAppearInSource.Contains(objectType);
+
+
+
 	}
 }

src/Tests/QueryDsl/Specialized/Percolate/PercolateQueryUsageTests.cs

@@ -75,11 +75,11 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				this.Client.Index(new ProjectPercolation
 				{
 					Id = PercolatorId,
-					Query = new QueryContainer(new MatchQuery
+					Query = new MatchQuery
 					{
 						Field = Infer.Field<Project>(f => f.LeadDeveloper.FirstName),
 						Query = "Martijn"
-					})
+					}
 				}, d => d.Index(percolationIndex));
 				this.Client.IndexDocument(Project.Instance);
 				this.Client.Refresh(Nest.Indices.Index(percolationIndex).And<Project>());

src/Tests/tests.default.yaml

@@ -17,5 +17,5 @@ force_reseed: true
 # this is opt in during development in CI we never want to see our tests running against an already running node
 test_against_already_running_elasticsearch: true
 
-force_custom_source_serializer: false
+force_custom_source_serializer: true
 seed: 57854