Fix the deserialization of SortOptions (opensearch-project#981) (open…

…search-project#982)

* Fix the deserialization of SortOptions



* add changelog



* spotless



---------


(cherry picked from commit e672fdc)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -14,6 +14,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
 
 ### Fixed
+- Fix the deserialization of SortOptions ([#981](https://github.com/opensearch-project/opensearch-java/pull/981))
 
 ### Security
 

java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptions.java

@@ -281,10 +281,9 @@ public SortOptions build() {
     }
 
     public static final JsonpDeserializer<SortOptions> _DESERIALIZER = JsonpDeserializer.lazy(
-        () -> JsonpDeserializer.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper) -> {
+        () -> JsonpDeserializer.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper, event) -> {
             SortOptions.Builder b = new SortOptions.Builder();
 
-            JsonParser.Event event = parser.next();
             if (event == JsonParser.Event.VALUE_STRING) {
                 switch (parser.getString()) {
                     case "_score":

java-client/src/test/java/org/opensearch/client/opensearch/_types/SortOptionsTest.java

@@ -0,0 +1,28 @@
+package org.opensearch.client.opensearch._types;
+
+import static org.junit.Assert.assertEquals;
+
+import jakarta.json.stream.JsonParser;
+import java.io.StringReader;
+import java.util.List;
+import org.junit.Test;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.jackson.JacksonJsonpMapper;
+
+public class SortOptionsTest {
+
+    @Test
+    public void testSortOptions() {
+        String jsonString = "[{\"entityId\":{\"order\":\"asc\"}}]";
+        StringReader reader = new StringReader(jsonString);
+        JacksonJsonpMapper mapper = new JacksonJsonpMapper();
+        JsonParser parser = mapper.jsonProvider().createParser(reader);
+
+        List<SortOptions> sortOptions = JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER).deserialize(parser, mapper);
+        assertEquals(1, sortOptions.size());
+        assertEquals(SortOptions.Kind.Field, sortOptions.get(0)._kind());
+        FieldSort fieldSort = (FieldSort) sortOptions.get(0)._get();
+        assertEquals("entityId", fieldSort.field());
+        assertEquals(SortOrder.Asc, fieldSort.order());
+    }
+}