Add support for GeoDistanceQuery's ignore_unmapped property

Signed-off-by: Thomas Farr <[email protected]>

Author: Xtansia

CHANGELOG.md

@@ -3,6 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased 2.x]
 ### Added
+- Added support for `GeoDistanceQuery`'s `ignore_unmapped` property ([#1430](https://github.com/opensearch-project/opensearch-java/pull/1430))
 
 ### Dependencies
 - Bump `commons-logging:commons-logging` from 1.3.4 to 1.3.5 ([#1418](https://github.com/opensearch-project/opensearch-java/pull/1418))

java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoDistanceQuery.java

@@ -62,6 +62,9 @@ public class GeoDistanceQuery extends QueryBase implements QueryVariant {
     @Nullable
     private final GeoValidationMethod validationMethod;
 
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
     // ---------------------------------------------------------------------------------------------
 
     private GeoDistanceQuery(Builder builder) {
@@ -72,7 +75,7 @@ private GeoDistanceQuery(Builder builder) {
         this.distance = builder.distance;
         this.distanceType = builder.distanceType;
         this.validationMethod = builder.validationMethod;
-
+        this.ignoreUnmapped = builder.ignoreUnmapped;
     }
 
     public static GeoDistanceQuery of(Function<Builder, ObjectBuilder<GeoDistanceQuery>> fn) {
@@ -125,6 +128,14 @@ public final GeoValidationMethod validationMethod() {
         return this.validationMethod;
     }
 
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeKey(this.field);
         this.location.serialize(generator, mapper);
@@ -144,10 +155,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             this.validationMethod.serialize(generator, mapper);
         }
 
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+        }
     }
 
     public Builder toBuilder() {
-        return toBuilder(new Builder()).field(field).location(location);
+        return toBuilder(new Builder()).field(field)
+            .location(location)
+            .distance(distance)
+            .distanceType(distanceType)
+            .validationMethod(validationMethod)
+            .ignoreUnmapped(ignoreUnmapped);
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -193,6 +213,9 @@ public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLoc
         @Nullable
         private GeoValidationMethod validationMethod;
 
+        @Nullable
+        private Boolean ignoreUnmapped;
+
         /**
          * API name: {@code distance}
          */
@@ -217,6 +240,14 @@ public final Builder validationMethod(@Nullable GeoValidationMethod value) {
             return this;
         }
 
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
         @Override
         protected Builder self() {
             return this;
@@ -250,6 +281,7 @@ protected static void setupGeoDistanceQueryDeserializer(ObjectDeserializer<GeoDi
         op.add(Builder::distance, JsonpDeserializer.stringDeserializer(), "distance");
         op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
         op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
 
         op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
             builder.field(name);

java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/GeoDistanceQueryTest.java

@@ -10,6 +10,7 @@
 
 import java.util.Collections;
 import org.junit.Test;
+import org.opensearch.client.opensearch._types.GeoDistanceType;
 import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.opensearch.model.ModelTestCase;
 
@@ -18,6 +19,9 @@ public class GeoDistanceQueryTest extends ModelTestCase {
     public void toBuilder() {
         GeoDistanceQuery origin = new GeoDistanceQuery.Builder().field("field")
             .location(new GeoLocation.Builder().coords(Collections.singletonList(1.0)).build())
+            .distance("1m")
+            .distanceType(GeoDistanceType.Arc)
+            .ignoreUnmapped(true)
             .build();
         GeoDistanceQuery copied = origin.toBuilder().build();