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

flobernd · web-flow · commit 1c6f2b2caa0e · 2024-09-27T11:45:02.000+02:00
diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/src/Elastic.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/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/src/Elastic.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();

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value`
`606`	`606`	`if (value.StoredFields is not null)`
`607`	`607`	`{`
`608`	`608`	`writer.WritePropertyName("stored_fields");`
`609`		`- JsonSerializer.Serialize(writer, value.StoredFields, options);`
	`609`	`+ new FieldsConverter().Write(writer, value.StoredFields, options);`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`if (value.Suggest is not null)`
Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria`
`660`	`660`	`if (value.StoredFields is not null)`
`661`	`661`	`{`
`662`	`662`	`writer.WritePropertyName("stored_fields");`
`663`		`- JsonSerializer.Serialize(writer, value.StoredFields, options);`
	`663`	`+ new FieldsConverter().Write(writer, value.StoredFields, options);`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`if (value.Suggest is not null)`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ public override MultisearchBody Read(ref Utf8JsonReader reader, Type typeToConve`
`185`	`185`
`186`	`186`	`if (property == "stored_fields")`
`187`	`187`	`{`
`188`		`- variant.StoredFields = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);`
	`188`	`+ reader.Read();`
	`189`	`+ variant.StoredFields = new FieldsConverter().Read(ref reader, typeToConvert, options);`
`189`	`190`	`continue;`
`190`	`191`	`}`
`191`	`192`
`@@ -380,7 +381,7 @@ public override void Write(Utf8JsonWriter writer, MultisearchBody value, JsonSer`
`380`	`381`	`if (value.StoredFields is not null)`
`381`	`382`	`{`
`382`	`383`	`writer.WritePropertyName("stored_fields");`
`383`		`- JsonSerializer.Serialize(writer, value.StoredFields, options);`
	`384`	`+ new FieldsConverter().Write(writer, value.StoredFields, options);`
`384`	`385`	`}`
`385`	`386`
`386`	`387`	`if (value.Suggest is not null)`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,15 @@ public override SourceFilter Read(ref Utf8JsonReader reader, Type typeToConvert,`
`41`	`41`	`var property = reader.GetString();`
`42`	`42`	`if (property == "excludes" \|\| property == "exclude")`
`43`	`43`	`{`
`44`		`- variant.Excludes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);`
	`44`	`+ reader.Read();`
	`45`	`+ variant.Excludes = new FieldsConverter().Read(ref reader, typeToConvert, options);`
`45`	`46`	`continue;`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`if (property == "includes" \|\| property == "include")`
`49`	`50`	`{`
`50`		`- variant.Includes = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Serverless.Fields?>(ref reader, options);`
	`51`	`+ reader.Read();`
	`52`	`+ variant.Includes = new FieldsConverter().Read(ref reader, typeToConvert, options);`
`51`	`53`	`continue;`
`52`	`54`	`}`
`53`	`55`	`}`
`@@ -62,13 +64,13 @@ public override void Write(Utf8JsonWriter writer, SourceFilter value, JsonSerial`
`62`	`64`	`if (value.Excludes is not null)`
`63`	`65`	`{`
`64`	`66`	`writer.WritePropertyName("excludes");`
`65`		`- JsonSerializer.Serialize(writer, value.Excludes, options);`
	`67`	`+ new FieldsConverter().Write(writer, value.Excludes, options);`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`if (value.Includes is not null)`
`69`	`71`	`{`
`70`	`72`	`writer.WritePropertyName("includes");`
`71`		`- JsonSerializer.Serialize(writer, value.Includes, options);`
	`73`	`+ new FieldsConverter().Write(writer, value.Includes, options);`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`writer.WriteEndObject();`
Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria`
`669`	`669`	`if (value.StoredFields is not null)`
`670`	`670`	`{`
`671`	`671`	`writer.WritePropertyName("stored_fields");`
`672`		`- JsonSerializer.Serialize(writer, value.StoredFields, options);`
	`672`	`+ new FieldsConverter().Write(writer, value.StoredFields, options);`
`673`	`673`	`}`
`674`	`674`
`675`	`675`	`if (value.Suggest is not null)`