From 9daa8faa99f24362f2b6547da7cebd769d4c7503 Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Mon, 6 Jan 2025 12:28:59 +1300
Subject: [PATCH] Fix tests

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 .../nodes/info/NodeInfoSearchPipelines.java   |  55 +++++----
 .../nodes/info/NodeInfoSettingsNode.java      |  27 +++--
 java-codegen/opensearch-openapi.yaml          | 113 ++----------------
 3 files changed, 55 insertions(+), 140 deletions(-)

diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchPipelines.java b/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchPipelines.java
index 89075f988..1a3efba54 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchPipelines.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchPipelines.java
@@ -38,9 +38,11 @@
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 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;
@@ -71,8 +73,8 @@ public class NodeInfoSearchPipelines
     // ---------------------------------------------------------------------------------------------
 
     private NodeInfoSearchPipelines(Builder builder) {
-        this.requestProcessors = ApiTypeHelper.unmodifiableRequired(builder.requestProcessors, this, "requestProcessors");
-        this.responseProcessors = ApiTypeHelper.unmodifiableRequired(builder.responseProcessors, this, "responseProcessors");
+        this.requestProcessors = ApiTypeHelper.unmodifiable(builder.requestProcessors);
+        this.responseProcessors = ApiTypeHelper.unmodifiable(builder.responseProcessors);
     }
 
     public static NodeInfoSearchPipelines of(Function<NodeInfoSearchPipelines.Builder, ObjectBuilder<NodeInfoSearchPipelines>> fn) {
@@ -80,7 +82,7 @@ public static NodeInfoSearchPipelines of(Function<NodeInfoSearchPipelines.Builde
     }
 
     /**
-     * Required - API name: {@code request_processors}
+     * API name: {@code request_processors}
      */
     @Nonnull
     public final List<NodeInfoIngestProcessor> requestProcessors() {
@@ -88,7 +90,7 @@ public final List<NodeInfoIngestProcessor> requestProcessors() {
     }
 
     /**
-     * Required - API name: {@code response_processors}
+     * API name: {@code response_processors}
      */
     @Nonnull
     public final List<NodeInfoIngestProcessor> responseProcessors() {
@@ -106,19 +108,23 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-        generator.writeKey("request_processors");
-        generator.writeStartArray();
-        for (NodeInfoIngestProcessor item0 : this.requestProcessors) {
-            item0.serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.requestProcessors)) {
+            generator.writeKey("request_processors");
+            generator.writeStartArray();
+            for (NodeInfoIngestProcessor item0 : this.requestProcessors) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
         }
-        generator.writeEnd();
 
-        generator.writeKey("response_processors");
-        generator.writeStartArray();
-        for (NodeInfoIngestProcessor item0 : this.responseProcessors) {
-            item0.serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.responseProcessors)) {
+            generator.writeKey("response_processors");
+            generator.writeStartArray();
+            for (NodeInfoIngestProcessor item0 : this.responseProcessors) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
         }
-        generator.writeEnd();
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -138,7 +144,9 @@ public static Builder builder() {
      * Builder for {@link NodeInfoSearchPipelines}.
      */
     public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, NodeInfoSearchPipelines> {
+        @Nullable
         private List<NodeInfoIngestProcessor> requestProcessors;
+        @Nullable
         private List<NodeInfoIngestProcessor> responseProcessors;
 
         public Builder() {}
@@ -160,7 +168,7 @@ public Builder copy() {
         }
 
         /**
-         * Required - API name: {@code request_processors}
+         * API name: {@code request_processors}
          *
          * <p>
          * Adds all elements of <code>list</code> to <code>requestProcessors</code>.
@@ -173,7 +181,7 @@ public final Builder requestProcessors(List<NodeInfoIngestProcessor> list) {
         }
 
         /**
-         * Required - API name: {@code request_processors}
+         * API name: {@code request_processors}
          *
          * <p>
          * Adds one or more values to <code>requestProcessors</code>.
@@ -186,7 +194,7 @@ public final Builder requestProcessors(NodeInfoIngestProcessor value, NodeInfoIn
         }
 
         /**
-         * Required - API name: {@code request_processors}
+         * API name: {@code request_processors}
          *
          * <p>
          * Adds a value to <code>requestProcessors</code> using a builder lambda.
@@ -198,7 +206,7 @@ public final Builder requestProcessors(Function<NodeInfoIngestProcessor.Builder,
         }
 
         /**
-         * Required - API name: {@code response_processors}
+         * API name: {@code response_processors}
          *
          * <p>
          * Adds all elements of <code>list</code> to <code>responseProcessors</code>.
@@ -211,7 +219,7 @@ public final Builder responseProcessors(List<NodeInfoIngestProcessor> list) {
         }
 
         /**
-         * Required - API name: {@code response_processors}
+         * API name: {@code response_processors}
          *
          * <p>
          * Adds one or more values to <code>responseProcessors</code>.
@@ -224,7 +232,7 @@ public final Builder responseProcessors(NodeInfoIngestProcessor value, NodeInfoI
         }
 
         /**
-         * Required - API name: {@code response_processors}
+         * API name: {@code response_processors}
          *
          * <p>
          * Adds a value to <code>responseProcessors</code> using a builder lambda.
@@ -275,8 +283,8 @@ protected static void setupNodeInfoSearchPipelinesDeserializer(ObjectDeserialize
     @Override
     public int hashCode() {
         int result = 17;
-        result = 31 * result + this.requestProcessors.hashCode();
-        result = 31 * result + this.responseProcessors.hashCode();
+        result = 31 * result + Objects.hashCode(this.requestProcessors);
+        result = 31 * result + Objects.hashCode(this.responseProcessors);
         return result;
     }
 
@@ -285,6 +293,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
         NodeInfoSearchPipelines other = (NodeInfoSearchPipelines) o;
-        return this.requestProcessors.equals(other.requestProcessors) && this.responseProcessors.equals(other.responseProcessors);
+        return Objects.equals(this.requestProcessors, other.requestProcessors)
+            && Objects.equals(this.responseProcessors, other.responseProcessors);
     }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java b/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
index 3a04268ad..f480a65e2 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
@@ -74,7 +74,7 @@ public class NodeInfoSettingsNode implements PlainJsonSerializable, ToCopyableBu
     // ---------------------------------------------------------------------------------------------
 
     private NodeInfoSettingsNode(Builder builder) {
-        this.attr = ApiTypeHelper.unmodifiableRequired(builder.attr, this, "attr");
+        this.attr = ApiTypeHelper.unmodifiable(builder.attr);
         this.maxLocalStorageNodes = builder.maxLocalStorageNodes;
         this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
     }
@@ -84,7 +84,7 @@ public static NodeInfoSettingsNode of(Function<NodeInfoSettingsNode.Builder, Obj
     }
 
     /**
-     * Required - API name: {@code attr}
+     * API name: {@code attr}
      */
     @Nonnull
     public final Map<String, JsonData> attr() {
@@ -118,13 +118,15 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-        generator.writeKey("attr");
-        generator.writeStartObject();
-        for (Map.Entry<String, JsonData> item0 : this.attr.entrySet()) {
-            generator.writeKey(item0.getKey());
-            item0.getValue().serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.attr)) {
+            generator.writeKey("attr");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.attr.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+            }
+            generator.writeEnd();
         }
-        generator.writeEnd();
 
         if (this.maxLocalStorageNodes != null) {
             generator.writeKey("max_local_storage_nodes");
@@ -152,6 +154,7 @@ public static Builder builder() {
      * Builder for {@link NodeInfoSettingsNode}.
      */
     public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, NodeInfoSettingsNode> {
+        @Nullable
         private Map<String, JsonData> attr;
         @Nullable
         private String maxLocalStorageNodes;
@@ -178,7 +181,7 @@ public Builder copy() {
         }
 
         /**
-         * Required - API name: {@code attr}
+         * API name: {@code attr}
          *
          * <p>
          * Adds all elements of <code>map</code> to <code>attr</code>.
@@ -191,7 +194,7 @@ public final Builder attr(Map<String, JsonData> map) {
         }
 
         /**
-         * Required - API name: {@code attr}
+         * API name: {@code attr}
          *
          * <p>
          * Adds an entry to <code>attr</code>.
@@ -254,7 +257,7 @@ protected static void setupNodeInfoSettingsNodeDeserializer(ObjectDeserializer<N
     @Override
     public int hashCode() {
         int result = 17;
-        result = 31 * result + this.attr.hashCode();
+        result = 31 * result + Objects.hashCode(this.attr);
         result = 31 * result + Objects.hashCode(this.maxLocalStorageNodes);
         result = 31 * result + this.name.hashCode();
         return result;
@@ -265,7 +268,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
         NodeInfoSettingsNode other = (NodeInfoSettingsNode) o;
-        return this.attr.equals(other.attr)
+        return Objects.equals(this.attr, other.attr)
             && Objects.equals(this.maxLocalStorageNodes, other.maxLocalStorageNodes)
             && this.name.equals(other.name);
     }
diff --git a/java-codegen/opensearch-openapi.yaml b/java-codegen/opensearch-openapi.yaml
index 1ad441e0f..5f105165c 100644
--- a/java-codegen/opensearch-openapi.yaml
+++ b/java-codegen/opensearch-openapi.yaml
@@ -52192,8 +52192,7 @@ components:
             value:
               description: The value to be appended. Supports template snippets.
               type: array
-              items:
-                type: object
+              items: {}
             allow_duplicates:
               description: If `false`, the processor does not append values already present in the field.
               type: boolean
@@ -52214,7 +52213,8 @@ components:
               description: |-
                 The number of chars being used for extraction to prevent huge fields.
                 Use `-1` for no limit.
-              type: number
+              type: integer
+              format: int64
             indexed_chars_field:
               $ref: '#/components/schemas/_common___Field'
             properties:
@@ -52255,6 +52255,7 @@ components:
             error_distance:
               description: The difference between the resulting inscribed distance from center to side and the circle's radius (measured in meters for `geo_shape`, unit-less for `shape`).
               type: number
+              format: double
             field:
               $ref: '#/components/schemas/_common___Field'
             ignore_missing:
@@ -52305,7 +52306,6 @@ components:
                 Value used to fill empty fields.
                 Empty fields are skipped if this is not provided.
                 An empty field is one with no value (2 consecutive separators) or empty quotes (`""`).
-              type: object
             field:
               $ref: '#/components/schemas/_common___Field'
             ignore_missing:
@@ -52432,38 +52432,6 @@ components:
       allOf:
         - $ref: '#/components/schemas/ingest._common___ProcessorBase'
         - type: object
-    ingest._common___EnrichProcessor:
-      allOf:
-        - $ref: '#/components/schemas/ingest._common___ProcessorBase'
-        - type: object
-          properties:
-            field:
-              $ref: '#/components/schemas/_common___Field'
-            ignore_missing:
-              description: If `true` and `field` does not exist, the processor quietly exits without modifying the document.
-              type: boolean
-            max_matches:
-              description: |-
-                The maximum number of matched documents to include under the configured target field.
-                The `target_field` will be turned into a JSON array if `max_matches` is higher than 1, otherwise `target_field` will become a JSON object.
-                In order to avoid documents getting too large, the maximum allowed value is 128.
-              type: number
-            override:
-              description: |-
-                If processor will update fields with pre-existing non-null-valued field.
-                When set to `false`, such fields will not be touched.
-              type: boolean
-            policy_name:
-              description: The name of the enrich policy to use.
-              type: string
-            shape_relation:
-              $ref: '#/components/schemas/_common___GeoShapeRelation'
-            target_field:
-              $ref: '#/components/schemas/_common___Field'
-          required:
-            - field
-            - policy_name
-            - target_field
     ingest._common___FailProcessor:
       allOf:
         - $ref: '#/components/schemas/ingest._common___ProcessorBase'
@@ -52568,61 +52536,6 @@ components:
             - field
             - pattern
             - replacement
-    ingest._common___InferenceConfig:
-      type: object
-      properties:
-        regression:
-          $ref: '#/components/schemas/ingest._common___InferenceConfigRegression'
-        classification:
-          $ref: '#/components/schemas/ingest._common___InferenceConfigClassification'
-      minProperties: 1
-      maxProperties: 1
-    ingest._common___InferenceConfigClassification:
-      type: object
-      properties:
-        num_top_classes:
-          description: Specifies the number of top class predictions to return.
-          type: number
-        num_top_feature_importance_values:
-          description: Specifies the maximum number of feature importance values per document.
-          type: number
-        results_field:
-          $ref: '#/components/schemas/_common___Field'
-        top_classes_results_field:
-          $ref: '#/components/schemas/_common___Field'
-        prediction_field_type:
-          description: |-
-            Specifies the type of the predicted field to write.
-            Valid values are: `string`, `number`, `boolean`.
-          type: string
-    ingest._common___InferenceConfigRegression:
-      type: object
-      properties:
-        results_field:
-          $ref: '#/components/schemas/_common___Field'
-        num_top_feature_importance_values:
-          description: Specifies the maximum number of feature importance values per document.
-          type: number
-    ingest._common___InferenceProcessor:
-      allOf:
-        - $ref: '#/components/schemas/ingest._common___ProcessorBase'
-        - type: object
-          properties:
-            model_id:
-              $ref: '#/components/schemas/_common___Id'
-            target_field:
-              $ref: '#/components/schemas/_common___Field'
-            field_map:
-              description: |-
-                Maps the document field names to the known field names of the model.
-                This mapping takes precedence over any default mappings provided in the model configuration.
-              type: object
-              additionalProperties:
-                type: object
-            inference_config:
-              $ref: '#/components/schemas/ingest._common___InferenceConfig'
-          required:
-            - model_id
     ingest._common___JoinProcessor:
       allOf:
         - $ref: '#/components/schemas/ingest._common___ProcessorBase'
@@ -52801,8 +52714,6 @@ components:
           $ref: '#/components/schemas/ingest._common___DateIndexNameProcessor'
         dot_expander:
           $ref: '#/components/schemas/ingest._common___DotExpanderProcessor'
-        enrich:
-          $ref: '#/components/schemas/ingest._common___EnrichProcessor'
         fail:
           $ref: '#/components/schemas/ingest._common___FailProcessor'
         foreach:
@@ -52853,8 +52764,6 @@ components:
           $ref: '#/components/schemas/ingest._common___DropProcessor'
         circle:
           $ref: '#/components/schemas/ingest._common___CircleProcessor'
-        inference:
-          $ref: '#/components/schemas/ingest._common___InferenceProcessor'
         text_embedding:
           $ref: '#/components/schemas/ingest._common___TextEmbeddingProcessor'
       minProperties: 1
@@ -52914,7 +52823,6 @@ components:
                 The value to be set for the field.
                 Supports template snippets.
                 May specify only one of `value` or `copy_from`.
-              type: object
           required:
             - field
     ingest._common___SetSecurityUserProcessor:
@@ -52935,7 +52843,7 @@ components:
       type: string
       enum:
         - geo_shape
-        - shape
+        - xy_shape
     ingest._common___SortProcessor:
       allOf:
         - $ref: '#/components/schemas/ingest._common___ProcessorBase'
@@ -52982,9 +52890,9 @@ components:
               type: object
               additionalProperties:
                 type: string
-            description:
-              type: string
-              description: A brief description of the processor.
+            batch_size:
+              type: integer
+              format: int32
           required:
             - field_map
             - model_id
@@ -53073,7 +52981,6 @@ components:
           $ref: '#/components/schemas/_common___IndexName'
         _source:
           description: JSON body for the document.
-          type: object
       required:
         - _source
     ingest.simulate___DocumentSimulation:
@@ -54844,9 +54751,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/nodes.info___NodeInfoIngestProcessor'
-      required:
-        - request_processors
-        - response_processors
     nodes.info___NodeInfoSearchRemote:
       type: object
       properties:
@@ -55051,7 +54955,6 @@ components:
         max_local_storage_nodes:
           type: string
       required:
-        - attr
         - name
     nodes.info___NodeInfoSettingsPlugins:
       type: object