Re-generate from latest specification (#1663)

* Re-generate from latest specification

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Fix sample

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

* Generate `ingestion` namespace

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---------

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

Author: Xtansia

CHANGELOG.md

@@ -12,6 +12,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added support for Index Management plugin APIs ([#1604](https://github.com/opensearch-project/opensearch-java/pull/1604))
 - Added support for the security plugin APIs ([#1601](https://github.com/opensearch-project/opensearch-java/pull/1601))
 - Jackson `ObjectMapper` modules are now being auto-detected ([#1643](https://github.com/opensearch-project/opensearch-java/pull/1643))
+- Added support for the `ingestion` namespace ([#1663](https://github.com/opensearch-project/opensearch-java/pull/1663))
 
 ### Dependencies
 - Bump `org.owasp.dependencycheck` from 12.1.1 to 12.1.3 ([#1608](https://github.com/opensearch-project/opensearch-java/pull/1608), [#1607](https://github.com/opensearch-project/opensearch-java/pull/1607), [#1623](https://github.com/opensearch-project/opensearch-java/pull/1623))

UPGRADING.md

@@ -777,4 +777,67 @@ After:
 - The `RuntimeFieldType` class has been removed as it is not supported by OpenSearch.
 
 ### MultiSearchItem
-- The `MultiSearchItem` class now extends `SearchResult` directly instead of via `SearchResponse`.
+- The `MultiSearchItem` class now extends `SearchResult` directly instead of via `SearchResponse`.
+
+### ml.ByteBuffer
+- The `order` property is now of type `ByteOrder` instead of `String`.
+
+### ml.ColumnMeta
+- The `columnType` property is now of type `ColumnType` instead of `String`.
+
+### ml.CreateConnectorRequest
+- The `protocol` property is now of type `ConnectorProtocol` instead of `String`.
+
+### ml.GetAgentResponse
+- The `type` property is now of type `AgentType` instead of `String`.
+
+### ml.GetConnectorResponse
+- The `protocol` property is now of type `ConnectorProtocol` instead of `String`.
+
+### ml.GetModelGroupResponse
+- The `access` property is now of type `ModelGroupAccessMode` instead of `String`.
+
+### ml.GetModelResponse
+- The `modelState` property is now of type `ModelState` instead of `String`.
+
+### ml.GetStatsRequest
+- The `stat` property is now of type `List<MlStatName>` instead of `String`.
+
+### ml.GetStatsResponse
+- The `mlConfigIndexStatus`, `mlConnectorIndexStatus`, `mlControllerIndexStatus`, `mlModelIndexStatus` & `mlTaskIndexStatus` properties are now of type `MlIndexStatus` instead of `String`.
+
+### ml.GetTaskResponse
+- The `state` property is now of type `TaskState` instead of `String`.
+- The `taskType` property is now of type `MlTaskType` instead of `String`.
+
+### ml.GetToolRequest
+- The `toolName` property is now of type `ToolName` instead of `String`.
+
+### ml.Guardrails
+- The `type` property is now of type `GuardrailsType` instead of `String`.
+
+### ml.LoadModelResponse
+- The `taskType` property is now of type `MlTaskType` instead of `String`.
+
+### ml.ModelProfile
+- The `modelState` property is now of type `ModelState` instead of `String`.
+
+### ml.Output
+- The `dataType` property is now of type `MlResultDataType` instead of `String`.
+
+### ml.RateLimiter
+- The `unit` property is now of type `RateLimiterUnit` instead of `String`.
+
+### ml.RegisterModelGroupRequest
+- The `accessMode` property is now of type `ModelGroupAccessMode` instead of `String`.
+
+### ml.Task
+- The `state` property is now of type `TaskState` instead of `String`.
+- The `taskType` property is now of type `MlTaskType` instead of `String`.
+
+### ml.UpdateConnectorRequest
+- The `accessMode` property is now of type `ModelGroupAccessMode` instead of `String`.
+- The `protocol` property is now of type `ConnectorProtocol` instead of `String`.
+
+### ml.Values
+- The `columnType` property is now of type `ColumnType` instead of `String`.

java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java

@@ -114,6 +114,7 @@
 import org.opensearch.client.opensearch.dangling_indices.OpenSearchDanglingIndicesAsyncClient;
 import org.opensearch.client.opensearch.indices.OpenSearchIndicesAsyncClient;
 import org.opensearch.client.opensearch.ingest.OpenSearchIngestAsyncClient;
+import org.opensearch.client.opensearch.ingestion.OpenSearchIngestionAsyncClient;
 import org.opensearch.client.opensearch.ism.OpenSearchIsmAsyncClient;
 import org.opensearch.client.opensearch.ml.OpenSearchMlAsyncClient;
 import org.opensearch.client.opensearch.nodes.OpenSearchNodesAsyncClient;
@@ -159,6 +160,10 @@ public OpenSearchIngestAsyncClient ingest() {
         return new OpenSearchIngestAsyncClient(this.transport, this.transportOptions);
     }
 
+    public OpenSearchIngestionAsyncClient ingestion() {
+        return new OpenSearchIngestionAsyncClient(this.transport, this.transportOptions);
+    }
+
     public OpenSearchIsmAsyncClient ism() {
         return new OpenSearchIsmAsyncClient(this.transport, this.transportOptions);
     }

java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java

@@ -113,6 +113,7 @@
 import org.opensearch.client.opensearch.dangling_indices.OpenSearchDanglingIndicesClient;
 import org.opensearch.client.opensearch.indices.OpenSearchIndicesClient;
 import org.opensearch.client.opensearch.ingest.OpenSearchIngestClient;
+import org.opensearch.client.opensearch.ingestion.OpenSearchIngestionClient;
 import org.opensearch.client.opensearch.ism.OpenSearchIsmClient;
 import org.opensearch.client.opensearch.ml.OpenSearchMlClient;
 import org.opensearch.client.opensearch.nodes.OpenSearchNodesClient;
@@ -158,6 +159,10 @@ public OpenSearchIngestClient ingest() {
         return new OpenSearchIngestClient(this.transport, this.transportOptions);
     }
 
+    public OpenSearchIngestionClient ingestion() {
+        return new OpenSearchIngestionClient(this.transport, this.transportOptions);
+    }
+
     public OpenSearchIsmClient ism() {
         return new OpenSearchIsmClient(this.transport, this.transportOptions);
     }

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/Analyzer.java

@@ -74,6 +74,7 @@ public enum Kind implements JsonEnum {
         Nori("nori"),
         Pattern("pattern"),
         Phone("phone"),
+        PhoneSearch("phone-search"),
         Simple("simple"),
         Smartcn("smartcn"),
         Snowball("snowball"),
@@ -296,6 +297,22 @@ public PhoneAnalyzer phone() {
         return TaggedUnionUtils.get(this, Kind.Phone);
     }
 
+    /**
+     * Is this variant instance of kind {@code phone-search}?
+     */
+    public boolean isPhoneSearch() {
+        return _kind == Kind.PhoneSearch;
+    }
+
+    /**
+     * Get the {@code phone-search} variant value.
+     *
+     * @throws IllegalStateException if the current variant is not the {@code phone-search} kind.
+     */
+    public PhoneSearchAnalyzer phoneSearch() {
+        return TaggedUnionUtils.get(this, Kind.PhoneSearch);
+    }
+
     /**
      * Is this variant instance of kind {@code simple}?
      */
@@ -528,6 +545,16 @@ public ObjectBuilder<Analyzer> phone(Function<PhoneAnalyzer.Builder, ObjectBuild
             return this.phone(fn.apply(new PhoneAnalyzer.Builder()).build());
         }
 
+        public ObjectBuilder<Analyzer> phoneSearch(PhoneSearchAnalyzer v) {
+            this._kind = Kind.PhoneSearch;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> phoneSearch(Function<PhoneSearchAnalyzer.Builder, ObjectBuilder<PhoneSearchAnalyzer>> fn) {
+            return this.phoneSearch(fn.apply(new PhoneSearchAnalyzer.Builder()).build());
+        }
+
         public ObjectBuilder<Analyzer> simple(SimpleAnalyzer v) {
             this._kind = Kind.Simple;
             this._value = v;
@@ -607,6 +634,7 @@ protected static void setupAnalyzerDeserializer(ObjectDeserializer<Builder> op)
         op.add(Builder::nori, NoriAnalyzer._DESERIALIZER, "nori");
         op.add(Builder::pattern, PatternAnalyzer._DESERIALIZER, "pattern");
         op.add(Builder::phone, PhoneAnalyzer._DESERIALIZER, "phone");
+        op.add(Builder::phoneSearch, PhoneSearchAnalyzer._DESERIALIZER, "phone-search");
         op.add(Builder::simple, SimpleAnalyzer._DESERIALIZER, "simple");
         op.add(Builder::smartcn, SmartcnAnalyzer._DESERIALIZER, "smartcn");
         op.add(Builder::snowball, SnowballAnalyzer._DESERIALIZER, "snowball");

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerBuilders.java

@@ -122,6 +122,13 @@ public static PhoneAnalyzer.Builder phone() {
         return new PhoneAnalyzer.Builder();
     }
 
+    /**
+     * Creates a builder for the {@link PhoneSearchAnalyzer phone-search} {@code Analyzer} variant.
+     */
+    public static PhoneSearchAnalyzer.Builder phoneSearch() {
+        return new PhoneSearchAnalyzer.Builder();
+    }
+
     /**
      * Creates a builder for the {@link SimpleAnalyzer simple} {@code Analyzer} variant.
      */

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneAnalyzer.java

@@ -37,35 +37,28 @@
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
-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;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
-import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: _types.analysis.PhoneAnalyzer
 
 @JsonpDeserializable
 @Generated("org.opensearch.client.codegen.CodeGenerator")
-public class PhoneAnalyzer implements AnalyzerVariant, PlainJsonSerializable, ToCopyableBuilder<PhoneAnalyzer.Builder, PhoneAnalyzer> {
-
-    @Nullable
-    private final String phoneRegion;
+public class PhoneAnalyzer extends PhoneAnalyzerBase implements AnalyzerVariant, ToCopyableBuilder<PhoneAnalyzer.Builder, PhoneAnalyzer> {
 
     // ---------------------------------------------------------------------------------------------
 
     private PhoneAnalyzer(Builder builder) {
-        this.phoneRegion = builder.phoneRegion;
+        super(builder);
     }
 
     public static PhoneAnalyzer of(Function<PhoneAnalyzer.Builder, ObjectBuilder<PhoneAnalyzer>> fn) {
@@ -80,33 +73,9 @@ public Analyzer.Kind _analyzerKind() {
         return Analyzer.Kind.Phone;
     }
 
-    /**
-     * Optional ISO 3166 country code, defaults to &quot;ZZ&quot; (unknown region).
-     * <p>
-     * API name: {@code phone-region}
-     * </p>
-     */
-    @Nullable
-    public final String phoneRegion() {
-        return this.phoneRegion;
-    }
-
-    /**
-     * Serialize this object to JSON.
-     */
-    @Override
-    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-        generator.writeStartObject();
-        serializeInternal(generator, mapper);
-        generator.writeEnd();
-    }
-
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.write("type", "phone");
-        if (this.phoneRegion != null) {
-            generator.writeKey("phone-region");
-            generator.write(this.phoneRegion);
-        }
+        super.serializeInternal(generator, mapper);
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -125,18 +94,16 @@ public static Builder builder() {
     /**
      * Builder for {@link PhoneAnalyzer}.
      */
-    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, PhoneAnalyzer> {
-        @Nullable
-        private String phoneRegion;
+    public static class Builder extends PhoneAnalyzerBase.AbstractBuilder<Builder> implements CopyableBuilder<Builder, PhoneAnalyzer> {
 
         public Builder() {}
 
         private Builder(PhoneAnalyzer o) {
-            this.phoneRegion = o.phoneRegion;
+            super(o);
         }
 
         private Builder(Builder o) {
-            this.phoneRegion = o.phoneRegion;
+            super(o);
         }
 
         @Override
@@ -145,15 +112,9 @@ public Builder copy() {
             return new Builder(this);
         }
 
-        /**
-         * Optional ISO 3166 country code, defaults to &quot;ZZ&quot; (unknown region).
-         * <p>
-         * API name: {@code phone-region}
-         * </p>
-         */
+        @Override
         @Nonnull
-        public final Builder phoneRegion(@Nullable String value) {
-            this.phoneRegion = value;
+        protected Builder self() {
             return this;
         }
 
@@ -182,23 +143,24 @@ public PhoneAnalyzer build() {
     );
 
     protected static void setupPhoneAnalyzerDeserializer(ObjectDeserializer<PhoneAnalyzer.Builder> op) {
-        op.add(Builder::phoneRegion, JsonpDeserializer.stringDeserializer(), "phone-region");
+        setupPhoneAnalyzerBaseDeserializer(op);
 
         op.ignore("type");
     }
 
     @Override
     public int hashCode() {
-        int result = 17;
-        result = 31 * result + Objects.hashCode(this.phoneRegion);
+        int result = super.hashCode();
         return result;
     }
 
     @Override
     public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
-        PhoneAnalyzer other = (PhoneAnalyzer) o;
-        return Objects.equals(this.phoneRegion, other.phoneRegion);
+        return true;
     }
 }