Fix field sort serialization (#7094) (#7095)

* Fix code-generated field sort serialization logic

* Update ES version for tests

Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>

Author: github-actions[bot]

.github/workflows/integration-jobs.yml

@@ -26,7 +26,7 @@ jobs:
           '8.2.3',
           '8.3.3',
           '8.4.3',
-          "8.5.2",
+          "8.5.3",
           '8.6.0-SNAPSHOT',
           'latest-8'
         ]

src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs

@@ -162,7 +162,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 		}
 
 		writer.WriteStartObject();
-		writer.WritePropertyName(ContainedVariantName);
+		writer.WritePropertyName(fieldName);
 		if (Variant is not null)
 		{
 			JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options);
@@ -279,7 +279,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 		}
 
 		writer.WriteStartObject();
-		writer.WritePropertyName(ContainedVariantName);
+		writer.WritePropertyName(fieldName);
 		if (Variant is not null)
 		{
 			JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options);

tests/Tests.Configuration/tests.default.yaml

@@ -8,7 +8,7 @@
 mode: u
 # the elasticsearch version that should be started
 # Can be a snapshot version of sonatype or "latest" to get the latest snapshot of sonatype
-elasticsearch_version: 8.5.2
+elasticsearch_version: 8.5.3
 # cluster filter allows you to only run the integration tests of a particular cluster (cluster suffix not needed)
 # cluster_filter:
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running

tests/Tests/Search/Search/BasicSortUsageTests.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests.TestState;
@@ -29,6 +30,34 @@ public BasicSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(
 		};
 }
 
+public class FieldSortWithOrderUsageTests : SearchUsageTestBase
+{
+	public FieldSortWithOrderUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+	protected override object ExpectJson =>
+		new
+		{
+			sort = new Dictionary<string, object>
+			{
+				{
+					"startedOn", new
+					{
+						order = "desc"
+					}
+				}
+			}
+		};
+
+	protected override Action<SearchRequestDescriptor<Project>> Fluent => s => s
+		.Sort(s => s.Field(f => f.StartedOn, fldsrt => fldsrt.Order(SortOrder.Desc)));
+
+	protected override SearchRequest<Project> Initializer =>
+		new()
+		{
+			Sort = new[] { SortOptions.Field(Infer.Field<Project>(f => f.StartedOn), new FieldSort { Order = SortOrder.Desc }) }
+		};
+}
+
 public class BasicScoreSortUsageTests : SearchUsageTestBase
 {
 	public BasicScoreSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }