Add support for GeoDistanceSort's nested and validation_method fields (#1470)

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit dc67343)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

CHANGELOG.md

@@ -8,6 +8,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added support for the Search Pipeline APIs ([#1442](https://github.com/opensearch-project/opensearch-java/pull/1442))
 - Added support for `simple_pattern` and `simple_pattern_split` tokenizers ([#1448](https://github.com/opensearch-project/opensearch-java/pull/1448), [#1451](https://github.com/opensearch-project/opensearch-java/pull/1451))
 - Added support for the Search response `phase_took` field ([#1449](https://github.com/opensearch-project/opensearch-java/pull/1449)) 
+- Added support for `GeoDistanceSort`'s `nested` and `validation_method` fields ([#1470](https://github.com/opensearch-project/opensearch-java/pull/1470))
 
 ### Dependencies
 - Bump `org.junit:junit-bom` from 5.11.4 to 5.12.0 ([#1456](https://github.com/opensearch-project/opensearch-java/pull/1456))

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

@@ -35,13 +35,15 @@
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.GeoValidationMethod;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
@@ -69,6 +71,12 @@ public class GeoDistanceSort implements SortOptionsVariant, JsonpSerializable {
     @Nullable
     private final DistanceUnit unit;
 
+    @Nullable
+    private final GeoValidationMethod validationMethod;
+
+    @Nullable
+    private final NestedSortValue nested;
+
     // ---------------------------------------------------------------------------------------------
 
     private GeoDistanceSort(Builder builder) {
@@ -81,7 +89,8 @@ private GeoDistanceSort(Builder builder) {
         this.ignoreUnmapped = builder.ignoreUnmapped;
         this.order = builder.order;
         this.unit = builder.unit;
-
+        this.validationMethod = builder.validationMethod;
+        this.nested = builder.nested;
     }
 
     public static GeoDistanceSort of(Function<Builder, ObjectBuilder<GeoDistanceSort>> fn) {
@@ -150,6 +159,22 @@ public final DistanceUnit unit() {
         return this.unit;
     }
 
+    /**
+     * API name: {@code validation_method}
+     */
+    @Nullable
+    public final GeoValidationMethod validationMethod() {
+        return this.validationMethod;
+    }
+
+    /**
+     * API name: {@code nested}
+     */
+    @Nullable
+    public final NestedSortValue nested() {
+        return this.nested;
+    }
+
     /**
      * Serialize this object to JSON.
      */
@@ -189,7 +214,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeKey("unit");
             this.unit.serialize(generator, mapper);
         }
-
+        if (this.validationMethod != null) {
+            generator.writeKey("validation_method");
+            this.validationMethod.serialize(generator, mapper);
+        }
+        if (this.nested != null) {
+            generator.writeKey("nested");
+            this.nested.serialize(generator, mapper);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -249,6 +281,12 @@ public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLoc
         @Nullable
         private DistanceUnit unit;
 
+        @Nullable
+        private GeoValidationMethod validationMethod;
+
+        @Nullable
+        private NestedSortValue nested;
+
         /**
          * API name: {@code mode}
          */
@@ -289,6 +327,29 @@ public final Builder unit(@Nullable DistanceUnit value) {
             return this;
         }
 
+        /**
+         * API name: {@code validation_method}
+         */
+        public final Builder validationMethod(@Nullable GeoValidationMethod value) {
+            this.validationMethod = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(@Nullable NestedSortValue value) {
+            this.nested = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(@Nonnull Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
+            return nested(fn.apply(new NestedSortValue.Builder()).build());
+        }
+
         /**
          * Builds a {@link GeoDistanceSort}.
          *
@@ -319,6 +380,8 @@ protected static void setupGeoDistanceSortDeserializer(ObjectDeserializer<GeoDis
         op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
         op.add(Builder::order, SortOrder._DESERIALIZER, "order");
         op.add(Builder::unit, DistanceUnit._DESERIALIZER, "unit");
+        op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
+        op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
 
         op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
             builder.field(name);