Fix (de-)serialization of Fields in custom converters (#8360)

elastic · Nov 20, 2024 · acd7765 · acd7765
1 parent 7c3a16c
commit acd7765
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 18 deletions.
diff --git a/...Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/...Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
@@ -606,7 +606,7 @@ public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value
 		if (value.StoredFields is not null)
 		{
 			writer.WritePropertyName("stored_fields");
-			JsonSerializer.Serialize(writer, value.StoredFields, options);
+			new FieldsConverter().Write(writer, value.StoredFields, options);
 		}
 
 		if (value.Suggest is not null)

diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs
@@ -660,7 +660,7 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria
 		if (value.StoredFields is not null)
 		{
 			writer.WritePropertyName("stored_fields");
-			JsonSerializer.Serialize(writer, value.StoredFields, options);
+			new FieldsConverter().Write(writer, value.StoredFields, options);
 		}
 
 		if (value.Suggest is not null)

diff --git a/...astic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/...astic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
@@ -185,7 +185,8 @@ public override MultisearchBody Read(ref Utf8JsonReader reader, Type typeToConve
 
 				if (property == "stored_fields")
 				{
-					variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);
+					reader.Read();
+					variant.StoredFields = new FieldsConverter().Read(ref reader, typeToConvert, options);
 					continue;
 				}
 
@@ -380,7 +381,7 @@ public override void Write(Utf8JsonWriter writer, MultisearchBody value, JsonSer
 		if (value.StoredFields is not null)
 		{
 			writer.WritePropertyName("stored_fields");
-			JsonSerializer.Serialize(writer, value.StoredFields, options);
+			new FieldsConverter().Write(writer, value.StoredFields, options);
 		}
 
 		if (value.Suggest is not null)

diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SourceFilter.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/SourceFilter.g.cs
@@ -41,13 +41,15 @@ public override SourceFilter Read(ref Utf8JsonReader reader, Type typeToConvert,
 				var property = reader.GetString();
 				if (property == "excludes" || property == "exclude")
 				{
-					variant.Excludes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);
+					reader.Read();
+					variant.Excludes = new FieldsConverter().Read(ref reader, typeToConvert, options);
 					continue;
 				}
 
 				if (property == "includes" || property == "include")
 				{
-					variant.Includes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);
+					reader.Read();
+					variant.Includes = new FieldsConverter().Read(ref reader, typeToConvert, options);
 					continue;
 				}
 			}
@@ -62,13 +64,13 @@ public override void Write(Utf8JsonWriter writer, SourceFilter value, JsonSerial
 		if (value.Excludes is not null)
 		{
 			writer.WritePropertyName("excludes");
-			JsonSerializer.Serialize(writer, value.Excludes, options);
+			new FieldsConverter().Write(writer, value.Excludes, options);
 		}
 
 		if (value.Includes is not null)
 		{
 			writer.WritePropertyName("includes");
-			JsonSerializer.Serialize(writer, value.Includes, options);
+			new FieldsConverter().Write(writer, value.Includes, options);
 		}
 
 		writer.WriteEndObject();

diff --git a/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Field/Field.cs b/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Field/Field.cs
@@ -20,7 +20,7 @@ namespace Elastic.Clients.Elasticsearch;
 #endif
 
 [JsonConverter(typeof(FieldConverter))]
-[DebuggerDisplay($"{nameof(DebuggerDisplay)},nq")]
+[DebuggerDisplay($"{{{nameof(DebuggerDisplay)},nq}}")]
 public sealed class Field :
 	IEquatable<Field>,
 	IUrlParameter

diff --git a/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/Fields.cs b/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/Fields.cs
@@ -18,7 +18,7 @@ namespace Elastic.Clients.Elasticsearch.Serverless;
 namespace Elastic.Clients.Elasticsearch;
 #endif
 
-[DebuggerDisplay($"{nameof(DebuggerDisplay)},nq")]
+[DebuggerDisplay($"{{{nameof(DebuggerDisplay)},nq}}")]
 public sealed class Fields :
 	IEquatable<Fields>,
 	IEnumerable<Field>,

diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
@@ -606,7 +606,7 @@ public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value
 		if (value.StoredFields is not null)
 		{
 			writer.WritePropertyName("stored_fields");
-			JsonSerializer.Serialize(writer, value.StoredFields, options);
+			new FieldsConverter().Write(writer, value.StoredFields, options);
 		}
 
 		if (value.Suggest is not null)

diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
@@ -669,7 +669,7 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria
 		if (value.StoredFields is not null)
 		{
 			writer.WritePropertyName("stored_fields");
-			JsonSerializer.Serialize(writer, value.StoredFields, options);
+			new FieldsConverter().Write(writer, value.StoredFields, options);
 		}
 
 		if (value.Suggest is not null)

diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
@@ -185,7 +185,8 @@ public override MultisearchBody Read(ref Utf8JsonReader reader, Type typeToConve
 
 				if (property == "stored_fields")
 				{
-					variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fields?>(ref reader, options);
+					reader.Read();
+					variant.StoredFields = new FieldsConverter().Read(ref reader, typeToConvert, options);
 					continue;
 				}
 
@@ -380,7 +381,7 @@ public override void Write(Utf8JsonWriter writer, MultisearchBody value, JsonSer
 		if (value.StoredFields is not null)
 		{
 			writer.WritePropertyName("stored_fields");
-			JsonSerializer.Serialize(writer, value.StoredFields, options);
+			new FieldsConverter().Write(writer, value.StoredFields, options);
 		}
 
 		if (value.Suggest is not null)

diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SourceFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SourceFilter.g.cs
@@ -41,13 +41,15 @@ public override SourceFilter Read(ref Utf8JsonReader reader, Type typeToConvert,
 				var property = reader.GetString();
 				if (property == "excludes" || property == "exclude")
 				{
-					variant.Excludes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fields?>(ref reader, options);
+					reader.Read();
+					variant.Excludes = new FieldsConverter().Read(ref reader, typeToConvert, options);
 					continue;
 				}
 
 				if (property == "includes" || property == "include")
 				{
-					variant.Includes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Fields?>(ref reader, options);
+					reader.Read();
+					variant.Includes = new FieldsConverter().Read(ref reader, typeToConvert, options);
 					continue;
 				}
 			}
@@ -62,13 +64,13 @@ public override void Write(Utf8JsonWriter writer, SourceFilter value, JsonSerial
 		if (value.Excludes is not null)
 		{
 			writer.WritePropertyName("excludes");
-			JsonSerializer.Serialize(writer, value.Excludes, options);
+			new FieldsConverter().Write(writer, value.Excludes, options);
 		}
 
 		if (value.Includes is not null)
 		{
 			writer.WritePropertyName("includes");
-			JsonSerializer.Serialize(writer, value.Includes, options);
+			new FieldsConverter().Write(writer, value.Includes, options);
 		}
 
 		writer.WriteEndObject();