From 6fd8f37610c9737cdf37bf99691f627c9debd31b Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Mon, 7 Oct 2024 17:37:12 +1300
Subject: [PATCH] Begin generating indices.get

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 UPGRADING.md                                  |   11 +-
 .../opensearch/OpenSearchAsyncClientBase.java |    5 +
 .../opensearch/OpenSearchClientBase.java      |    5 +
 .../opensearch/_types/ExpandWildcard.java     |   26 +-
 .../opensearch/_types/InlineScript.java       |   76 +-
 .../client/opensearch/_types/Script.java      |   42 +-
 .../client/opensearch/_types/ScriptBase.java  |   52 +-
 .../opensearch/_types/ScriptBuilders.java     |   11 +-
 .../opensearch/_types/ScriptLanguage.java     |   67 +
 .../opensearch/_types/StoredScriptId.java     |   36 +-
 .../opensearch/_types/mapping/AllField.java   |   64 +-
 .../_types/mapping/DataStreamTimestamp.java   |  146 ++
 .../_types/mapping/DynamicMapping.java        |   18 +-
 .../_types/mapping/DynamicTemplate.java       |   63 +-
 .../_types/mapping/FieldNamesField.java       |   30 +-
 .../opensearch/_types/mapping/IndexField.java |   30 +-
 .../opensearch/_types/mapping/MatchType.java  |   12 +-
 .../_types/mapping/RoutingField.java          |   30 +-
 .../_types/mapping/RuntimeField.java          |  389 ++++
 .../mapping/RuntimeFieldFetchFields.java}     |  135 +-
 .../_types/mapping/RuntimeFieldType.java      |   10 +-
 .../opensearch/_types/mapping/SizeField.java  |   30 +-
 .../_types/mapping/SourceField.java           |  105 +-
 .../_types/mapping/SourceFieldMode.java       |   65 +
 .../_types/mapping/TypeMapping.java           |  341 ++--
 .../client/opensearch/indices/Alias.java      |  202 +-
 .../opensearch/indices/GetIndexRequest.java   |  266 +--
 .../opensearch/indices/GetIndexResponse.java  |   17 +-
 .../client/opensearch/indices/IndexState.java |  185 +-
 .../OpenSearchIndicesAsyncClientBase.java     |   79 +
 .../indices/OpenSearchIndicesClientBase.java  |   78 +
 .../opensearch/OpenSearchAsyncClient.java     |    5 -
 .../client/opensearch/OpenSearchClient.java   |    5 -
 .../indices/OpenSearchIndicesAsyncClient.java |   35 +-
 .../indices/OpenSearchIndicesClient.java      |   35 +-
 .../client/opensearch/model/EnumTest.java     |    4 +-
 .../opensearch/integTest/AbstractCrudIT.java  |    9 +-
 .../AbstractMultiSearchRequestIT.java         |    3 +-
 java-codegen/opensearch-openapi.yaml          | 1735 +++++++++++------
 .../client/codegen/CodeGenerator.java         |    1 +
 .../client/codegen/model/EnumShape.java       |   21 +-
 .../client/codegen/model/ObjectShape.java     |   13 +
 .../client/codegen/model/SpecTransformer.java |  115 +-
 .../codegen/model/TaggedUnionShape.java       |   13 +-
 .../client/codegen/model/Types.java           |    1 +
 .../codegen/model/overrides/Overrides.java    |   26 +-
 .../model/overrides/SchemaOverride.java       |   37 +-
 .../model/overrides/ShouldGenerate.java       |   15 +
 .../client/codegen/openapi/OpenApiSchema.java |   20 +-
 .../client/codegen/utils/Markdown.java        |    4 +-
 .../codegen/templates/EnumShape.mustache      |    5 +
 .../templates/ObjectShape/Builder.mustache    |   12 +-
 .../ObjectShape/Builder/SelfImpl.mustache     |    2 +-
 .../ObjectShape/Deserialize.mustache          |    4 +
 .../templates/Type/directSerializer.mustache  |   11 +-
 55 files changed, 3347 insertions(+), 1410 deletions(-)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java (78%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/InlineScript.java (74%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/Script.java (80%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/ScriptBase.java (71%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java (85%)
 create mode 100644 java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/StoredScriptId.java (78%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/AllField.java (83%)
 create mode 100644 java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DataStreamTimestamp.java
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java (82%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java (83%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java (82%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java (82%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java (83%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java (82%)
 create mode 100644 java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
 rename java-client/src/{main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java => generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldFetchFields.java} (58%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java (84%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java (82%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java (77%)
 create mode 100644 java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceFieldMode.java
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java (79%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/indices/Alias.java (52%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java (70%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java (84%)
 rename java-client/src/{main => generated}/java/org/opensearch/client/opensearch/indices/IndexState.java (81%)
 create mode 100644 java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClientBase.java
 create mode 100644 java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClientBase.java
 create mode 100644 java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/ShouldGenerate.java

diff --git a/UPGRADING.md b/UPGRADING.md
index 4556772bea..c4beb34b0d 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -51,4 +51,13 @@ After:
 - The `name` field, getter and builder method have been renamed to `repository`.
 
 ### CloneSnapshotRequest timeout removal
-- The `timeout` field, getter and builder method have been removed from `CloneSnapshotRequest` as it is not supported by OpenSearch.
\ No newline at end of file
+- The `timeout` field, getter and builder method have been removed from `CloneSnapshotRequest` as it is not supported by OpenSearch.
+
+### indices.Alias
+- The `indexRouting`, `routing` and `searchRouting` properties now accept a `List<String>` instead of a `String`.
+
+### InlineScript
+- The `lang` property now accepts a `ScriptLanguage` enum instead of a `String`.
+
+### DynamicMapping
+- Removed the `Runtime` variant from the `DynamicMapping` enum as it is not supported by OpenSearch.
\ No newline at end of file
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java
index cbe9d63a80..2ddfefc198 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java
@@ -45,6 +45,7 @@
 import org.opensearch.client.opensearch.core.InfoRequest;
 import org.opensearch.client.opensearch.core.InfoResponse;
 import org.opensearch.client.opensearch.dangling_indices.OpenSearchDanglingIndicesAsyncClient;
+import org.opensearch.client.opensearch.indices.OpenSearchIndicesAsyncClient;
 import org.opensearch.client.opensearch.ml.OpenSearchMlAsyncClient;
 import org.opensearch.client.opensearch.snapshot.OpenSearchSnapshotAsyncClient;
 import org.opensearch.client.opensearch.tasks.OpenSearchTasksAsyncClient;
@@ -66,6 +67,10 @@ public OpenSearchDanglingIndicesAsyncClient danglingIndices() {
         return new OpenSearchDanglingIndicesAsyncClient(this.transport, this.transportOptions);
     }
 
+    public OpenSearchIndicesAsyncClient indices() {
+        return new OpenSearchIndicesAsyncClient(this.transport, this.transportOptions);
+    }
+
     public OpenSearchMlAsyncClient ml() {
         return new OpenSearchMlAsyncClient(this.transport, this.transportOptions);
     }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java
index 36f4a912b6..eeedcc19fd 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java
@@ -44,6 +44,7 @@
 import org.opensearch.client.opensearch.core.InfoRequest;
 import org.opensearch.client.opensearch.core.InfoResponse;
 import org.opensearch.client.opensearch.dangling_indices.OpenSearchDanglingIndicesClient;
+import org.opensearch.client.opensearch.indices.OpenSearchIndicesClient;
 import org.opensearch.client.opensearch.ml.OpenSearchMlClient;
 import org.opensearch.client.opensearch.snapshot.OpenSearchSnapshotClient;
 import org.opensearch.client.opensearch.tasks.OpenSearchTasksClient;
@@ -65,6 +66,10 @@ public OpenSearchDanglingIndicesClient danglingIndices() {
         return new OpenSearchDanglingIndicesClient(this.transport, this.transportOptions);
     }
 
+    public OpenSearchIndicesClient indices() {
+        return new OpenSearchIndicesClient(this.transport, this.transportOptions);
+    }
+
     public OpenSearchMlClient ml() {
         return new OpenSearchMlClient(this.transport, this.transportOptions);
     }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
index 5b66a33bd2..cf64f63793 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
@@ -30,32 +30,33 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.ExpandWildcard
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum ExpandWildcard implements JsonEnum {
     /**
-     * Match any data stream or index, including hidden ones.
+     * Match any index, including hidden ones.
      */
     All("all"),
 
     /**
-     * Match open, non-hidden indices. Also matches any non-hidden data stream.
-     */
-    Open("open"),
-
-    /**
-     * Match closed, non-hidden indices. Also matches any non-hidden data stream.
-     * Data streams cannot be closed.
+     * Match closed, non-hidden indices.
      */
     Closed("closed"),
 
     /**
-     * Match hidden data streams and hidden indices. Must be combined with open,
-     * closed, or both.
+     * Match hidden indices. Must be combined with open, closed, or both.
      */
     Hidden("hidden"),
 
@@ -64,7 +65,10 @@ public enum ExpandWildcard implements JsonEnum {
      */
     None("none"),
 
-    ;
+    /**
+     * Match open, non-hidden indices.
+     */
+    Open("open");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/InlineScript.java
similarity index 74%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/InlineScript.java
index be2177029b..2704d6710d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/InlineScript.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+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;
@@ -47,26 +54,28 @@
 // typedef: _types.InlineScript
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class InlineScript extends ScriptBase {
+
     @Nullable
-    private final String lang;
+    private final ScriptLanguage lang;
 
+    @Nonnull
     private final Map<String, String> options;
 
+    @Nonnull
     private final String source;
 
     // ---------------------------------------------------------------------------------------------
 
     private InlineScript(Builder builder) {
         super(builder);
-
         this.lang = builder.lang;
         this.options = ApiTypeHelper.unmodifiable(builder.options);
         this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-
     }
 
-    public static InlineScript of(Function<Builder, ObjectBuilder<InlineScript>> fn) {
+    public static InlineScript of(Function<InlineScript.Builder, ObjectBuilder<InlineScript>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -74,46 +83,48 @@ public static InlineScript of(Function<Builder, ObjectBuilder<InlineScript>> fn)
      * API name: {@code lang}
      */
     @Nullable
-    public final String lang() {
+    public final ScriptLanguage lang() {
         return this.lang;
     }
 
     /**
      * API name: {@code options}
      */
+    @Nonnull
     public final Map<String, String> options() {
         return this.options;
     }
 
     /**
-     * Required - API name: {@code source}
+     * Required - The script source.
+     * <p>
+     * API name: {@code source}
+     * </p>
      */
+    @Nonnull
     public final String source() {
         return this.source;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         super.serializeInternal(generator, mapper);
         if (this.lang != null) {
             generator.writeKey("lang");
-            generator.write(this.lang);
-
+            this.lang.serialize(generator, mapper);
         }
+
         if (ApiTypeHelper.isDefined(this.options)) {
             generator.writeKey("options");
             generator.writeStartObject();
             for (Map.Entry<String, String> item0 : this.options.entrySet()) {
                 generator.writeKey(item0.getKey());
                 generator.write(item0.getValue());
-
             }
             generator.writeEnd();
-
         }
+
         generator.writeKey("source");
         generator.write(this.source);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -121,28 +132,27 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link InlineScript}.
      */
-
     public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<InlineScript> {
         @Nullable
-        private String lang;
-
+        private ScriptLanguage lang;
         @Nullable
         private Map<String, String> options;
-
         private String source;
 
         /**
          * API name: {@code lang}
          */
-        public final Builder lang(@Nullable String value) {
+        public final Builder lang(@Nullable ScriptLanguage value) {
             this.lang = value;
             return this;
         }
 
         /**
          * API name: {@code options}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>options</code>.
+         * Adds all elements of <code>map</code> to <code>options</code>.
+         * </p>
          */
         public final Builder options(Map<String, String> map) {
             this.options = _mapPutAll(this.options, map);
@@ -151,8 +161,10 @@ public final Builder options(Map<String, String> map) {
 
         /**
          * API name: {@code options}
+         *
          * <p>
          * Adds an entry to <code>options</code>.
+         * </p>
          */
         public final Builder options(String key, String value) {
             this.options = _mapPut(this.options, key, value);
@@ -160,7 +172,10 @@ public final Builder options(String key, String value) {
         }
 
         /**
-         * Required - API name: {@code source}
+         * Required - The script source.
+         * <p>
+         * API name: {@code source}
+         * </p>
          */
         public final Builder source(String value) {
             this.source = value;
@@ -175,8 +190,7 @@ protected Builder self() {
         /**
          * Builds a {@link InlineScript}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public InlineScript build() {
             _checkSingleUse();
@@ -196,13 +210,29 @@ public InlineScript build() {
     );
 
     protected static void setupInlineScriptDeserializer(ObjectDeserializer<InlineScript.Builder> op) {
-        ScriptBase.setupScriptBaseDeserializer(op);
-        op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");
+        setupScriptBaseDeserializer(op);
+        op.add(Builder::lang, ScriptLanguage._DESERIALIZER, "lang");
         op.add(Builder::options, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "options");
         op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
 
         op.shortcutProperty("source");
+    }
 
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.lang);
+        result = 31 * result + Objects.hashCode(this.options);
+        result = 31 * result + this.source.hashCode();
+        return result;
     }
 
+    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;
+        InlineScript other = (InlineScript) o;
+        return Objects.equals(this.lang, other.lang) && Objects.equals(this.options, other.options) && this.source.equals(other.source);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Script.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/Script.java
index 6f969b8f5a..bd42a231de 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Script.java
@@ -30,14 +30,21 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
+import javax.annotation.Generated;
 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.PlainJsonSerializable;
 import org.opensearch.client.json.UnionDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
@@ -48,12 +55,14 @@
 // typedef: _types.Script
 
 @JsonpDeserializable
-public class Script implements TaggedUnion<Script.Kind, Object>, JsonpSerializable {
-
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class Script implements TaggedUnion<Script.Kind, Object>, PlainJsonSerializable {
+    /**
+     * {@link Script} variant kinds.
+     */
     public enum Kind {
         Inline,
         Stored
-
     }
 
     private final Kind _kind;
@@ -75,13 +84,11 @@ private Script(Kind kind, Object value) {
     }
 
     private Script(Builder builder) {
-
         this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
         this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
     }
 
-    public static Script of(Function<Builder, ObjectBuilder<Script>> fn) {
+    public static Script of(Function<Script.Builder, ObjectBuilder<Script>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -95,8 +102,7 @@ public boolean isInline() {
     /**
      * Get the {@code inline} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code inline} kind.
+     * @throws IllegalStateException if the current variant is not the {@code inline} kind.
      */
     public InlineScript inline() {
         return TaggedUnionUtils.get(this, Kind.Inline);
@@ -112,8 +118,7 @@ public boolean isStored() {
     /**
      * Get the {@code stored} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code stored} kind.
+     * @throws IllegalStateException if the current variant is not the {@code stored} kind.
      */
     public StoredScriptId stored() {
         return TaggedUnionUtils.get(this, Kind.Stored);
@@ -124,7 +129,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         if (_value instanceof JsonpSerializable) {
             ((JsonpSerializable) _value).serialize(generator, mapper);
         }
-
     }
 
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Script> {
@@ -151,11 +155,11 @@ public ObjectBuilder<Script> stored(Function<StoredScriptId.Builder, ObjectBuild
             return this.stored(fn.apply(new StoredScriptId.Builder()).build());
         }
 
+        @Override
         public Script build() {
             _checkSingleUse();
             return new Script(this);
         }
-
     }
 
     private static JsonpDeserializer<Script> buildScriptDeserializer() {
@@ -165,4 +169,18 @@ private static JsonpDeserializer<Script> buildScriptDeserializer() {
     }
 
     public static final JsonpDeserializer<Script> _DESERIALIZER = JsonpDeserializer.lazy(Script::buildScriptDeserializer);
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this._kind);
+        result = 31 * result + Objects.hashCode(this._value);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Script other = (Script) o;
+        return Objects.equals(this._kind, other._kind) && Objects.equals(this._value, other._value);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java
similarity index 71%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java
index b035508712..708ca60557 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java
@@ -30,10 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,20 +52,26 @@
 
 // typedef: _types.ScriptBase
 
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public abstract class ScriptBase implements PlainJsonSerializable {
+
+    @Nonnull
     private final Map<String, JsonData> params;
 
     // ---------------------------------------------------------------------------------------------
 
     protected ScriptBase(AbstractBuilder<?> builder) {
-
         this.params = ApiTypeHelper.unmodifiable(builder.params);
-
     }
 
     /**
+     * Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to decrease
+     * compile time.
+     * <p>
      * API name: {@code params}
+     * </p>
      */
+    @Nonnull
     public final Map<String, JsonData> params() {
         return this.params;
     }
@@ -66,6 +79,7 @@ public final Map<String, JsonData> params() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -73,29 +87,33 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (ApiTypeHelper.isDefined(this.params)) {
             generator.writeKey("params");
             generator.writeStartObject();
             for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
-
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Map<String, JsonData> params;
 
         /**
+         * Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to
+         * decrease compile time.
+         * <p>
          * API name: {@code params}
+         * </p>
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>params</code>.
+         * Adds all elements of <code>map</code> to <code>params</code>.
+         * </p>
          */
         public final BuilderT params(Map<String, JsonData> map) {
             this.params = _mapPutAll(this.params, map);
@@ -103,9 +121,15 @@ public final BuilderT params(Map<String, JsonData> map) {
         }
 
         /**
+         * Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to
+         * decrease compile time.
+         * <p>
          * API name: {@code params}
+         * </p>
+         *
          * <p>
          * Adds an entry to <code>params</code>.
+         * </p>
          */
         public final BuilderT params(String key, JsonData value) {
             this.params = _mapPut(this.params, key, value);
@@ -113,14 +137,24 @@ public final BuilderT params(String key, JsonData value) {
         }
 
         protected abstract BuilderT self();
-
     }
 
     // ---------------------------------------------------------------------------------------------
-    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScriptBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScriptBaseDeserializer(ObjectDeserializer<BuilderT> op) {
         op.add(AbstractBuilder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.params);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ScriptBase other = (ScriptBase) o;
+        return Objects.equals(this.params, other.params);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
similarity index 85%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
index 4908e13b45..66e0b03d2c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
+import javax.annotation.Generated;
+
 /**
  * Builders for {@link Script} variants.
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ScriptBuilders {
     private ScriptBuilders() {}
 
@@ -46,11 +53,9 @@ public static InlineScript.Builder inline() {
     }
 
     /**
-     * Creates a builder for the {@link StoredScriptId stored} {@code Script}
-     * variant.
+     * Creates a builder for the {@link StoredScriptId stored} {@code Script} variant.
      */
     public static StoredScriptId.Builder stored() {
         return new StoredScriptId.Builder();
     }
-
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java
new file mode 100644
index 0000000000..7e1c23c661
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types;
+
+import javax.annotation.Generated;
+import org.opensearch.client.json.JsonEnum;
+import org.opensearch.client.json.JsonpDeserializable;
+
+// typedef: _types.ScriptLanguage
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public enum ScriptLanguage implements JsonEnum {
+    Expression("expression"),
+
+    Java("java"),
+
+    Mustache("mustache"),
+
+    Painless("painless");
+
+    private final String jsonValue;
+
+    ScriptLanguage(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
+
+    public String jsonValue() {
+        return this.jsonValue;
+    }
+
+    public static final JsonEnum.Deserializer<ScriptLanguage> _DESERIALIZER = new JsonEnum.Deserializer<>(ScriptLanguage.values());
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
index f61b3a6016..27ed96be82 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,35 +51,35 @@
 // typedef: _types.StoredScriptId
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class StoredScriptId extends ScriptBase {
+
+    @Nonnull
     private final String id;
 
     // ---------------------------------------------------------------------------------------------
 
     private StoredScriptId(Builder builder) {
         super(builder);
-
         this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-
     }
 
-    public static StoredScriptId of(Function<Builder, ObjectBuilder<StoredScriptId>> fn) {
+    public static StoredScriptId of(Function<StoredScriptId.Builder, ObjectBuilder<StoredScriptId>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
      * Required - API name: {@code id}
      */
+    @Nonnull
     public final String id() {
         return this.id;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         super.serializeInternal(generator, mapper);
         generator.writeKey("id");
         generator.write(this.id);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -81,7 +87,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link StoredScriptId}.
      */
-
     public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<StoredScriptId> {
         private String id;
 
@@ -101,8 +106,7 @@ protected Builder self() {
         /**
          * Builds a {@link StoredScriptId}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public StoredScriptId build() {
             _checkSingleUse();
@@ -122,9 +126,23 @@ public StoredScriptId build() {
     );
 
     protected static void setupStoredScriptIdDeserializer(ObjectDeserializer<StoredScriptId.Builder> op) {
-        ScriptBase.setupScriptBaseDeserializer(op);
+        setupScriptBaseDeserializer(op);
         op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+    }
 
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.id.hashCode();
+        return result;
     }
 
+    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;
+        StoredScriptId other = (StoredScriptId) o;
+        return this.id.equals(other.id);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
index d9e675fdf9..844c0b4344 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -47,15 +53,20 @@
 // typedef: _types.mapping.AllField
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class AllField implements PlainJsonSerializable {
+
+    @Nonnull
     private final String analyzer;
 
     private final boolean enabled;
 
     private final boolean omitNorms;
 
+    @Nonnull
     private final String searchAnalyzer;
 
+    @Nonnull
     private final String similarity;
 
     private final boolean store;
@@ -71,7 +82,6 @@ public class AllField implements PlainJsonSerializable {
     // ---------------------------------------------------------------------------------------------
 
     private AllField(Builder builder) {
-
         this.analyzer = ApiTypeHelper.requireNonNull(builder.analyzer, this, "analyzer");
         this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
         this.omitNorms = ApiTypeHelper.requireNonNull(builder.omitNorms, this, "omitNorms");
@@ -82,16 +92,16 @@ private AllField(Builder builder) {
         this.storeTermVectorPayloads = ApiTypeHelper.requireNonNull(builder.storeTermVectorPayloads, this, "storeTermVectorPayloads");
         this.storeTermVectorPositions = ApiTypeHelper.requireNonNull(builder.storeTermVectorPositions, this, "storeTermVectorPositions");
         this.storeTermVectors = ApiTypeHelper.requireNonNull(builder.storeTermVectors, this, "storeTermVectors");
-
     }
 
-    public static AllField of(Function<Builder, ObjectBuilder<AllField>> fn) {
+    public static AllField of(Function<AllField.Builder, ObjectBuilder<AllField>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
      * Required - API name: {@code analyzer}
      */
+    @Nonnull
     public final String analyzer() {
         return this.analyzer;
     }
@@ -113,6 +123,7 @@ public final boolean omitNorms() {
     /**
      * Required - API name: {@code search_analyzer}
      */
+    @Nonnull
     public final String searchAnalyzer() {
         return this.searchAnalyzer;
     }
@@ -120,6 +131,7 @@ public final String searchAnalyzer() {
     /**
      * Required - API name: {@code similarity}
      */
+    @Nonnull
     public final String similarity() {
         return this.similarity;
     }
@@ -162,6 +174,7 @@ public final boolean storeTermVectors() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -169,7 +182,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.writeKey("analyzer");
         generator.write(this.analyzer);
 
@@ -199,7 +211,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
         generator.writeKey("store_term_vectors");
         generator.write(this.storeTermVectors);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -207,26 +218,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link AllField}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllField> {
         private String analyzer;
-
         private Boolean enabled;
-
         private Boolean omitNorms;
-
         private String searchAnalyzer;
-
         private String similarity;
-
         private Boolean store;
-
         private Boolean storeTermVectorOffsets;
-
         private Boolean storeTermVectorPayloads;
-
         private Boolean storeTermVectorPositions;
-
         private Boolean storeTermVectors;
 
         /**
@@ -312,8 +313,7 @@ public final Builder storeTermVectors(boolean value) {
         /**
          * Builds a {@link AllField}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public AllField build() {
             _checkSingleUse();
@@ -333,7 +333,6 @@ public AllField build() {
     );
 
     protected static void setupAllFieldDeserializer(ObjectDeserializer<AllField.Builder> op) {
-
         op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
         op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
         op.add(Builder::omitNorms, JsonpDeserializer.booleanDeserializer(), "omit_norms");
@@ -344,7 +343,36 @@ protected static void setupAllFieldDeserializer(ObjectDeserializer<AllField.Buil
         op.add(Builder::storeTermVectorPayloads, JsonpDeserializer.booleanDeserializer(), "store_term_vector_payloads");
         op.add(Builder::storeTermVectorPositions, JsonpDeserializer.booleanDeserializer(), "store_term_vector_positions");
         op.add(Builder::storeTermVectors, JsonpDeserializer.booleanDeserializer(), "store_term_vectors");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.analyzer.hashCode();
+        result = 31 * result + Boolean.hashCode(this.enabled);
+        result = 31 * result + Boolean.hashCode(this.omitNorms);
+        result = 31 * result + this.searchAnalyzer.hashCode();
+        result = 31 * result + this.similarity.hashCode();
+        result = 31 * result + Boolean.hashCode(this.store);
+        result = 31 * result + Boolean.hashCode(this.storeTermVectorOffsets);
+        result = 31 * result + Boolean.hashCode(this.storeTermVectorPayloads);
+        result = 31 * result + Boolean.hashCode(this.storeTermVectorPositions);
+        result = 31 * result + Boolean.hashCode(this.storeTermVectors);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        AllField other = (AllField) o;
+        return this.analyzer.equals(other.analyzer)
+            && this.enabled == other.enabled
+            && this.omitNorms == other.omitNorms
+            && this.searchAnalyzer.equals(other.searchAnalyzer)
+            && this.similarity.equals(other.similarity)
+            && this.store == other.store
+            && this.storeTermVectorOffsets == other.storeTermVectorOffsets
+            && this.storeTermVectorPayloads == other.storeTermVectorPayloads
+            && this.storeTermVectorPositions == other.storeTermVectorPositions
+            && this.storeTermVectors == other.storeTermVectors;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DataStreamTimestamp.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DataStreamTimestamp.java
new file mode 100644
index 0000000000..d1d9962ea4
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DataStreamTimestamp.java
@@ -0,0 +1,146 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types.mapping;
+
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Generated;
+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.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ObjectBuilderBase;
+
+// typedef: _types.mapping.DataStreamTimestamp
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class DataStreamTimestamp implements PlainJsonSerializable {
+
+    private final boolean enabled;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DataStreamTimestamp(Builder builder) {
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+    }
+
+    public static DataStreamTimestamp of(Function<DataStreamTimestamp.Builder, ObjectBuilder<DataStreamTimestamp>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * 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.writeKey("enabled");
+        generator.write(this.enabled);
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DataStreamTimestamp}.
+     */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DataStreamTimestamp> {
+        private Boolean enabled;
+
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DataStreamTimestamp}.
+         *
+         * @throws NullPointerException if some of the required fields are null.
+         */
+        public DataStreamTimestamp build() {
+            _checkSingleUse();
+
+            return new DataStreamTimestamp(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DataStreamTimestamp}
+     */
+    public static final JsonpDeserializer<DataStreamTimestamp> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStreamTimestamp::setupDataStreamTimestampDeserializer
+    );
+
+    protected static void setupDataStreamTimestampDeserializer(ObjectDeserializer<DataStreamTimestamp.Builder> op) {
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+    }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Boolean.hashCode(this.enabled);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DataStreamTimestamp other = (DataStreamTimestamp) o;
+        return this.enabled == other.enabled;
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
index 0fe589b4c6..4daab1db6f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
@@ -30,22 +30,28 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.mapping.DynamicMapping
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum DynamicMapping implements JsonEnum {
-    Strict("strict"),
-
-    Runtime("runtime"),
+    False("false"),
 
-    True("true"),
+    Strict("strict"),
 
-    False("false"),
+    StrictAllowTemplates("strict_allow_templates"),
 
-    ;
+    True("true");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
index 568ee8a3b3..5c45222d1b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -47,7 +53,9 @@
 // typedef: _types.mapping.DynamicTemplate
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DynamicTemplate implements PlainJsonSerializable {
+
     @Nullable
     private final Property mapping;
 
@@ -72,7 +80,6 @@ public class DynamicTemplate implements PlainJsonSerializable {
     // ---------------------------------------------------------------------------------------------
 
     private DynamicTemplate(Builder builder) {
-
         this.mapping = builder.mapping;
         this.match = builder.match;
         this.matchMappingType = builder.matchMappingType;
@@ -80,10 +87,9 @@ private DynamicTemplate(Builder builder) {
         this.pathMatch = builder.pathMatch;
         this.pathUnmatch = builder.pathUnmatch;
         this.unmatch = builder.unmatch;
-
     }
 
-    public static DynamicTemplate of(Function<Builder, ObjectBuilder<DynamicTemplate>> fn) {
+    public static DynamicTemplate of(Function<DynamicTemplate.Builder, ObjectBuilder<DynamicTemplate>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -146,6 +152,7 @@ public final String unmatch() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -153,42 +160,40 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.mapping != null) {
             generator.writeKey("mapping");
             this.mapping.serialize(generator, mapper);
-
         }
+
         if (this.match != null) {
             generator.writeKey("match");
             generator.write(this.match);
-
         }
+
         if (this.matchMappingType != null) {
             generator.writeKey("match_mapping_type");
             generator.write(this.matchMappingType);
-
         }
+
         if (this.matchPattern != null) {
             generator.writeKey("match_pattern");
             this.matchPattern.serialize(generator, mapper);
         }
+
         if (this.pathMatch != null) {
             generator.writeKey("path_match");
             generator.write(this.pathMatch);
-
         }
+
         if (this.pathUnmatch != null) {
             generator.writeKey("path_unmatch");
             generator.write(this.pathUnmatch);
-
         }
+
         if (this.unmatch != null) {
             generator.writeKey("unmatch");
             generator.write(this.unmatch);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -196,26 +201,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link DynamicTemplate}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DynamicTemplate> {
         @Nullable
         private Property mapping;
-
         @Nullable
         private String match;
-
         @Nullable
         private String matchMappingType;
-
         @Nullable
         private MatchType matchPattern;
-
         @Nullable
         private String pathMatch;
-
         @Nullable
         private String pathUnmatch;
-
         @Nullable
         private String unmatch;
 
@@ -231,7 +229,7 @@ public final Builder mapping(@Nullable Property value) {
          * API name: {@code mapping}
          */
         public final Builder mapping(Function<Property.Builder, ObjectBuilder<Property>> fn) {
-            return this.mapping(fn.apply(new Property.Builder()).build());
+            return mapping(fn.apply(new Property.Builder()).build());
         }
 
         /**
@@ -285,8 +283,7 @@ public final Builder unmatch(@Nullable String value) {
         /**
          * Builds a {@link DynamicTemplate}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public DynamicTemplate build() {
             _checkSingleUse();
@@ -306,7 +303,6 @@ public DynamicTemplate build() {
     );
 
     protected static void setupDynamicTemplateDeserializer(ObjectDeserializer<DynamicTemplate.Builder> op) {
-
         op.add(Builder::mapping, Property._DESERIALIZER, "mapping");
         op.add(Builder::match, JsonpDeserializer.stringDeserializer(), "match");
         op.add(Builder::matchMappingType, JsonpDeserializer.stringDeserializer(), "match_mapping_type");
@@ -314,7 +310,30 @@ protected static void setupDynamicTemplateDeserializer(ObjectDeserializer<Dynami
         op.add(Builder::pathMatch, JsonpDeserializer.stringDeserializer(), "path_match");
         op.add(Builder::pathUnmatch, JsonpDeserializer.stringDeserializer(), "path_unmatch");
         op.add(Builder::unmatch, JsonpDeserializer.stringDeserializer(), "unmatch");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.mapping);
+        result = 31 * result + Objects.hashCode(this.match);
+        result = 31 * result + Objects.hashCode(this.matchMappingType);
+        result = 31 * result + Objects.hashCode(this.matchPattern);
+        result = 31 * result + Objects.hashCode(this.pathMatch);
+        result = 31 * result + Objects.hashCode(this.pathUnmatch);
+        result = 31 * result + Objects.hashCode(this.unmatch);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DynamicTemplate other = (DynamicTemplate) o;
+        return Objects.equals(this.mapping, other.mapping)
+            && Objects.equals(this.match, other.match)
+            && Objects.equals(this.matchMappingType, other.matchMappingType)
+            && Objects.equals(this.matchPattern, other.matchPattern)
+            && Objects.equals(this.pathMatch, other.pathMatch)
+            && Objects.equals(this.pathUnmatch, other.pathUnmatch)
+            && Objects.equals(this.unmatch, other.unmatch);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
index 9dc6cd084c..ddd9b1efa2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -47,18 +52,18 @@
 // typedef: _types.mapping.FieldNamesField
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class FieldNamesField implements PlainJsonSerializable {
+
     private final boolean enabled;
 
     // ---------------------------------------------------------------------------------------------
 
     private FieldNamesField(Builder builder) {
-
         this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
-
     }
 
-    public static FieldNamesField of(Function<Builder, ObjectBuilder<FieldNamesField>> fn) {
+    public static FieldNamesField of(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -72,6 +77,7 @@ public final boolean enabled() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -79,10 +85,8 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.writeKey("enabled");
         generator.write(this.enabled);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +94,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link FieldNamesField}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldNamesField> {
         private Boolean enabled;
 
@@ -105,8 +108,7 @@ public final Builder enabled(boolean value) {
         /**
          * Builds a {@link FieldNamesField}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public FieldNamesField build() {
             _checkSingleUse();
@@ -126,9 +128,19 @@ public FieldNamesField build() {
     );
 
     protected static void setupFieldNamesFieldDeserializer(ObjectDeserializer<FieldNamesField.Builder> op) {
-
         op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Boolean.hashCode(this.enabled);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        FieldNamesField other = (FieldNamesField) o;
+        return this.enabled == other.enabled;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
index 47900c18c0..81f694e05c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -47,18 +52,18 @@
 // typedef: _types.mapping.IndexField
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class IndexField implements PlainJsonSerializable {
+
     private final boolean enabled;
 
     // ---------------------------------------------------------------------------------------------
 
     private IndexField(Builder builder) {
-
         this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
-
     }
 
-    public static IndexField of(Function<Builder, ObjectBuilder<IndexField>> fn) {
+    public static IndexField of(Function<IndexField.Builder, ObjectBuilder<IndexField>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -72,6 +77,7 @@ public final boolean enabled() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -79,10 +85,8 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.writeKey("enabled");
         generator.write(this.enabled);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +94,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link IndexField}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexField> {
         private Boolean enabled;
 
@@ -105,8 +108,7 @@ public final Builder enabled(boolean value) {
         /**
          * Builds a {@link IndexField}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public IndexField build() {
             _checkSingleUse();
@@ -126,9 +128,19 @@ public IndexField build() {
     );
 
     protected static void setupIndexFieldDeserializer(ObjectDeserializer<IndexField.Builder> op) {
-
         op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Boolean.hashCode(this.enabled);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IndexField other = (IndexField) o;
+        return this.enabled == other.enabled;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
index b4a3f1330b..5a57d96751 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.mapping.MatchType
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum MatchType implements JsonEnum {
-    Simple("simple"),
-
     Regex("regex"),
 
-    ;
+    Simple("simple");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
index 3882835104..ec25339cb6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -47,18 +52,18 @@
 // typedef: _types.mapping.RoutingField
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class RoutingField implements PlainJsonSerializable {
+
     private final boolean required;
 
     // ---------------------------------------------------------------------------------------------
 
     private RoutingField(Builder builder) {
-
         this.required = ApiTypeHelper.requireNonNull(builder.required, this, "required");
-
     }
 
-    public static RoutingField of(Function<Builder, ObjectBuilder<RoutingField>> fn) {
+    public static RoutingField of(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -72,6 +77,7 @@ public final boolean required() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -79,10 +85,8 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.writeKey("required");
         generator.write(this.required);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +94,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link RoutingField}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RoutingField> {
         private Boolean required;
 
@@ -105,8 +108,7 @@ public final Builder required(boolean value) {
         /**
          * Builds a {@link RoutingField}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public RoutingField build() {
             _checkSingleUse();
@@ -126,9 +128,19 @@ public RoutingField build() {
     );
 
     protected static void setupRoutingFieldDeserializer(ObjectDeserializer<RoutingField.Builder> op) {
-
         op.add(Builder::required, JsonpDeserializer.booleanDeserializer(), "required");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Boolean.hashCode(this.required);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RoutingField other = (RoutingField) o;
+        return this.required == other.required;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
new file mode 100644
index 0000000000..a9f9431537
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
@@ -0,0 +1,389 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types.mapping;
+
+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;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
+import org.opensearch.client.opensearch._types.Script;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ObjectBuilderBase;
+
+// typedef: _types.mapping.RuntimeField
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class RuntimeField implements PlainJsonSerializable {
+
+    @Nonnull
+    private final List<RuntimeFieldFetchFields> fetchFields;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final String inputField;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final String targetField;
+
+    @Nullable
+    private final String targetIndex;
+
+    @Nonnull
+    private final RuntimeFieldType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RuntimeField(Builder builder) {
+        this.fetchFields = ApiTypeHelper.unmodifiable(builder.fetchFields);
+        this.format = builder.format;
+        this.inputField = builder.inputField;
+        this.script = builder.script;
+        this.targetField = builder.targetField;
+        this.targetIndex = builder.targetIndex;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+    }
+
+    public static RuntimeField of(Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * For type <code>lookup</code>
+     * <p>
+     * API name: {@code fetch_fields}
+     * </p>
+     */
+    @Nonnull
+    public final List<RuntimeFieldFetchFields> fetchFields() {
+        return this.fetchFields;
+    }
+
+    /**
+     * A custom format for <code>date</code> type runtime fields.
+     * <p>
+     * API name: {@code format}
+     * </p>
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code input_field}
+     */
+    @Nullable
+    public final String inputField() {
+        return this.inputField;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    /**
+     * API name: {@code target_index}
+     */
+    @Nullable
+    public final String targetIndex() {
+        return this.targetIndex;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    @Nonnull
+    public final RuntimeFieldType type() {
+        return this.type;
+    }
+
+    /**
+     * 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) {
+        if (ApiTypeHelper.isDefined(this.fetchFields)) {
+            generator.writeKey("fetch_fields");
+            generator.writeStartArray();
+            for (RuntimeFieldFetchFields item0 : this.fetchFields) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+        }
+
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+        }
+
+        if (this.inputField != null) {
+            generator.writeKey("input_field");
+            generator.write(this.inputField);
+        }
+
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+        }
+
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+        }
+
+        if (this.targetIndex != null) {
+            generator.writeKey("target_index");
+            generator.write(this.targetIndex);
+        }
+
+        generator.writeKey("type");
+        this.type.serialize(generator, mapper);
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RuntimeField}.
+     */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeField> {
+        @Nullable
+        private List<RuntimeFieldFetchFields> fetchFields;
+        @Nullable
+        private String format;
+        @Nullable
+        private String inputField;
+        @Nullable
+        private Script script;
+        @Nullable
+        private String targetField;
+        @Nullable
+        private String targetIndex;
+        private RuntimeFieldType type;
+
+        /**
+         * For type <code>lookup</code>
+         * <p>
+         * API name: {@code fetch_fields}
+         * </p>
+         *
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fetchFields</code>.
+         * </p>
+         */
+        public final Builder fetchFields(List<RuntimeFieldFetchFields> list) {
+            this.fetchFields = _listAddAll(this.fetchFields, list);
+            return this;
+        }
+
+        /**
+         * For type <code>lookup</code>
+         * <p>
+         * API name: {@code fetch_fields}
+         * </p>
+         *
+         * <p>
+         * Adds one or more values to <code>fetchFields</code>.
+         * </p>
+         */
+        public final Builder fetchFields(RuntimeFieldFetchFields value, RuntimeFieldFetchFields... values) {
+            this.fetchFields = _listAdd(this.fetchFields, value, values);
+            return this;
+        }
+
+        /**
+         * For type <code>lookup</code>
+         * <p>
+         * API name: {@code fetch_fields}
+         * </p>
+         *
+         * <p>
+         * Adds a value to <code>fetchFields</code> using a builder lambda.
+         * </p>
+         */
+        public final Builder fetchFields(Function<RuntimeFieldFetchFields.Builder, ObjectBuilder<RuntimeFieldFetchFields>> fn) {
+            return fetchFields(fn.apply(new RuntimeFieldFetchFields.Builder()).build());
+        }
+
+        /**
+         * A custom format for <code>date</code> type runtime fields.
+         * <p>
+         * API name: {@code format}
+         * </p>
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code input_field}
+         */
+        public final Builder inputField(@Nullable String value) {
+            this.inputField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_index}
+         */
+        public final Builder targetIndex(@Nullable String value) {
+            this.targetIndex = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(RuntimeFieldType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RuntimeField}.
+         *
+         * @throws NullPointerException if some of the required fields are null.
+         */
+        public RuntimeField build() {
+            _checkSingleUse();
+
+            return new RuntimeField(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RuntimeField}
+     */
+    public static final JsonpDeserializer<RuntimeField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RuntimeField::setupRuntimeFieldDeserializer
+    );
+
+    protected static void setupRuntimeFieldDeserializer(ObjectDeserializer<RuntimeField.Builder> op) {
+        op.add(Builder::fetchFields, JsonpDeserializer.arrayDeserializer(RuntimeFieldFetchFields._DESERIALIZER), "fetch_fields");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::inputField, JsonpDeserializer.stringDeserializer(), "input_field");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+        op.add(Builder::targetIndex, JsonpDeserializer.stringDeserializer(), "target_index");
+        op.add(Builder::type, RuntimeFieldType._DESERIALIZER, "type");
+    }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.fetchFields);
+        result = 31 * result + Objects.hashCode(this.format);
+        result = 31 * result + Objects.hashCode(this.inputField);
+        result = 31 * result + Objects.hashCode(this.script);
+        result = 31 * result + Objects.hashCode(this.targetField);
+        result = 31 * result + Objects.hashCode(this.targetIndex);
+        result = 31 * result + this.type.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RuntimeField other = (RuntimeField) o;
+        return Objects.equals(this.fetchFields, other.fetchFields)
+            && Objects.equals(this.format, other.format)
+            && Objects.equals(this.inputField, other.inputField)
+            && Objects.equals(this.script, other.script)
+            && Objects.equals(this.targetField, other.targetField)
+            && Objects.equals(this.targetIndex, other.targetIndex)
+            && this.type.equals(other.type);
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldFetchFields.java
similarity index 58%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldFetchFields.java
index e7bf93979c..e5e1b703a2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldFetchFields.java
@@ -30,10 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 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;
@@ -41,63 +48,53 @@
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.json.PlainJsonSerializable;
-import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-// typedef: _types.mapping.RuntimeField
+// typedef: _types.mapping.RuntimeFieldFetchFields
 
 @JsonpDeserializable
-public class RuntimeField implements PlainJsonSerializable {
-    @Nullable
-    private final String format;
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class RuntimeFieldFetchFields implements PlainJsonSerializable {
 
-    @Nullable
-    private final Script script;
+    @Nonnull
+    private final String field;
 
-    private final RuntimeFieldType type;
+    @Nullable
+    private final String format;
 
     // ---------------------------------------------------------------------------------------------
 
-    private RuntimeField(Builder builder) {
-
+    private RuntimeFieldFetchFields(Builder builder) {
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
         this.format = builder.format;
-        this.script = builder.script;
-        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
     }
 
-    public static RuntimeField of(Function<Builder, ObjectBuilder<RuntimeField>> fn) {
+    public static RuntimeFieldFetchFields of(Function<RuntimeFieldFetchFields.Builder, ObjectBuilder<RuntimeFieldFetchFields>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * API name: {@code format}
+     * Required - API name: {@code field}
      */
-    @Nullable
-    public final String format() {
-        return this.format;
+    @Nonnull
+    public final String field() {
+        return this.field;
     }
 
     /**
-     * API name: {@code script}
+     * API name: {@code format}
      */
     @Nullable
-    public final Script script() {
-        return this.script;
-    }
-
-    /**
-     * Required - API name: {@code type}
-     */
-    public final RuntimeFieldType type() {
-        return this.type;
+    public final String format() {
+        return this.format;
     }
 
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -105,97 +102,79 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey("field");
+        generator.write(this.field);
 
         if (this.format != null) {
             generator.writeKey("format");
             generator.write(this.format);
-
         }
-        if (this.script != null) {
-            generator.writeKey("script");
-            this.script.serialize(generator, mapper);
-
-        }
-        generator.writeKey("type");
-        this.type.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
 
     /**
-     * Builder for {@link RuntimeField}.
+     * Builder for {@link RuntimeFieldFetchFields}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeField> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeFieldFetchFields> {
+        private String field;
         @Nullable
         private String format;
 
-        @Nullable
-        private Script script;
-
-        private RuntimeFieldType type;
-
-        /**
-         * API name: {@code format}
-         */
-        public final Builder format(@Nullable String value) {
-            this.format = value;
-            return this;
-        }
-
         /**
-         * API name: {@code script}
+         * Required - API name: {@code field}
          */
-        public final Builder script(@Nullable Script value) {
-            this.script = value;
+        public final Builder field(String value) {
+            this.field = value;
             return this;
         }
 
         /**
-         * API name: {@code script}
-         */
-        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-            return this.script(fn.apply(new Script.Builder()).build());
-        }
-
-        /**
-         * Required - API name: {@code type}
+         * API name: {@code format}
          */
-        public final Builder type(RuntimeFieldType value) {
-            this.type = value;
+        public final Builder format(@Nullable String value) {
+            this.format = value;
             return this;
         }
 
         /**
-         * Builds a {@link RuntimeField}.
+         * Builds a {@link RuntimeFieldFetchFields}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
-        public RuntimeField build() {
+        public RuntimeFieldFetchFields build() {
             _checkSingleUse();
 
-            return new RuntimeField(this);
+            return new RuntimeFieldFetchFields(this);
         }
     }
 
     // ---------------------------------------------------------------------------------------------
 
     /**
-     * Json deserializer for {@link RuntimeField}
+     * Json deserializer for {@link RuntimeFieldFetchFields}
      */
-    public static final JsonpDeserializer<RuntimeField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+    public static final JsonpDeserializer<RuntimeFieldFetchFields> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
         Builder::new,
-        RuntimeField::setupRuntimeFieldDeserializer
+        RuntimeFieldFetchFields::setupRuntimeFieldFetchFieldsDeserializer
     );
 
-    protected static void setupRuntimeFieldDeserializer(ObjectDeserializer<RuntimeField.Builder> op) {
-
+    protected static void setupRuntimeFieldFetchFieldsDeserializer(ObjectDeserializer<RuntimeFieldFetchFields.Builder> op) {
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
         op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-        op.add(Builder::script, Script._DESERIALIZER, "script");
-        op.add(Builder::type, RuntimeFieldType._DESERIALIZER, "type");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.field.hashCode();
+        result = 31 * result + Objects.hashCode(this.format);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RuntimeFieldFetchFields other = (RuntimeFieldFetchFields) o;
+        return this.field.equals(other.field) && Objects.equals(this.format, other.format);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
similarity index 84%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
index d71067ca2e..df06d57661 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
@@ -30,12 +30,20 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.mapping.RuntimeFieldType
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum RuntimeFieldType implements JsonEnum {
     Boolean("boolean"),
 
@@ -51,7 +59,7 @@ public enum RuntimeFieldType implements JsonEnum {
 
     Long("long"),
 
-    ;
+    Lookup("lookup");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
index c0f633dbb1..86f71dc211 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -47,18 +52,18 @@
 // typedef: _types.mapping.SizeField
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class SizeField implements PlainJsonSerializable {
+
     private final boolean enabled;
 
     // ---------------------------------------------------------------------------------------------
 
     private SizeField(Builder builder) {
-
         this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
-
     }
 
-    public static SizeField of(Function<Builder, ObjectBuilder<SizeField>> fn) {
+    public static SizeField of(Function<SizeField.Builder, ObjectBuilder<SizeField>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -72,6 +77,7 @@ public final boolean enabled() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -79,10 +85,8 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.writeKey("enabled");
         generator.write(this.enabled);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +94,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link SizeField}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SizeField> {
         private Boolean enabled;
 
@@ -105,8 +108,7 @@ public final Builder enabled(boolean value) {
         /**
          * Builds a {@link SizeField}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public SizeField build() {
             _checkSingleUse();
@@ -126,9 +128,19 @@ public SizeField build() {
     );
 
     protected static void setupSizeFieldDeserializer(ObjectDeserializer<SizeField.Builder> op) {
-
         op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Boolean.hashCode(this.enabled);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SizeField other = (SizeField) o;
+        return this.enabled == other.enabled;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
similarity index 77%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
index 6ff76552f3..fc419b5be8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 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;
@@ -50,7 +57,9 @@
 // typedef: _types.mapping.SourceField
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class SourceField implements PlainJsonSerializable {
+
     @Nullable
     private final Boolean compress;
 
@@ -60,23 +69,27 @@ public class SourceField implements PlainJsonSerializable {
     @Nullable
     private final Boolean enabled;
 
+    @Nonnull
     private final List<String> excludes;
 
+    @Nonnull
     private final List<String> includes;
 
+    @Nullable
+    private final SourceFieldMode mode;
+
     // ---------------------------------------------------------------------------------------------
 
     private SourceField(Builder builder) {
-
         this.compress = builder.compress;
         this.compressThreshold = builder.compressThreshold;
         this.enabled = builder.enabled;
         this.excludes = ApiTypeHelper.unmodifiable(builder.excludes);
         this.includes = ApiTypeHelper.unmodifiable(builder.includes);
-
+        this.mode = builder.mode;
     }
 
-    public static SourceField of(Function<Builder, ObjectBuilder<SourceField>> fn) {
+    public static SourceField of(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -107,6 +120,7 @@ public final Boolean enabled() {
     /**
      * API name: {@code excludes}
      */
+    @Nonnull
     public final List<String> excludes() {
         return this.excludes;
     }
@@ -114,13 +128,23 @@ public final List<String> excludes() {
     /**
      * API name: {@code includes}
      */
+    @Nonnull
     public final List<String> includes() {
         return this.includes;
     }
 
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final SourceFieldMode mode() {
+        return this.mode;
+    }
+
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -128,43 +152,43 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.compress != null) {
             generator.writeKey("compress");
             generator.write(this.compress);
-
         }
+
         if (this.compressThreshold != null) {
             generator.writeKey("compress_threshold");
             generator.write(this.compressThreshold);
-
         }
+
         if (this.enabled != null) {
             generator.writeKey("enabled");
             generator.write(this.enabled);
-
         }
+
         if (ApiTypeHelper.isDefined(this.excludes)) {
             generator.writeKey("excludes");
             generator.writeStartArray();
             for (String item0 : this.excludes) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (ApiTypeHelper.isDefined(this.includes)) {
             generator.writeKey("includes");
             generator.writeStartArray();
             for (String item0 : this.includes) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
 
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -172,22 +196,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link SourceField}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceField>, PlainDeserializable<Builder> {
+        @Override
+        public Builder self() {
+            return this;
+        }
+
         @Nullable
         private Boolean compress;
-
         @Nullable
         private String compressThreshold;
-
         @Nullable
         private Boolean enabled;
-
         @Nullable
         private List<String> excludes;
-
         @Nullable
         private List<String> includes;
+        @Nullable
+        private SourceFieldMode mode;
 
         /**
          * API name: {@code compress}
@@ -215,8 +241,10 @@ public final Builder enabled(@Nullable Boolean value) {
 
         /**
          * API name: {@code excludes}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>excludes</code>.
+         * </p>
          */
         public final Builder excludes(List<String> list) {
             this.excludes = _listAddAll(this.excludes, list);
@@ -225,8 +253,10 @@ public final Builder excludes(List<String> list) {
 
         /**
          * API name: {@code excludes}
+         *
          * <p>
          * Adds one or more values to <code>excludes</code>.
+         * </p>
          */
         public final Builder excludes(String value, String... values) {
             this.excludes = _listAdd(this.excludes, value, values);
@@ -235,8 +265,10 @@ public final Builder excludes(String value, String... values) {
 
         /**
          * API name: {@code includes}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>includes</code>.
+         * </p>
          */
         public final Builder includes(List<String> list) {
             this.includes = _listAddAll(this.includes, list);
@@ -245,30 +277,34 @@ public final Builder includes(List<String> list) {
 
         /**
          * API name: {@code includes}
+         *
          * <p>
          * Adds one or more values to <code>includes</code>.
+         * </p>
          */
         public final Builder includes(String value, String... values) {
             this.includes = _listAdd(this.includes, value, values);
             return this;
         }
 
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable SourceFieldMode value) {
+            this.mode = value;
+            return this;
+        }
+
         /**
          * Builds a {@link SourceField}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public SourceField build() {
             _checkSingleUse();
 
             return new SourceField(this);
         }
-
-        @Override
-        public Builder self() {
-            return this;
-        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -282,13 +318,34 @@ public Builder self() {
     );
 
     protected static void setupSourceFieldDeserializer(ObjectDeserializer<SourceField.Builder> op) {
-
         op.add(Builder::compress, JsonpDeserializer.booleanDeserializer(), "compress");
         op.add(Builder::compressThreshold, JsonpDeserializer.stringDeserializer(), "compress_threshold");
         op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
         op.add(Builder::excludes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "excludes");
         op.add(Builder::includes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "includes");
+        op.add(Builder::mode, SourceFieldMode._DESERIALIZER, "mode");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.compress);
+        result = 31 * result + Objects.hashCode(this.compressThreshold);
+        result = 31 * result + Objects.hashCode(this.enabled);
+        result = 31 * result + Objects.hashCode(this.excludes);
+        result = 31 * result + Objects.hashCode(this.includes);
+        result = 31 * result + Objects.hashCode(this.mode);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SourceField other = (SourceField) o;
+        return Objects.equals(this.compress, other.compress)
+            && Objects.equals(this.compressThreshold, other.compressThreshold)
+            && Objects.equals(this.enabled, other.enabled)
+            && Objects.equals(this.excludes, other.excludes)
+            && Objects.equals(this.includes, other.includes)
+            && Objects.equals(this.mode, other.mode);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceFieldMode.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceFieldMode.java
new file mode 100644
index 0000000000..f8ad5b9276
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/SourceFieldMode.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types.mapping;
+
+import javax.annotation.Generated;
+import org.opensearch.client.json.JsonEnum;
+import org.opensearch.client.json.JsonpDeserializable;
+
+// typedef: _types.mapping.SourceFieldMode
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public enum SourceFieldMode implements JsonEnum {
+    Disabled("disabled"),
+
+    Stored("stored"),
+
+    Synthetic("synthetic");
+
+    private final String jsonValue;
+
+    SourceFieldMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
+
+    public String jsonValue() {
+        return this.jsonValue;
+    }
+
+    public static final JsonEnum.Deserializer<SourceFieldMode> _DESERIALIZER = new JsonEnum.Deserializer<>(SourceFieldMode.values());
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
index cbc74c0013..ac8ffe6444 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
@@ -30,12 +30,19 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.mapping;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.Map;
+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.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -52,70 +59,79 @@
 // typedef: _types.mapping.TypeMapping
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class TypeMapping implements PlainJsonSerializable {
+
     @Nullable
     private final AllField allField;
 
+    @Nullable
+    private final DataStreamTimestamp dataStreamTimestamp;
+
     @Nullable
     private final Boolean dateDetection;
 
     @Nullable
     private final DynamicMapping dynamic;
 
+    @Nonnull
     private final List<String> dynamicDateFormats;
 
+    @Nonnull
     private final List<Map<String, DynamicTemplate>> dynamicTemplates;
 
+    @Nullable
+    private final Boolean enabled;
+
     @Nullable
     private final FieldNamesField fieldNames;
 
     @Nullable
     private final IndexField indexField;
 
+    @Nonnull
     private final Map<String, JsonData> meta;
 
     @Nullable
     private final Boolean numericDetection;
 
+    @Nonnull
     private final Map<String, Property> properties;
 
     @Nullable
     private final RoutingField routing;
 
+    @Nonnull
+    private final Map<String, RuntimeField> runtime;
+
     @Nullable
     private final SizeField size;
 
     @Nullable
     private final SourceField source;
 
-    private final Map<String, RuntimeField> runtime;
-
-    @Nullable
-    private final Boolean enabled;
-
     // ---------------------------------------------------------------------------------------------
 
     private TypeMapping(Builder builder) {
-
         this.allField = builder.allField;
+        this.dataStreamTimestamp = builder.dataStreamTimestamp;
         this.dateDetection = builder.dateDetection;
         this.dynamic = builder.dynamic;
         this.dynamicDateFormats = ApiTypeHelper.unmodifiable(builder.dynamicDateFormats);
         this.dynamicTemplates = ApiTypeHelper.unmodifiable(builder.dynamicTemplates);
+        this.enabled = builder.enabled;
         this.fieldNames = builder.fieldNames;
         this.indexField = builder.indexField;
         this.meta = ApiTypeHelper.unmodifiable(builder.meta);
         this.numericDetection = builder.numericDetection;
         this.properties = ApiTypeHelper.unmodifiable(builder.properties);
         this.routing = builder.routing;
+        this.runtime = ApiTypeHelper.unmodifiable(builder.runtime);
         this.size = builder.size;
         this.source = builder.source;
-        this.runtime = ApiTypeHelper.unmodifiable(builder.runtime);
-        this.enabled = builder.enabled;
-
     }
 
-    public static TypeMapping of(Function<Builder, ObjectBuilder<TypeMapping>> fn) {
+    public static TypeMapping of(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -127,6 +143,14 @@ public final AllField allField() {
         return this.allField;
     }
 
+    /**
+     * API name: {@code _data_stream_timestamp}
+     */
+    @Nullable
+    public final DataStreamTimestamp dataStreamTimestamp() {
+        return this.dataStreamTimestamp;
+    }
+
     /**
      * API name: {@code date_detection}
      */
@@ -146,6 +170,7 @@ public final DynamicMapping dynamic() {
     /**
      * API name: {@code dynamic_date_formats}
      */
+    @Nonnull
     public final List<String> dynamicDateFormats() {
         return this.dynamicDateFormats;
     }
@@ -153,10 +178,19 @@ public final List<String> dynamicDateFormats() {
     /**
      * API name: {@code dynamic_templates}
      */
+    @Nonnull
     public final List<Map<String, DynamicTemplate>> dynamicTemplates() {
         return this.dynamicTemplates;
     }
 
+    /**
+     * API name: {@code enabled}
+     */
+    @Nullable
+    public final Boolean enabled() {
+        return this.enabled;
+    }
+
     /**
      * API name: {@code _field_names}
      */
@@ -176,6 +210,7 @@ public final IndexField indexField() {
     /**
      * API name: {@code _meta}
      */
+    @Nonnull
     public final Map<String, JsonData> meta() {
         return this.meta;
     }
@@ -191,6 +226,7 @@ public final Boolean numericDetection() {
     /**
      * API name: {@code properties}
      */
+    @Nonnull
     public final Map<String, Property> properties() {
         return this.properties;
     }
@@ -203,6 +239,14 @@ public final RoutingField routing() {
         return this.routing;
     }
 
+    /**
+     * API name: {@code runtime}
+     */
+    @Nonnull
+    public final Map<String, RuntimeField> runtime() {
+        return this.runtime;
+    }
+
     /**
      * API name: {@code _size}
      */
@@ -219,24 +263,10 @@ public final SourceField source() {
         return this.source;
     }
 
-    /**
-     * API name: {@code runtime}
-     */
-    public final Map<String, RuntimeField> runtime() {
-        return this.runtime;
-    }
-
-    /**
-     * API name: {@code enabled}
-     */
-    @Nullable
-    public final Boolean enabled() {
-        return this.enabled;
-    }
-
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -244,31 +274,35 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.allField != null) {
             generator.writeKey("all_field");
             this.allField.serialize(generator, mapper);
+        }
 
+        if (this.dataStreamTimestamp != null) {
+            generator.writeKey("_data_stream_timestamp");
+            this.dataStreamTimestamp.serialize(generator, mapper);
         }
+
         if (this.dateDetection != null) {
             generator.writeKey("date_detection");
             generator.write(this.dateDetection);
-
         }
+
         if (this.dynamic != null) {
             generator.writeKey("dynamic");
             this.dynamic.serialize(generator, mapper);
         }
+
         if (ApiTypeHelper.isDefined(this.dynamicDateFormats)) {
             generator.writeKey("dynamic_date_formats");
             generator.writeStartArray();
             for (String item0 : this.dynamicDateFormats) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (ApiTypeHelper.isDefined(this.dynamicTemplates)) {
             generator.writeKey("dynamic_templates");
             generator.writeStartArray();
@@ -278,84 +312,77 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
                     for (Map.Entry<String, DynamicTemplate> item1 : item0.entrySet()) {
                         generator.writeKey(item1.getKey());
                         item1.getValue().serialize(generator, mapper);
-
                     }
                 }
                 generator.writeEnd();
-
             }
             generator.writeEnd();
+        }
 
+        if (this.enabled != null) {
+            generator.writeKey("enabled");
+            generator.write(this.enabled);
         }
+
         if (this.fieldNames != null) {
             generator.writeKey("_field_names");
             this.fieldNames.serialize(generator, mapper);
-
         }
+
         if (this.indexField != null) {
             generator.writeKey("index_field");
             this.indexField.serialize(generator, mapper);
-
         }
+
         if (ApiTypeHelper.isDefined(this.meta)) {
             generator.writeKey("_meta");
             generator.writeStartObject();
             for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.numericDetection != null) {
             generator.writeKey("numeric_detection");
             generator.write(this.numericDetection);
-
         }
+
         if (ApiTypeHelper.isDefined(this.properties)) {
             generator.writeKey("properties");
             generator.writeStartObject();
             for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.routing != null) {
             generator.writeKey("_routing");
             this.routing.serialize(generator, mapper);
-
         }
-        if (this.size != null) {
-            generator.writeKey("_size");
-            this.size.serialize(generator, mapper);
 
-        }
-        if (this.source != null) {
-            generator.writeKey("_source");
-            this.source.serialize(generator, mapper);
-
-        }
         if (ApiTypeHelper.isDefined(this.runtime)) {
             generator.writeKey("runtime");
             generator.writeStartObject();
             for (Map.Entry<String, RuntimeField> item0 : this.runtime.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
-        if (this.enabled != null) {
-            generator.writeKey("enabled");
-            generator.write(this.enabled);
 
+        if (this.size != null) {
+            generator.writeKey("_size");
+            this.size.serialize(generator, mapper);
         }
 
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -363,53 +390,45 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link TypeMapping}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeMapping>, PlainDeserializable<Builder> {
+        @Override
+        public Builder self() {
+            return this;
+        }
+
         @Nullable
         private AllField allField;
-
+        @Nullable
+        private DataStreamTimestamp dataStreamTimestamp;
         @Nullable
         private Boolean dateDetection;
-
         @Nullable
         private DynamicMapping dynamic;
-
         @Nullable
         private List<String> dynamicDateFormats;
-
         @Nullable
         private List<Map<String, DynamicTemplate>> dynamicTemplates;
-
+        @Nullable
+        private Boolean enabled;
         @Nullable
         private FieldNamesField fieldNames;
-
         @Nullable
         private IndexField indexField;
-
         @Nullable
         private Map<String, JsonData> meta;
-
         @Nullable
         private Boolean numericDetection;
-
         @Nullable
         private Map<String, Property> properties;
-
         @Nullable
         private RoutingField routing;
-
+        @Nullable
+        private Map<String, RuntimeField> runtime;
         @Nullable
         private SizeField size;
-
         @Nullable
         private SourceField source;
 
-        @Nullable
-        private Map<String, RuntimeField> runtime;
-
-        @Nullable
-        private Boolean enabled;
-
         /**
          * API name: {@code all_field}
          */
@@ -422,7 +441,22 @@ public final Builder allField(@Nullable AllField value) {
          * API name: {@code all_field}
          */
         public final Builder allField(Function<AllField.Builder, ObjectBuilder<AllField>> fn) {
-            return this.allField(fn.apply(new AllField.Builder()).build());
+            return allField(fn.apply(new AllField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _data_stream_timestamp}
+         */
+        public final Builder dataStreamTimestamp(@Nullable DataStreamTimestamp value) {
+            this.dataStreamTimestamp = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _data_stream_timestamp}
+         */
+        public final Builder dataStreamTimestamp(Function<DataStreamTimestamp.Builder, ObjectBuilder<DataStreamTimestamp>> fn) {
+            return dataStreamTimestamp(fn.apply(new DataStreamTimestamp.Builder()).build());
         }
 
         /**
@@ -443,8 +477,10 @@ public final Builder dynamic(@Nullable DynamicMapping value) {
 
         /**
          * API name: {@code dynamic_date_formats}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>dynamicDateFormats</code>.
+         * </p>
          */
         public final Builder dynamicDateFormats(List<String> list) {
             this.dynamicDateFormats = _listAddAll(this.dynamicDateFormats, list);
@@ -453,8 +489,10 @@ public final Builder dynamicDateFormats(List<String> list) {
 
         /**
          * API name: {@code dynamic_date_formats}
+         *
          * <p>
          * Adds one or more values to <code>dynamicDateFormats</code>.
+         * </p>
          */
         public final Builder dynamicDateFormats(String value, String... values) {
             this.dynamicDateFormats = _listAdd(this.dynamicDateFormats, value, values);
@@ -463,8 +501,10 @@ public final Builder dynamicDateFormats(String value, String... values) {
 
         /**
          * API name: {@code dynamic_templates}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>dynamicTemplates</code>.
+         * </p>
          */
         public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
             this.dynamicTemplates = _listAddAll(this.dynamicTemplates, list);
@@ -473,14 +513,24 @@ public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
 
         /**
          * API name: {@code dynamic_templates}
+         *
          * <p>
          * Adds one or more values to <code>dynamicTemplates</code>.
+         * </p>
          */
         public final Builder dynamicTemplates(Map<String, DynamicTemplate> value, Map<String, DynamicTemplate>... values) {
             this.dynamicTemplates = _listAdd(this.dynamicTemplates, value, values);
             return this;
         }
 
+        /**
+         * API name: {@code enabled}
+         */
+        public final Builder enabled(@Nullable Boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
         /**
          * API name: {@code _field_names}
          */
@@ -493,7 +543,7 @@ public final Builder fieldNames(@Nullable FieldNamesField value) {
          * API name: {@code _field_names}
          */
         public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
-            return this.fieldNames(fn.apply(new FieldNamesField.Builder()).build());
+            return fieldNames(fn.apply(new FieldNamesField.Builder()).build());
         }
 
         /**
@@ -508,13 +558,15 @@ public final Builder indexField(@Nullable IndexField value) {
          * API name: {@code index_field}
          */
         public final Builder indexField(Function<IndexField.Builder, ObjectBuilder<IndexField>> fn) {
-            return this.indexField(fn.apply(new IndexField.Builder()).build());
+            return indexField(fn.apply(new IndexField.Builder()).build());
         }
 
         /**
          * API name: {@code _meta}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>meta</code>.
+         * Adds all elements of <code>map</code> to <code>meta</code>.
+         * </p>
          */
         public final Builder meta(Map<String, JsonData> map) {
             this.meta = _mapPutAll(this.meta, map);
@@ -523,8 +575,10 @@ public final Builder meta(Map<String, JsonData> map) {
 
         /**
          * API name: {@code _meta}
+         *
          * <p>
          * Adds an entry to <code>meta</code>.
+         * </p>
          */
         public final Builder meta(String key, JsonData value) {
             this.meta = _mapPut(this.meta, key, value);
@@ -541,8 +595,10 @@ public final Builder numericDetection(@Nullable Boolean value) {
 
         /**
          * API name: {@code properties}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>properties</code>.
+         * Adds all elements of <code>map</code> to <code>properties</code>.
+         * </p>
          */
         public final Builder properties(Map<String, Property> map) {
             this.properties = _mapPutAll(this.properties, map);
@@ -551,8 +607,10 @@ public final Builder properties(Map<String, Property> map) {
 
         /**
          * API name: {@code properties}
+         *
          * <p>
          * Adds an entry to <code>properties</code>.
+         * </p>
          */
         public final Builder properties(String key, Property value) {
             this.properties = _mapPut(this.properties, key, value);
@@ -561,8 +619,10 @@ public final Builder properties(String key, Property value) {
 
         /**
          * API name: {@code properties}
+         *
          * <p>
-         * Adds an entry to <code>properties</code> using a builder lambda.
+         * Adds a value to <code>properties</code> using a builder lambda.
+         * </p>
          */
         public final Builder properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
             return properties(key, fn.apply(new Property.Builder()).build());
@@ -580,43 +640,15 @@ public final Builder routing(@Nullable RoutingField value) {
          * API name: {@code _routing}
          */
         public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
-            return this.routing(fn.apply(new RoutingField.Builder()).build());
-        }
-
-        /**
-         * API name: {@code _size}
-         */
-        public final Builder size(@Nullable SizeField value) {
-            this.size = value;
-            return this;
-        }
-
-        /**
-         * API name: {@code _size}
-         */
-        public final Builder size(Function<SizeField.Builder, ObjectBuilder<SizeField>> fn) {
-            return this.size(fn.apply(new SizeField.Builder()).build());
-        }
-
-        /**
-         * API name: {@code _source}
-         */
-        public final Builder source(@Nullable SourceField value) {
-            this.source = value;
-            return this;
-        }
-
-        /**
-         * API name: {@code _source}
-         */
-        public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
-            return this.source(fn.apply(new SourceField.Builder()).build());
+            return routing(fn.apply(new RoutingField.Builder()).build());
         }
 
         /**
          * API name: {@code runtime}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>runtime</code>.
+         * Adds all elements of <code>map</code> to <code>runtime</code>.
+         * </p>
          */
         public final Builder runtime(Map<String, RuntimeField> map) {
             this.runtime = _mapPutAll(this.runtime, map);
@@ -625,8 +657,10 @@ public final Builder runtime(Map<String, RuntimeField> map) {
 
         /**
          * API name: {@code runtime}
+         *
          * <p>
          * Adds an entry to <code>runtime</code>.
+         * </p>
          */
         public final Builder runtime(String key, RuntimeField value) {
             this.runtime = _mapPut(this.runtime, key, value);
@@ -635,37 +669,55 @@ public final Builder runtime(String key, RuntimeField value) {
 
         /**
          * API name: {@code runtime}
+         *
          * <p>
-         * Adds an entry to <code>runtime</code> using a builder lambda.
+         * Adds a value to <code>runtime</code> using a builder lambda.
+         * </p>
          */
         public final Builder runtime(String key, Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
             return runtime(key, fn.apply(new RuntimeField.Builder()).build());
         }
 
         /**
-         * API name: {@code enabled}
+         * API name: {@code _size}
          */
-        public final Builder enabled(@Nullable Boolean value) {
-            this.enabled = value;
+        public final Builder size(@Nullable SizeField value) {
+            this.size = value;
             return this;
         }
 
+        /**
+         * API name: {@code _size}
+         */
+        public final Builder size(Function<SizeField.Builder, ObjectBuilder<SizeField>> fn) {
+            return size(fn.apply(new SizeField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceField value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
+            return source(fn.apply(new SourceField.Builder()).build());
+        }
+
         /**
          * Builds a {@link TypeMapping}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public TypeMapping build() {
             _checkSingleUse();
 
             return new TypeMapping(this);
         }
-
-        @Override
-        public Builder self() {
-            return this;
-        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -679,8 +731,8 @@ public Builder self() {
     );
 
     protected static void setupTypeMappingDeserializer(ObjectDeserializer<TypeMapping.Builder> op) {
-
         op.add(Builder::allField, AllField._DESERIALIZER, "all_field");
+        op.add(Builder::dataStreamTimestamp, DataStreamTimestamp._DESERIALIZER, "_data_stream_timestamp");
         op.add(Builder::dateDetection, JsonpDeserializer.booleanDeserializer(), "date_detection");
         op.add(Builder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
         op.add(
@@ -693,17 +745,58 @@ protected static void setupTypeMappingDeserializer(ObjectDeserializer<TypeMappin
             JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(DynamicTemplate._DESERIALIZER)),
             "dynamic_templates"
         );
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
         op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
         op.add(Builder::indexField, IndexField._DESERIALIZER, "index_field");
         op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
         op.add(Builder::numericDetection, JsonpDeserializer.booleanDeserializer(), "numeric_detection");
         op.add(Builder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "properties");
         op.add(Builder::routing, RoutingField._DESERIALIZER, "_routing");
+        op.add(Builder::runtime, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime");
         op.add(Builder::size, SizeField._DESERIALIZER, "_size");
         op.add(Builder::source, SourceField._DESERIALIZER, "_source");
-        op.add(Builder::runtime, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime");
-        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.allField);
+        result = 31 * result + Objects.hashCode(this.dataStreamTimestamp);
+        result = 31 * result + Objects.hashCode(this.dateDetection);
+        result = 31 * result + Objects.hashCode(this.dynamic);
+        result = 31 * result + Objects.hashCode(this.dynamicDateFormats);
+        result = 31 * result + Objects.hashCode(this.dynamicTemplates);
+        result = 31 * result + Objects.hashCode(this.enabled);
+        result = 31 * result + Objects.hashCode(this.fieldNames);
+        result = 31 * result + Objects.hashCode(this.indexField);
+        result = 31 * result + Objects.hashCode(this.meta);
+        result = 31 * result + Objects.hashCode(this.numericDetection);
+        result = 31 * result + Objects.hashCode(this.properties);
+        result = 31 * result + Objects.hashCode(this.routing);
+        result = 31 * result + Objects.hashCode(this.runtime);
+        result = 31 * result + Objects.hashCode(this.size);
+        result = 31 * result + Objects.hashCode(this.source);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TypeMapping other = (TypeMapping) o;
+        return Objects.equals(this.allField, other.allField)
+            && Objects.equals(this.dataStreamTimestamp, other.dataStreamTimestamp)
+            && Objects.equals(this.dateDetection, other.dateDetection)
+            && Objects.equals(this.dynamic, other.dynamic)
+            && Objects.equals(this.dynamicDateFormats, other.dynamicDateFormats)
+            && Objects.equals(this.dynamicTemplates, other.dynamicTemplates)
+            && Objects.equals(this.enabled, other.enabled)
+            && Objects.equals(this.fieldNames, other.fieldNames)
+            && Objects.equals(this.indexField, other.indexField)
+            && Objects.equals(this.meta, other.meta)
+            && Objects.equals(this.numericDetection, other.numericDetection)
+            && Objects.equals(this.properties, other.properties)
+            && Objects.equals(this.routing, other.routing)
+            && Objects.equals(this.runtime, other.runtime)
+            && Objects.equals(this.size, other.size)
+            && Objects.equals(this.source, other.source);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/Alias.java
similarity index 52%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/Alias.java
index 075e7d9885..39c2c3421b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/Alias.java
@@ -30,10 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices;
 
 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;
@@ -42,18 +50,21 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch._types.query_dsl.Query;
+import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-// typedef: indices._types.Alias
+// typedef: indices.Alias
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class Alias implements PlainJsonSerializable {
+
     @Nullable
     private final Query filter;
 
-    @Nullable
-    private final String indexRouting;
+    @Nonnull
+    private final List<String> indexRouting;
 
     @Nullable
     private final Boolean isHidden;
@@ -61,26 +72,24 @@ public class Alias implements PlainJsonSerializable {
     @Nullable
     private final Boolean isWriteIndex;
 
-    @Nullable
-    private final String routing;
+    @Nonnull
+    private final List<String> routing;
 
-    @Nullable
-    private final String searchRouting;
+    @Nonnull
+    private final List<String> searchRouting;
 
     // ---------------------------------------------------------------------------------------------
 
     private Alias(Builder builder) {
-
         this.filter = builder.filter;
-        this.indexRouting = builder.indexRouting;
+        this.indexRouting = ApiTypeHelper.unmodifiable(builder.indexRouting);
         this.isHidden = builder.isHidden;
         this.isWriteIndex = builder.isWriteIndex;
-        this.routing = builder.routing;
-        this.searchRouting = builder.searchRouting;
-
+        this.routing = ApiTypeHelper.unmodifiable(builder.routing);
+        this.searchRouting = ApiTypeHelper.unmodifiable(builder.searchRouting);
     }
 
-    public static Alias of(Function<Builder, ObjectBuilder<Alias>> fn) {
+    public static Alias of(Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -95,13 +104,16 @@ public final Query filter() {
     /**
      * API name: {@code index_routing}
      */
-    @Nullable
-    public final String indexRouting() {
+    @Nonnull
+    public final List<String> indexRouting() {
         return this.indexRouting;
     }
 
     /**
+     * If <code>true</code>, the alias is hidden. All indices for the alias must have the same <code>is_hidden</code> value.
+     * <p>
      * API name: {@code is_hidden}
+     * </p>
      */
     @Nullable
     public final Boolean isHidden() {
@@ -109,7 +121,10 @@ public final Boolean isHidden() {
     }
 
     /**
+     * If <code>true</code>, the index is the write index for the alias.
+     * <p>
      * API name: {@code is_write_index}
+     * </p>
      */
     @Nullable
     public final Boolean isWriteIndex() {
@@ -119,22 +134,23 @@ public final Boolean isWriteIndex() {
     /**
      * API name: {@code routing}
      */
-    @Nullable
-    public final String routing() {
+    @Nonnull
+    public final List<String> routing() {
         return this.routing;
     }
 
     /**
      * API name: {@code search_routing}
      */
-    @Nullable
-    public final String searchRouting() {
+    @Nonnull
+    public final List<String> searchRouting() {
         return this.searchRouting;
     }
 
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -142,38 +158,47 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.filter != null) {
             generator.writeKey("filter");
             this.filter.serialize(generator, mapper);
-
         }
-        if (this.indexRouting != null) {
-            generator.writeKey("index_routing");
-            generator.write(this.indexRouting);
 
+        if (ApiTypeHelper.isDefined(this.indexRouting)) {
+            generator.writeKey("index_routing");
+            generator.writeStartArray();
+            for (String item0 : this.indexRouting) {
+                generator.write(item0);
+            }
+            generator.writeEnd();
         }
+
         if (this.isHidden != null) {
             generator.writeKey("is_hidden");
             generator.write(this.isHidden);
-
         }
+
         if (this.isWriteIndex != null) {
             generator.writeKey("is_write_index");
             generator.write(this.isWriteIndex);
-
         }
-        if (this.routing != null) {
-            generator.writeKey("routing");
-            generator.write(this.routing);
 
+        if (ApiTypeHelper.isDefined(this.routing)) {
+            generator.writeKey("routing");
+            generator.writeStartArray();
+            for (String item0 : this.routing) {
+                generator.write(item0);
+            }
+            generator.writeEnd();
         }
-        if (this.searchRouting != null) {
-            generator.writeKey("search_routing");
-            generator.write(this.searchRouting);
 
+        if (ApiTypeHelper.isDefined(this.searchRouting)) {
+            generator.writeKey("search_routing");
+            generator.writeStartArray();
+            for (String item0 : this.searchRouting) {
+                generator.write(item0);
+            }
+            generator.writeEnd();
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -181,25 +206,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link Alias}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Alias> {
         @Nullable
         private Query filter;
-
         @Nullable
-        private String indexRouting;
-
+        private List<String> indexRouting;
         @Nullable
         private Boolean isHidden;
-
         @Nullable
         private Boolean isWriteIndex;
-
         @Nullable
-        private String routing;
-
+        private List<String> routing;
         @Nullable
-        private String searchRouting;
+        private List<String> searchRouting;
 
         /**
          * API name: {@code filter}
@@ -213,19 +232,38 @@ public final Builder filter(@Nullable Query value) {
          * API name: {@code filter}
          */
         public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-            return this.filter(fn.apply(new Query.Builder()).build());
+            return filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index_routing}
+         *
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexRouting</code>.
+         * </p>
+         */
+        public final Builder indexRouting(List<String> list) {
+            this.indexRouting = _listAddAll(this.indexRouting, list);
+            return this;
         }
 
         /**
          * API name: {@code index_routing}
+         *
+         * <p>
+         * Adds one or more values to <code>indexRouting</code>.
+         * </p>
          */
-        public final Builder indexRouting(@Nullable String value) {
-            this.indexRouting = value;
+        public final Builder indexRouting(String value, String... values) {
+            this.indexRouting = _listAdd(this.indexRouting, value, values);
             return this;
         }
 
         /**
+         * If <code>true</code>, the alias is hidden. All indices for the alias must have the same <code>is_hidden</code> value.
+         * <p>
          * API name: {@code is_hidden}
+         * </p>
          */
         public final Builder isHidden(@Nullable Boolean value) {
             this.isHidden = value;
@@ -233,7 +271,10 @@ public final Builder isHidden(@Nullable Boolean value) {
         }
 
         /**
+         * If <code>true</code>, the index is the write index for the alias.
+         * <p>
          * API name: {@code is_write_index}
+         * </p>
          */
         public final Builder isWriteIndex(@Nullable Boolean value) {
             this.isWriteIndex = value;
@@ -242,25 +283,56 @@ public final Builder isWriteIndex(@Nullable Boolean value) {
 
         /**
          * API name: {@code routing}
+         *
+         * <p>
+         * Adds all elements of <code>list</code> to <code>routing</code>.
+         * </p>
+         */
+        public final Builder routing(List<String> list) {
+            this.routing = _listAddAll(this.routing, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         *
+         * <p>
+         * Adds one or more values to <code>routing</code>.
+         * </p>
+         */
+        public final Builder routing(String value, String... values) {
+            this.routing = _listAdd(this.routing, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code search_routing}
+         *
+         * <p>
+         * Adds all elements of <code>list</code> to <code>searchRouting</code>.
+         * </p>
          */
-        public final Builder routing(@Nullable String value) {
-            this.routing = value;
+        public final Builder searchRouting(List<String> list) {
+            this.searchRouting = _listAddAll(this.searchRouting, list);
             return this;
         }
 
         /**
          * API name: {@code search_routing}
+         *
+         * <p>
+         * Adds one or more values to <code>searchRouting</code>.
+         * </p>
          */
-        public final Builder searchRouting(@Nullable String value) {
-            this.searchRouting = value;
+        public final Builder searchRouting(String value, String... values) {
+            this.searchRouting = _listAdd(this.searchRouting, value, values);
             return this;
         }
 
         /**
          * Builds a {@link Alias}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public Alias build() {
             _checkSingleUse();
@@ -280,14 +352,34 @@ public Alias build() {
     );
 
     protected static void setupAliasDeserializer(ObjectDeserializer<Alias.Builder> op) {
-
         op.add(Builder::filter, Query._DESERIALIZER, "filter");
-        op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
+        op.add(Builder::indexRouting, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_routing");
         op.add(Builder::isHidden, JsonpDeserializer.booleanDeserializer(), "is_hidden");
         op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
-        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-        op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
+        op.add(Builder::routing, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "routing");
+        op.add(Builder::searchRouting, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "search_routing");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.filter);
+        result = 31 * result + Objects.hashCode(this.indexRouting);
+        result = 31 * result + Objects.hashCode(this.isHidden);
+        result = 31 * result + Objects.hashCode(this.isWriteIndex);
+        result = 31 * result + Objects.hashCode(this.routing);
+        result = 31 * result + Objects.hashCode(this.searchRouting);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Alias other = (Alias) o;
+        return Objects.equals(this.filter, other.filter)
+            && Objects.equals(this.indexRouting, other.indexRouting)
+            && Objects.equals(this.isHidden, other.isHidden)
+            && Objects.equals(this.isWriteIndex, other.isWriteIndex)
+            && Objects.equals(this.routing, other.routing)
+            && Objects.equals(this.searchRouting, other.searchRouting);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
similarity index 70%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
index 4049613f69..1d2501a3c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
@@ -30,13 +30,20 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
@@ -52,13 +59,17 @@
 
 /**
  * Returns information about one or more indices.
- *
  */
-
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetIndexRequest extends RequestBase {
+
     @Nullable
     private final Boolean allowNoIndices;
 
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nonnull
     private final List<ExpandWildcard> expandWildcards;
 
     @Nullable
@@ -70,6 +81,7 @@ public class GetIndexRequest extends RequestBase {
     @Nullable
     private final Boolean includeDefaults;
 
+    @Nonnull
     private final List<String> index;
 
     @Nullable
@@ -79,14 +91,11 @@ public class GetIndexRequest extends RequestBase {
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
     // ---------------------------------------------------------------------------------------------
 
     private GetIndexRequest(Builder builder) {
-
         this.allowNoIndices = builder.allowNoIndices;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
         this.flatSettings = builder.flatSettings;
         this.ignoreUnavailable = builder.ignoreUnavailable;
@@ -94,19 +103,19 @@ private GetIndexRequest(Builder builder) {
         this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
         this.local = builder.local;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
-
     }
 
-    public static GetIndexRequest of(Function<Builder, ObjectBuilder<GetIndexRequest>> fn) {
+    public static GetIndexRequest of(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Ignore if a wildcard expression resolves to no concrete indices (default:
-     * false)
+     * If false, the request returns an error if any wildcard expression, index alias, or _all value targets only missing or closed indices.
+     * This behavior applies even if the request targets other open indices. For example, a request targeting foo*,bar* returns an error if
+     * an index starts with foo but no index starts with bar.
      * <p>
      * API name: {@code allow_no_indices}
+     * </p>
      */
     @Nullable
     public final Boolean allowNoIndices() {
@@ -114,12 +123,24 @@ public final Boolean allowNoIndices() {
     }
 
     /**
-     * Type of index that wildcard expressions can match. If the request can target
-     * data streams, this argument determines whether wildcard expressions match
-     * hidden data streams. Supports comma-separated values, such as open,hidden.
+     * Operation timeout for connection to cluster-manager node.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     * </p>
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Type of index that wildcard expressions can match. If the request can target data streams, this argument determines whether wildcard
+     * expressions match hidden data streams. Supports comma-separated values, such as open,hidden.
      * <p>
      * API name: {@code expand_wildcards}
+     * </p>
      */
+    @Nonnull
     public final List<ExpandWildcard> expandWildcards() {
         return this.expandWildcards;
     }
@@ -128,6 +149,7 @@ public final List<ExpandWildcard> expandWildcards() {
      * If true, returns settings in flat format.
      * <p>
      * API name: {@code flat_settings}
+     * </p>
      */
     @Nullable
     public final Boolean flatSettings() {
@@ -138,6 +160,7 @@ public final Boolean flatSettings() {
      * If false, requests that target a missing index return an error.
      * <p>
      * API name: {@code ignore_unavailable}
+     * </p>
      */
     @Nullable
     public final Boolean ignoreUnavailable() {
@@ -148,6 +171,7 @@ public final Boolean ignoreUnavailable() {
      * If true, return all default settings in the response.
      * <p>
      * API name: {@code include_defaults}
+     * </p>
      */
     @Nullable
     public final Boolean includeDefaults() {
@@ -155,20 +179,23 @@ public final Boolean includeDefaults() {
     }
 
     /**
-     * Required - Comma-separated list of data streams, indices, and index aliases
-     * used to limit the request. Wildcard expressions (*) are supported.
+     * Required - Comma-separated list of data streams, indices, and index aliases used to limit the request. Wildcard expressions (*) are
+     * supported.
      * <p>
      * API name: {@code index}
+     * </p>
      */
+    @Nonnull
     public final List<String> index() {
         return this.index;
     }
 
     /**
-     * If true, the request retrieves information from the local node only. Defaults
-     * to false, which means information is retrieved from the cluster-manager node.
+     * If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the
+     * master node.
      * <p>
      * API name: {@code local}
+     * </p>
      */
     @Nullable
     public final Boolean local() {
@@ -176,10 +203,11 @@ public final Boolean local() {
     }
 
     /**
-     * Period to wait for a connection to the master node. If no response is
-     * received before the timeout expires, the request fails and returns an error.
+     * Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and
+     * returns an error.
      * <p>
      * API name: {@code master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -187,56 +215,37 @@ public final Time masterTimeout() {
         return this.masterTimeout;
     }
 
-    /**
-     * Period to wait for a connection to the cluster-manager node. If no response is
-     * received before the timeout expires, the request fails and returns an error.
-     * <p>
-     * API name: {@code cluster_manager_timeout}
-     */
-    @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
-    }
-
     // ---------------------------------------------------------------------------------------------
 
     /**
      * Builder for {@link GetIndexRequest}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexRequest> {
         @Nullable
         private Boolean allowNoIndices;
-
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private List<ExpandWildcard> expandWildcards;
-
         @Nullable
         private Boolean flatSettings;
-
         @Nullable
         private Boolean ignoreUnavailable;
-
         @Nullable
         private Boolean includeDefaults;
-
         private List<String> index;
-
         @Nullable
         private Boolean local;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
 
-        @Nullable
-        private Time clusterManagerTimeout;
-
         /**
-         * Ignore if a wildcard expression resolves to no concrete indices (default:
-         * false)
+         * If false, the request returns an error if any wildcard expression, index alias, or _all value targets only missing or closed
+         * indices. This behavior applies even if the request targets other open indices. For example, a request targeting foo*,bar* returns
+         * an error if an index starts with foo but no index starts with bar.
          * <p>
          * API name: {@code allow_no_indices}
+         * </p>
          */
         public final Builder allowNoIndices(@Nullable Boolean value) {
             this.allowNoIndices = value;
@@ -244,13 +253,36 @@ public final Builder allowNoIndices(@Nullable Boolean value) {
         }
 
         /**
-         * Type of index that wildcard expressions can match. If the request can target
-         * data streams, this argument determines whether wildcard expressions match
-         * hidden data streams. Supports comma-separated values, such as open,hidden.
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Type of index that wildcard expressions can match. If the request can target data streams, this argument determines whether
+         * wildcard expressions match hidden data streams. Supports comma-separated values, such as open,hidden.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         * </p>
          */
         public final Builder expandWildcards(List<ExpandWildcard> list) {
             this.expandWildcards = _listAddAll(this.expandWildcards, list);
@@ -258,13 +290,15 @@ public final Builder expandWildcards(List<ExpandWildcard> list) {
         }
 
         /**
-         * Type of index that wildcard expressions can match. If the request can target
-         * data streams, this argument determines whether wildcard expressions match
-         * hidden data streams. Supports comma-separated values, such as open,hidden.
+         * Type of index that wildcard expressions can match. If the request can target data streams, this argument determines whether
+         * wildcard expressions match hidden data streams. Supports comma-separated values, such as open,hidden.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>expandWildcards</code>.
+         * </p>
          */
         public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
             this.expandWildcards = _listAdd(this.expandWildcards, value, values);
@@ -275,6 +309,7 @@ public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... val
          * If true, returns settings in flat format.
          * <p>
          * API name: {@code flat_settings}
+         * </p>
          */
         public final Builder flatSettings(@Nullable Boolean value) {
             this.flatSettings = value;
@@ -285,6 +320,7 @@ public final Builder flatSettings(@Nullable Boolean value) {
          * If false, requests that target a missing index return an error.
          * <p>
          * API name: {@code ignore_unavailable}
+         * </p>
          */
         public final Builder ignoreUnavailable(@Nullable Boolean value) {
             this.ignoreUnavailable = value;
@@ -295,6 +331,7 @@ public final Builder ignoreUnavailable(@Nullable Boolean value) {
          * If true, return all default settings in the response.
          * <p>
          * API name: {@code include_defaults}
+         * </p>
          */
         public final Builder includeDefaults(@Nullable Boolean value) {
             this.includeDefaults = value;
@@ -302,12 +339,15 @@ public final Builder includeDefaults(@Nullable Boolean value) {
         }
 
         /**
-         * Required - Comma-separated list of data streams, indices, and index aliases
-         * used to limit the request. Wildcard expressions (*) are supported.
+         * Required - Comma-separated list of data streams, indices, and index aliases used to limit the request. Wildcard expressions (*)
+         * are supported.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>index</code>.
+         * </p>
          */
         public final Builder index(List<String> list) {
             this.index = _listAddAll(this.index, list);
@@ -315,12 +355,15 @@ public final Builder index(List<String> list) {
         }
 
         /**
-         * Required - Comma-separated list of data streams, indices, and index aliases
-         * used to limit the request. Wildcard expressions (*) are supported.
+         * Required - Comma-separated list of data streams, indices, and index aliases used to limit the request. Wildcard expressions (*)
+         * are supported.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>index</code>.
+         * </p>
          */
         public final Builder index(String value, String... values) {
             this.index = _listAdd(this.index, value, values);
@@ -328,10 +371,11 @@ public final Builder index(String value, String... values) {
         }
 
         /**
-         * If true, the request retrieves information from the local node only. Defaults
-         * to false, which means information is retrieved from the cluster-manager node.
+         * If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from
+         * the master node.
          * <p>
          * API name: {@code local}
+         * </p>
          */
         public final Builder local(@Nullable Boolean value) {
             this.local = value;
@@ -339,10 +383,11 @@ public final Builder local(@Nullable Boolean value) {
         }
 
         /**
-         * Period to wait for a connection to the master node. If no response is
-         * received before the timeout expires, the request fails and returns an error.
+         * Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and
+         * returns an error.
          * <p>
          * API name: {@code master_timeout}
+         * </p>
          */
         @Deprecated
         public final Builder masterTimeout(@Nullable Time value) {
@@ -351,42 +396,21 @@ public final Builder masterTimeout(@Nullable Time value) {
         }
 
         /**
-         * Period to wait for a connection to the master node. If no response is
-         * received before the timeout expires, the request fails and returns an error.
+         * Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and
+         * returns an error.
          * <p>
          * API name: {@code master_timeout}
+         * </p>
          */
         @Deprecated
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
-        }
-
-        /**
-         * Period to wait for a connection to the cluster-manager node. If no response is
-         * received before the timeout expires, the request fails and returns an error.
-         * <p>
-         * API name: {@code cluster_manager_timeout}
-         */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
-            return this;
-        }
-
-        /**
-         * Period to wait for a connection to the cluster-manager node. If no response is
-         * received before the timeout expires, the request fails and returns an error.
-         * <p>
-         * API name: {@code cluster_manager_timeout}
-         */
-        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
          * Builds a {@link GetIndexRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public GetIndexRequest build() {
             _checkSingleUse();
@@ -401,63 +425,75 @@ public GetIndexRequest build() {
      * Endpoint "{@code indices.get}".
      */
     public static final Endpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "GET";
-
-        },
-
+        request -> "GET",
         // Request path
         request -> {
-            final int _index = 1 << 0;
-
-            int propsSet = 0;
-
-            propsSet |= _index;
-
-            if (propsSet == (_index)) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                return buf.toString();
-            }
-            throw SimpleEndpoint.noPathTemplateFound("path");
-
+            StringBuilder buf = new StringBuilder();
+            buf.append("/");
+            SimpleEndpoint.pathEncode(String.join(",", request.index), buf);
+            return buf.toString();
         },
-
         // Request parameters
         request -> {
             Map<String, String> params = new HashMap<>();
-            if (request.masterTimeout != null) {
-                params.put("master_timeout", request.masterTimeout._toJsonString());
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
             }
             if (request.clusterManagerTimeout != null) {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
             }
-            if (request.flatSettings != null) {
-                params.put("flat_settings", String.valueOf(request.flatSettings));
-            }
             if (ApiTypeHelper.isDefined(request.expandWildcards)) {
                 params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
             }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
             if (request.ignoreUnavailable != null) {
                 params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
             }
-            if (request.allowNoIndices != null) {
-                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-            }
             if (request.includeDefaults != null) {
                 params.put("include_defaults", String.valueOf(request.includeDefaults));
             }
             if (request.local != null) {
                 params.put("local", String.valueOf(request.local));
             }
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
             return params;
-
         },
         SimpleEndpoint.emptyMap(),
         false,
         GetIndexResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.allowNoIndices);
+        result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
+        result = 31 * result + Objects.hashCode(this.expandWildcards);
+        result = 31 * result + Objects.hashCode(this.flatSettings);
+        result = 31 * result + Objects.hashCode(this.ignoreUnavailable);
+        result = 31 * result + Objects.hashCode(this.includeDefaults);
+        result = 31 * result + this.index.hashCode();
+        result = 31 * result + Objects.hashCode(this.local);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetIndexRequest other = (GetIndexRequest) o;
+        return Objects.equals(this.allowNoIndices, other.allowNoIndices)
+            && Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.expandWildcards, other.expandWildcards)
+            && Objects.equals(this.flatSettings, other.flatSettings)
+            && Objects.equals(this.ignoreUnavailable, other.ignoreUnavailable)
+            && Objects.equals(this.includeDefaults, other.includeDefaults)
+            && this.index.equals(other.index)
+            && Objects.equals(this.local, other.local)
+            && Objects.equals(this.masterTimeout, other.masterTimeout);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
similarity index 84%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
index 5cd71afc55..cc79d9cbda 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
@@ -30,9 +30,14 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices;
 
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -43,15 +48,15 @@
 // typedef: indices.get.Response
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetIndexResponse extends DictionaryResponse<String, IndexState> {
     // ---------------------------------------------------------------------------------------------
 
     private GetIndexResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static GetIndexResponse of(Function<Builder, ObjectBuilder<GetIndexResponse>> fn) {
+    public static GetIndexResponse of(Function<GetIndexResponse.Builder, ObjectBuilder<GetIndexResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -60,7 +65,6 @@ public static GetIndexResponse of(Function<Builder, ObjectBuilder<GetIndexRespon
     /**
      * Builder for {@link GetIndexResponse}.
      */
-
     public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexState, Builder>
         implements
             ObjectBuilder<GetIndexResponse> {
@@ -72,8 +76,7 @@ protected Builder self() {
         /**
          * Builds a {@link GetIndexResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public GetIndexResponse build() {
             _checkSingleUse();
@@ -95,8 +98,6 @@ public GetIndexResponse build() {
     );
 
     protected static void setupGetIndexResponseDeserializer(ObjectDeserializer<GetIndexResponse.Builder> op) {
-        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), IndexState._DESERIALIZER);
-
+        setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), IndexState._DESERIALIZER);
     }
-
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/IndexState.java
similarity index 81%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/IndexState.java
index d24e42858c..f91f77c97c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/IndexState.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+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;
@@ -47,85 +54,85 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-// typedef: indices._types.IndexState
+// typedef: indices.IndexState
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class IndexState implements PlainJsonSerializable {
+
+    @Nonnull
     private final Map<String, Alias> aliases;
 
     @Nullable
-    private final TypeMapping mappings;
+    private final String dataStream;
 
     @Nullable
-    private final IndexSettings settings;
+    private final IndexSettings defaults;
 
     @Nullable
-    private final IndexSettings defaults;
+    private final TypeMapping mappings;
 
     @Nullable
-    private final String dataStream;
+    private final IndexSettings settings;
 
     // ---------------------------------------------------------------------------------------------
 
     private IndexState(Builder builder) {
-
         this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.dataStream = builder.dataStream;
+        this.defaults = builder.defaults;
         this.mappings = builder.mappings;
         this.settings = builder.settings;
-        this.defaults = builder.defaults;
-        this.dataStream = builder.dataStream;
-
     }
 
-    public static IndexState of(Function<Builder, ObjectBuilder<IndexState>> fn) {
+    public static IndexState of(Function<IndexState.Builder, ObjectBuilder<IndexState>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
      * API name: {@code aliases}
      */
+    @Nonnull
     public final Map<String, Alias> aliases() {
         return this.aliases;
     }
 
     /**
-     * API name: {@code mappings}
+     * API name: {@code data_stream}
      */
     @Nullable
-    public final TypeMapping mappings() {
-        return this.mappings;
+    public final String dataStream() {
+        return this.dataStream;
     }
 
     /**
-     * API name: {@code settings}
+     * API name: {@code defaults}
      */
     @Nullable
-    public final IndexSettings settings() {
-        return this.settings;
+    public final IndexSettings defaults() {
+        return this.defaults;
     }
 
     /**
-     * Default settings, included when the request's <code>include_default</code> is
-     * <code>true</code>.
-     * <p>
-     * API name: {@code defaults}
+     * API name: {@code mappings}
      */
     @Nullable
-    public final IndexSettings defaults() {
-        return this.defaults;
+    public final TypeMapping mappings() {
+        return this.mappings;
     }
 
     /**
-     * API name: {@code data_stream}
+     * API name: {@code settings}
      */
     @Nullable
-    public final String dataStream() {
-        return this.dataStream;
+    public final IndexSettings settings() {
+        return this.settings;
     }
 
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -133,39 +140,35 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (ApiTypeHelper.isDefined(this.aliases)) {
             generator.writeKey("aliases");
             generator.writeStartObject();
             for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
-        if (this.mappings != null) {
-            generator.writeKey("mappings");
-            this.mappings.serialize(generator, mapper);
 
+        if (this.dataStream != null) {
+            generator.writeKey("data_stream");
+            generator.write(this.dataStream);
         }
-        if (this.settings != null) {
-            generator.writeKey("settings");
-            this.settings.serialize(generator, mapper);
 
-        }
         if (this.defaults != null) {
             generator.writeKey("defaults");
             this.defaults.serialize(generator, mapper);
-
         }
-        if (this.dataStream != null) {
-            generator.writeKey("data_stream");
-            generator.write(this.dataStream);
 
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
         }
 
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -173,27 +176,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link IndexState}.
      */
-
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexState> {
         @Nullable
         private Map<String, Alias> aliases;
-
         @Nullable
-        private TypeMapping mappings;
-
-        @Nullable
-        private IndexSettings settings;
-
+        private String dataStream;
         @Nullable
         private IndexSettings defaults;
-
         @Nullable
-        private String dataStream;
+        private TypeMapping mappings;
+        @Nullable
+        private IndexSettings settings;
 
         /**
          * API name: {@code aliases}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         * Adds all elements of <code>map</code> to <code>aliases</code>.
+         * </p>
          */
         public final Builder aliases(Map<String, Alias> map) {
             this.aliases = _mapPutAll(this.aliases, map);
@@ -202,8 +202,10 @@ public final Builder aliases(Map<String, Alias> map) {
 
         /**
          * API name: {@code aliases}
+         *
          * <p>
          * Adds an entry to <code>aliases</code>.
+         * </p>
          */
         public final Builder aliases(String key, Alias value) {
             this.aliases = _mapPut(this.aliases, key, value);
@@ -212,77 +214,72 @@ public final Builder aliases(String key, Alias value) {
 
         /**
          * API name: {@code aliases}
+         *
          * <p>
-         * Adds an entry to <code>aliases</code> using a builder lambda.
+         * Adds a value to <code>aliases</code> using a builder lambda.
+         * </p>
          */
         public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
             return aliases(key, fn.apply(new Alias.Builder()).build());
         }
 
         /**
-         * API name: {@code mappings}
+         * API name: {@code data_stream}
          */
-        public final Builder mappings(@Nullable TypeMapping value) {
-            this.mappings = value;
+        public final Builder dataStream(@Nullable String value) {
+            this.dataStream = value;
             return this;
         }
 
         /**
-         * API name: {@code mappings}
+         * API name: {@code defaults}
          */
-        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        public final Builder defaults(@Nullable IndexSettings value) {
+            this.defaults = value;
+            return this;
         }
 
         /**
-         * API name: {@code settings}
+         * API name: {@code defaults}
          */
-        public final Builder settings(@Nullable IndexSettings value) {
-            this.settings = value;
-            return this;
+        public final Builder defaults(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return defaults(fn.apply(new IndexSettings.Builder()).build());
         }
 
         /**
-         * API name: {@code settings}
+         * API name: {@code mappings}
          */
-        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
         }
 
         /**
-         * Default settings, included when the request's <code>include_default</code> is
-         * <code>true</code>.
-         * <p>
-         * API name: {@code defaults}
+         * API name: {@code mappings}
          */
-        public final Builder defaults(@Nullable IndexSettings value) {
-            this.defaults = value;
-            return this;
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return mappings(fn.apply(new TypeMapping.Builder()).build());
         }
 
         /**
-         * Default settings, included when the request's <code>include_default</code> is
-         * <code>true</code>.
-         * <p>
-         * API name: {@code defaults}
+         * API name: {@code settings}
          */
-        public final Builder defaults(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-            return this.defaults(fn.apply(new IndexSettings.Builder()).build());
+        public final Builder settings(@Nullable IndexSettings value) {
+            this.settings = value;
+            return this;
         }
 
         /**
-         * API name: {@code data_stream}
+         * API name: {@code settings}
          */
-        public final Builder dataStream(@Nullable String value) {
-            this.dataStream = value;
-            return this;
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return settings(fn.apply(new IndexSettings.Builder()).build());
         }
 
         /**
          * Builds a {@link IndexState}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public IndexState build() {
             _checkSingleUse();
@@ -302,13 +299,31 @@ public IndexState build() {
     );
 
     protected static void setupIndexStateDeserializer(ObjectDeserializer<IndexState.Builder> op) {
-
         op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::dataStream, JsonpDeserializer.stringDeserializer(), "data_stream");
+        op.add(Builder::defaults, IndexSettings._DESERIALIZER, "defaults");
         op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
         op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
-        op.add(Builder::defaults, IndexSettings._DESERIALIZER, "defaults");
-        op.add(Builder::dataStream, JsonpDeserializer.stringDeserializer(), "data_stream");
+    }
 
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.aliases);
+        result = 31 * result + Objects.hashCode(this.dataStream);
+        result = 31 * result + Objects.hashCode(this.defaults);
+        result = 31 * result + Objects.hashCode(this.mappings);
+        result = 31 * result + Objects.hashCode(this.settings);
+        return result;
     }
 
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IndexState other = (IndexState) o;
+        return Objects.equals(this.aliases, other.aliases)
+            && Objects.equals(this.dataStream, other.dataStream)
+            && Objects.equals(this.defaults, other.defaults)
+            && Objects.equals(this.mappings, other.mappings)
+            && Objects.equals(this.settings, other.settings);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClientBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClientBase.java
new file mode 100644
index 0000000000..c2c8de6ef6
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClientBase.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch.indices;
+
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nullable;
+import org.opensearch.client.ApiClient;
+import org.opensearch.client.opensearch._types.OpenSearchException;
+import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.transport.TransportOptions;
+import org.opensearch.client.util.ObjectBuilder;
+
+/**
+ * Client for the indices namespace.
+ */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public abstract class OpenSearchIndicesAsyncClientBase<Self extends OpenSearchIndicesAsyncClientBase<Self>> extends ApiClient<
+    OpenSearchTransport,
+    Self> {
+    public OpenSearchIndicesAsyncClientBase(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    // ----- Endpoint: indices.get
+
+    /**
+     * Returns information about one or more indices.
+     */
+    public CompletableFuture<GetIndexResponse> get(GetIndexRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, GetIndexRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns information about one or more indices.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetIndexRequest}
+     */
+    public final CompletableFuture<GetIndexResponse> get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return get(fn.apply(new GetIndexRequest.Builder()).build());
+    }
+}
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClientBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClientBase.java
new file mode 100644
index 0000000000..b0d7e141b6
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClientBase.java
@@ -0,0 +1,78 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch.indices;
+
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nullable;
+import org.opensearch.client.ApiClient;
+import org.opensearch.client.opensearch._types.OpenSearchException;
+import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.transport.TransportOptions;
+import org.opensearch.client.util.ObjectBuilder;
+
+/**
+ * Client for the indices namespace.
+ */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public abstract class OpenSearchIndicesClientBase<Self extends OpenSearchIndicesClientBase<Self>> extends ApiClient<
+    OpenSearchTransport,
+    Self> {
+    public OpenSearchIndicesClientBase(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    // ----- Endpoint: indices.get
+
+    /**
+     * Returns information about one or more indices.
+     */
+    public GetIndexResponse get(GetIndexRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, GetIndexRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns information about one or more indices.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetIndexRequest}
+     */
+    public final GetIndexResponse get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return get(fn.apply(new GetIndexRequest.Builder()).build());
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java
index a0aca846f8..78ffa50708 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java
@@ -120,7 +120,6 @@
 import org.opensearch.client.opensearch.core.pit.ListAllPitRequest;
 import org.opensearch.client.opensearch.core.pit.ListAllPitResponse;
 import org.opensearch.client.opensearch.features.OpenSearchFeaturesAsyncClient;
-import org.opensearch.client.opensearch.indices.OpenSearchIndicesAsyncClient;
 import org.opensearch.client.opensearch.ingest.OpenSearchIngestAsyncClient;
 import org.opensearch.client.opensearch.nodes.OpenSearchNodesAsyncClient;
 import org.opensearch.client.opensearch.shutdown.OpenSearchShutdownAsyncClient;
@@ -163,10 +162,6 @@ public OpenSearchFeaturesAsyncClient features() {
         return new OpenSearchFeaturesAsyncClient(this.transport, this.transportOptions);
     }
 
-    public OpenSearchIndicesAsyncClient indices() {
-        return new OpenSearchIndicesAsyncClient(this.transport, this.transportOptions);
-    }
-
     public OpenSearchIngestAsyncClient ingest() {
         return new OpenSearchIngestAsyncClient(this.transport, this.transportOptions);
     }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java
index 4327951b80..b783518ab7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java
@@ -120,7 +120,6 @@
 import org.opensearch.client.opensearch.core.pit.ListAllPitResponse;
 import org.opensearch.client.opensearch.features.OpenSearchFeaturesClient;
 import org.opensearch.client.opensearch.generic.OpenSearchGenericClient;
-import org.opensearch.client.opensearch.indices.OpenSearchIndicesClient;
 import org.opensearch.client.opensearch.ingest.OpenSearchIngestClient;
 import org.opensearch.client.opensearch.nodes.OpenSearchNodesClient;
 import org.opensearch.client.opensearch.shutdown.OpenSearchShutdownClient;
@@ -166,10 +165,6 @@ public OpenSearchFeaturesClient features() {
         return new OpenSearchFeaturesClient(this.transport, this.transportOptions);
     }
 
-    public OpenSearchIndicesClient indices() {
-        return new OpenSearchIndicesClient(this.transport, this.transportOptions);
-    }
-
     public OpenSearchIngestClient ingest() {
         return new OpenSearchIngestClient(this.transport, this.transportOptions);
     }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java
index d2a4087e40..0755cbd356 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java
@@ -36,7 +36,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import javax.annotation.Nullable;
-import org.opensearch.client.ApiClient;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
@@ -48,7 +47,7 @@
 /**
  * Client for the indices namespace.
  */
-public class OpenSearchIndicesAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchIndicesAsyncClient> {
+public class OpenSearchIndicesAsyncClient extends OpenSearchIndicesAsyncClientBase<OpenSearchIndicesAsyncClient> {
 
     public OpenSearchIndicesAsyncClient(OpenSearchTransport transport) {
         super(transport, null);
@@ -726,38 +725,6 @@ public CompletableFuture<ForcemergeResponse> forcemerge() throws IOException, Op
         );
     }
 
-    // ----- Endpoint: indices.get
-
-    /**
-     * Returns information about one or more indices.
-     *
-     *
-     */
-
-    public CompletableFuture<GetIndexResponse> get(GetIndexRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetIndexRequest,
-            GetIndexResponse,
-            ErrorResponse>) GetIndexRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns information about one or more indices.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetIndexRequest}
-     *
-     */
-
-    public final CompletableFuture<GetIndexResponse> get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn)
-        throws IOException, OpenSearchException {
-        return get(fn.apply(new GetIndexRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.get_data_stream
 
     /**
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java
index a3bdd52d4e..43e61e0c08 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java
@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.util.function.Function;
 import javax.annotation.Nullable;
-import org.opensearch.client.ApiClient;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
@@ -47,7 +46,7 @@
 /**
  * Client for the indices namespace.
  */
-public class OpenSearchIndicesClient extends ApiClient<OpenSearchTransport, OpenSearchIndicesClient> {
+public class OpenSearchIndicesClient extends OpenSearchIndicesClientBase<OpenSearchIndicesClient> {
 
     public OpenSearchIndicesClient(OpenSearchTransport transport) {
         super(transport, null);
@@ -702,38 +701,6 @@ public ForcemergeResponse forcemerge() throws IOException, OpenSearchException {
         return this.transport.performRequest(new ForcemergeRequest.Builder().build(), ForcemergeRequest._ENDPOINT, this.transportOptions);
     }
 
-    // ----- Endpoint: indices.get
-
-    /**
-     * Returns information about one or more indices.
-     *
-     *
-     */
-
-    public GetIndexResponse get(GetIndexRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetIndexRequest,
-            GetIndexResponse,
-            ErrorResponse>) GetIndexRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns information about one or more indices.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetIndexRequest}
-     *
-     */
-
-    public final GetIndexResponse get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn) throws IOException,
-        OpenSearchException {
-        return get(fn.apply(new GetIndexRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.get_data_stream
 
     /**
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java
index adbe18465c..e62d4cdf06 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java
@@ -61,8 +61,8 @@ public void testEnumWithBooleanSupport() {
         DynamicMapping booleanAsString = fromJson("\"true\"", DynamicMapping.class);
         assertEquals(booleanAsString, DynamicMapping.True);
 
-        DynamicMapping nonBooleanEnumValue = fromJson("\"runtime\"", DynamicMapping.class);
-        assertEquals(nonBooleanEnumValue, DynamicMapping.Runtime);
+        DynamicMapping nonBooleanEnumValue = fromJson("\"strict\"", DynamicMapping.class);
+        assertEquals(nonBooleanEnumValue, DynamicMapping.Strict);
 
         DynamicMapping booleanPrimitive = fromJson("false", DynamicMapping.class);
         assertEquals(booleanPrimitive, DynamicMapping.False);
diff --git a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
index f83247fa1b..c9f6a26e93 100644
--- a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
+++ b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
@@ -21,6 +21,7 @@
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.Result;
 import org.opensearch.client.opensearch._types.Script;
+import org.opensearch.client.opensearch._types.ScriptLanguage;
 import org.opensearch.client.opensearch.core.BulkRequest;
 import org.opensearch.client.opensearch.core.BulkResponse;
 import org.opensearch.client.opensearch.core.DeleteResponse;
@@ -340,7 +341,7 @@ public void testBulkUpdateScript() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(ScriptLanguage.Painless)
                                 .source("ctx._source.intValue += params.inc")
                                 .params("inc", JsonData.of(1))
                                 .build()
@@ -374,7 +375,7 @@ public void testBulkUpdateScriptUpsert() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(ScriptLanguage.Painless)
                                 .source("ctx._source.intValue += params.inc")
                                 .params("inc", JsonData.of(1))
                                 .build()
@@ -411,7 +412,7 @@ public void testBulkUpdateScriptedUpsertUpdate() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(ScriptLanguage.Painless)
                                 .source("ctx._source.intValue = ctx?._source?.intValue == null ? 7777 : 9999")
                                 .build()
                         )
@@ -441,7 +442,7 @@ public void testBulkUpdateScriptedUpsertInsert() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(ScriptLanguage.Painless)
                                 .source("ctx._source.intValue = ctx?._source?.intValue == null ? 7777 : 9999")
                                 .build()
                         )
diff --git a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
index de43d9fe05..38f25ec72c 100644
--- a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
+++ b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
@@ -26,6 +26,7 @@
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.opensearch._types.ScriptField;
+import org.opensearch.client.opensearch._types.ScriptLanguage;
 import org.opensearch.client.opensearch._types.SortOptions;
 import org.opensearch.client.opensearch._types.SortOrder;
 import org.opensearch.client.opensearch._types.query_dsl.FieldAndFormat;
@@ -208,7 +209,7 @@ public void shouldReturnMultiSearchesScriptFields() throws Exception {
             new ScriptField.Builder().script(
                 Script.of(
                     s -> s.inline(
-                        new InlineScript.Builder().lang("painless")
+                        new InlineScript.Builder().lang(ScriptLanguage.Painless)
                             .source("doc['quantity'].value + params.inc")
                             .params("inc", JsonData.of(1))
                             .build()
diff --git a/java-codegen/opensearch-openapi.yaml b/java-codegen/opensearch-openapi.yaml
index d0a8b5d22a..bf941cea24 100644
--- a/java-codegen/opensearch-openapi.yaml
+++ b/java-codegen/opensearch-openapi.yaml
@@ -337,6 +337,67 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/bulk@200'
+  /_bulk/stream:
+    post:
+      operationId: bulk_stream.0
+      x-operation-group: bulk_stream
+      x-version-added: '2.17'
+      description: Allows to perform multiple index/update/delete operations using request response streaming.
+      externalDocs:
+        url: https://opensearch.org/docs/latest/api-reference/document-apis/bulk-streaming/
+      parameters:
+        - $ref: '#/components/parameters/bulk_stream::query._source'
+        - $ref: '#/components/parameters/bulk_stream::query._source_excludes'
+        - $ref: '#/components/parameters/bulk_stream::query._source_includes'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_interval'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_size'
+        - $ref: '#/components/parameters/bulk_stream::query.pipeline'
+        - $ref: '#/components/parameters/bulk_stream::query.refresh'
+        - $ref: '#/components/parameters/bulk_stream::query.require_alias'
+        - $ref: '#/components/parameters/bulk_stream::query.routing'
+        - $ref: '#/components/parameters/bulk_stream::query.timeout'
+        - $ref: '#/components/parameters/bulk_stream::query.type'
+        - $ref: '#/components/parameters/bulk_stream::query.wait_for_active_shards'
+        - $ref: '#/components/parameters/_global::query.pretty'
+        - $ref: '#/components/parameters/_global::query.human'
+        - $ref: '#/components/parameters/_global::query.error_trace'
+        - $ref: '#/components/parameters/_global::query.source'
+        - $ref: '#/components/parameters/_global::query.filter_path'
+      requestBody:
+        $ref: '#/components/requestBodies/bulk_stream'
+      responses:
+        '200':
+          $ref: '#/components/responses/bulk_stream@200'
+    put:
+      operationId: bulk_stream.1
+      x-operation-group: bulk_stream
+      x-version-added: '2.17'
+      description: Allows to perform multiple index/update/delete operations using request response streaming.
+      externalDocs:
+        url: https://opensearch.org/docs/latest/api-reference/document-apis/bulk-streaming/
+      parameters:
+        - $ref: '#/components/parameters/bulk_stream::query._source'
+        - $ref: '#/components/parameters/bulk_stream::query._source_excludes'
+        - $ref: '#/components/parameters/bulk_stream::query._source_includes'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_interval'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_size'
+        - $ref: '#/components/parameters/bulk_stream::query.pipeline'
+        - $ref: '#/components/parameters/bulk_stream::query.refresh'
+        - $ref: '#/components/parameters/bulk_stream::query.require_alias'
+        - $ref: '#/components/parameters/bulk_stream::query.routing'
+        - $ref: '#/components/parameters/bulk_stream::query.timeout'
+        - $ref: '#/components/parameters/bulk_stream::query.type'
+        - $ref: '#/components/parameters/bulk_stream::query.wait_for_active_shards'
+        - $ref: '#/components/parameters/_global::query.pretty'
+        - $ref: '#/components/parameters/_global::query.human'
+        - $ref: '#/components/parameters/_global::query.error_trace'
+        - $ref: '#/components/parameters/_global::query.source'
+        - $ref: '#/components/parameters/_global::query.filter_path'
+      requestBody:
+        $ref: '#/components/requestBodies/bulk_stream'
+      responses:
+        '200':
+          $ref: '#/components/responses/bulk_stream@200'
   /_cache/clear:
     post:
       operationId: indices.clear_cache.0
@@ -9187,6 +9248,8 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/indices.delete@200'
+        '404':
+          $ref: '#/components/responses/indices.delete@404'
     get:
       operationId: indices.get.0
       x-operation-group: indices.get
@@ -9639,6 +9702,69 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/bulk@200'
+  /{index}/_bulk/stream:
+    post:
+      operationId: bulk_stream.2
+      x-operation-group: bulk_stream
+      x-version-added: '2.17'
+      description: Allows to perform multiple index/update/delete operations using request response streaming.
+      externalDocs:
+        url: https://opensearch.org/docs/latest/api-reference/document-apis/bulk-streaming/
+      parameters:
+        - $ref: '#/components/parameters/bulk_stream::path.index'
+        - $ref: '#/components/parameters/bulk_stream::query._source'
+        - $ref: '#/components/parameters/bulk_stream::query._source_excludes'
+        - $ref: '#/components/parameters/bulk_stream::query._source_includes'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_interval'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_size'
+        - $ref: '#/components/parameters/bulk_stream::query.pipeline'
+        - $ref: '#/components/parameters/bulk_stream::query.refresh'
+        - $ref: '#/components/parameters/bulk_stream::query.require_alias'
+        - $ref: '#/components/parameters/bulk_stream::query.routing'
+        - $ref: '#/components/parameters/bulk_stream::query.timeout'
+        - $ref: '#/components/parameters/bulk_stream::query.type'
+        - $ref: '#/components/parameters/bulk_stream::query.wait_for_active_shards'
+        - $ref: '#/components/parameters/_global::query.pretty'
+        - $ref: '#/components/parameters/_global::query.human'
+        - $ref: '#/components/parameters/_global::query.error_trace'
+        - $ref: '#/components/parameters/_global::query.source'
+        - $ref: '#/components/parameters/_global::query.filter_path'
+      requestBody:
+        $ref: '#/components/requestBodies/bulk_stream'
+      responses:
+        '200':
+          $ref: '#/components/responses/bulk_stream@200'
+    put:
+      operationId: bulk_stream.3
+      x-operation-group: bulk_stream
+      x-version-added: '2.17'
+      description: Allows to perform multiple index/update/delete operations using request response streaming.
+      externalDocs:
+        url: https://opensearch.org/docs/latest/api-reference/document-apis/bulk-streaming/
+      parameters:
+        - $ref: '#/components/parameters/bulk_stream::path.index'
+        - $ref: '#/components/parameters/bulk_stream::query._source'
+        - $ref: '#/components/parameters/bulk_stream::query._source_excludes'
+        - $ref: '#/components/parameters/bulk_stream::query._source_includes'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_interval'
+        - $ref: '#/components/parameters/bulk_stream::query.batch_size'
+        - $ref: '#/components/parameters/bulk_stream::query.pipeline'
+        - $ref: '#/components/parameters/bulk_stream::query.refresh'
+        - $ref: '#/components/parameters/bulk_stream::query.require_alias'
+        - $ref: '#/components/parameters/bulk_stream::query.routing'
+        - $ref: '#/components/parameters/bulk_stream::query.timeout'
+        - $ref: '#/components/parameters/bulk_stream::query.type'
+        - $ref: '#/components/parameters/bulk_stream::query.wait_for_active_shards'
+        - $ref: '#/components/parameters/_global::query.pretty'
+        - $ref: '#/components/parameters/_global::query.human'
+        - $ref: '#/components/parameters/_global::query.error_trace'
+        - $ref: '#/components/parameters/_global::query.source'
+        - $ref: '#/components/parameters/_global::query.filter_path'
+      requestBody:
+        $ref: '#/components/requestBodies/bulk_stream'
+      responses:
+        '200':
+          $ref: '#/components/responses/bulk_stream@200'
   /{index}/_cache/clear:
     post:
       operationId: indices.clear_cache.1
@@ -9985,6 +10111,8 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/delete@200'
+        '404':
+          $ref: '#/components/responses/delete@404'
     get:
       operationId: get.0
       x-operation-group: get
@@ -10013,6 +10141,8 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/get@200'
+        '404':
+          $ref: '#/components/responses/get@404'
     head:
       operationId: exists.0
       x-operation-group: exists
@@ -14213,6 +14343,108 @@ components:
       description: The amount of time that you plan to wait for the results.
       schema:
         type: string
+    bulk_stream::path.index:
+      in: path
+      name: index
+      description: Name of the data stream, index, or index alias to perform bulk actions on.
+      required: true
+      schema:
+        $ref: '#/components/schemas/_common:IndexName'
+      style: simple
+    bulk_stream::query._source:
+      in: query
+      name: _source
+      description: '`true` or `false` to return the `_source` field or not, or a list of fields to return.'
+      schema:
+        $ref: '#/components/schemas/_core.search:SourceConfigParam'
+      style: form
+    bulk_stream::query._source_excludes:
+      in: query
+      name: _source_excludes
+      description: A comma-separated list of source fields to exclude from the response.
+      schema:
+        $ref: '#/components/schemas/_common:Fields'
+      style: form
+    bulk_stream::query._source_includes:
+      in: query
+      name: _source_includes
+      description: A comma-separated list of source fields to include in the response.
+      schema:
+        $ref: '#/components/schemas/_common:Fields'
+      style: form
+    bulk_stream::query.batch_interval:
+      in: query
+      name: batch_interval
+      description: Specifies for how long bulk operations should be accumulated into a batch before sending the batch to data nodes.
+      schema:
+        $ref: '#/components/schemas/_common:Duration'
+      style: form
+    bulk_stream::query.batch_size:
+      in: query
+      name: batch_size
+      description: Specifies how many bulk operations should be accumulated into a batch before sending the batch to data nodes.
+      schema:
+        $ref: '#/components/schemas/_common:BatchSize'
+      style: form
+      x-default: 1
+    bulk_stream::query.pipeline:
+      in: query
+      name: pipeline
+      description: |-
+        ID of the pipeline to use to preprocess incoming documents.
+        If the index has a default ingest pipeline specified, then setting the value to `_none` disables the default ingest pipeline for this request.
+        If a final pipeline is configured it will always run, regardless of the value of this parameter.
+      schema:
+        type: string
+      style: form
+    bulk_stream::query.refresh:
+      in: query
+      name: refresh
+      description: |-
+        If `true`, OpenSearch refreshes the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` do nothing with refreshes.
+        Valid values: `true`, `false`, `wait_for`.
+      schema:
+        $ref: '#/components/schemas/_common:Refresh'
+      style: form
+    bulk_stream::query.require_alias:
+      in: query
+      name: require_alias
+      description: If `true`, the request's actions must target an index alias.
+      schema:
+        type: boolean
+        default: false
+      style: form
+    bulk_stream::query.routing:
+      in: query
+      name: routing
+      description: Custom value used to route operations to a specific shard.
+      schema:
+        $ref: '#/components/schemas/_common:Routing'
+      style: form
+    bulk_stream::query.timeout:
+      in: query
+      name: timeout
+      description: 'Period each action waits for the following operations: automatic index creation, dynamic mapping updates, waiting for active shards.'
+      schema:
+        $ref: '#/components/schemas/_common:Duration'
+      style: form
+    bulk_stream::query.type:
+      name: type
+      in: query
+      description: Default document type for items which don't provide one.
+      schema:
+        type: string
+        description: Default document type for items which don't provide one.
+    bulk_stream::query.wait_for_active_shards:
+      in: query
+      name: wait_for_active_shards
+      description: |-
+        The number of shard copies that must be active before proceeding with the operation.
+        Set to all or any positive integer up to the total number of shards in the index (`number_of_replicas+1`).
+      schema:
+        $ref: '#/components/schemas/_common:WaitForActiveShards'
+      style: form
+      x-default: '1'
     bulk::path.index:
       in: path
       name: index
@@ -16873,6 +17105,7 @@ components:
       description: Sets the minimum `_score` value that documents must have to be included in the result.
       schema:
         type: number
+        format: float
       style: form
     count::query.preference:
       in: query
@@ -16906,7 +17139,8 @@ components:
         If a query reaches this limit, OpenSearch terminates the query early.
         OpenSearch collects documents before sorting.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     create_pit::path.index:
       name: index
@@ -17125,6 +17359,7 @@ components:
       description: The throttle for this request in sub-requests per second.
       schema:
         type: number
+        format: float
       style: form
     delete_by_query::path.index:
       in: path
@@ -17231,7 +17466,8 @@ components:
       name: from
       description: Starting offset.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 0
       style: form
     delete_by_query::query.ignore_unavailable:
@@ -17255,7 +17491,8 @@ components:
         Maximum number of documents to process.
         Defaults to all documents.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     delete_by_query::query.preference:
       in: query
@@ -17296,6 +17533,7 @@ components:
       description: The throttle for this request in sub-requests per second.
       schema:
         type: number
+        format: float
         default: 0
       style: form
     delete_by_query::query.routing:
@@ -17317,7 +17555,8 @@ components:
       name: scroll_size
       description: Size of the scroll request that powers the operation.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 100
       style: form
     delete_by_query::query.search_timeout:
@@ -17384,7 +17623,8 @@ components:
         When possible, let OpenSearch perform early termination automatically.
         Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     delete_by_query::query.timeout:
       in: query
@@ -17476,7 +17716,8 @@ components:
       name: if_primary_term
       description: Only perform the operation if the document has this primary term.
       schema:
-        type: number
+        type: integer
+        format: int64
       style: form
     delete::query.if_seq_no:
       in: query
@@ -18207,7 +18448,8 @@ components:
       name: if_primary_term
       description: Only perform the operation if the document has this primary term.
       schema:
-        type: number
+        type: integer
+        format: int64
       style: form
     index::query.if_seq_no:
       in: query
@@ -21685,7 +21927,8 @@ components:
       name: max_concurrent_searches
       description: Maximum number of concurrent searches the API can run.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     msearch_template::query.rest_total_hits_as_int:
       in: query
@@ -21734,14 +21977,16 @@ components:
       name: max_concurrent_searches
       description: Maximum number of concurrent searches the multi search API can execute.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     msearch::query.max_concurrent_shard_requests:
       in: query
       name: max_concurrent_shard_requests
       description: Maximum number of concurrent shard requests that each sub-search request executes per node.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 5
       style: form
     msearch::query.pre_filter_shard_size:
@@ -21749,7 +21994,8 @@ components:
       name: pre_filter_shard_size
       description: Defines a threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on its rewrite method i.e., if date filters are mandatory to match but the shard bounds and the query are disjoint.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     msearch::query.rest_total_hits_as_int:
       in: query
@@ -22561,6 +22807,7 @@ components:
       description: The throttle for this request in sub-requests per second.
       schema:
         type: number
+        format: float
       style: form
     reindex::query.max_docs:
       name: max_docs
@@ -22585,6 +22832,7 @@ components:
         Defaults to no throttle.
       schema:
         type: number
+        format: float
         default: 0
       style: form
     reindex::query.scroll:
@@ -23067,7 +23315,8 @@ components:
         The number of shard results that should be reduced at once on the coordinating node.
         This value should be used as a protection mechanism to reduce the memory overhead per search request if the potential number of shards in the request can be large.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 512
       style: form
     search::query.cancel_after_time_interval:
@@ -23138,7 +23387,8 @@ components:
         By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
         To page through more hits, use the `search_after` parameter.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 0
       style: form
     search::query.ignore_throttled:
@@ -23179,7 +23429,8 @@ components:
         Defines the number of concurrent shard requests per node this search executes concurrently.
         This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 5
       style: form
     search::query.phase_took:
@@ -23201,7 +23452,8 @@ components:
         the request targets one or more read-only index;
         the primary sort of the query targets an indexed field.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     search::query.preference:
       in: query
@@ -23291,7 +23543,8 @@ components:
         By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
         To page through more hits, use the `search_after` parameter.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 10
       style: form
     search::query.sort:
@@ -23348,7 +23601,8 @@ components:
         Number of suggestions to return.
         This parameter can only be used when the `suggest_field` and `suggest_text` query string parameters are specified.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     search::query.suggest_text:
       in: query
@@ -23372,7 +23626,8 @@ components:
         Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
         If set to `0` (default), the query does not terminate early.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     search::query.timeout:
       in: query
@@ -24537,6 +24792,7 @@ components:
       description: The throttle for this request in sub-requests per second.
       schema:
         type: number
+        format: float
       style: form
     update_by_query::path.index:
       in: path
@@ -24644,7 +24900,8 @@ components:
       name: from
       description: Starting offset.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 0
       style: form
     update_by_query::query.ignore_unavailable:
@@ -24668,7 +24925,8 @@ components:
         Maximum number of documents to process.
         Defaults to all documents.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     update_by_query::query.pipeline:
       in: query
@@ -24717,6 +24975,7 @@ components:
       description: The throttle for this request in sub-requests per second.
       schema:
         type: number
+        format: float
         default: 0
       style: form
     update_by_query::query.routing:
@@ -24738,7 +24997,8 @@ components:
       name: scroll_size
       description: Size of the scroll request that powers the operation.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 100
       style: form
     update_by_query::query.search_timeout:
@@ -24801,7 +25061,8 @@ components:
         When possible, let OpenSearch perform early termination automatically.
         Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     update_by_query::query.timeout:
       in: query
@@ -24880,7 +25141,8 @@ components:
       name: if_primary_term
       description: Only perform the operation if the document has this primary term.
       schema:
-        type: number
+        type: integer
+        format: int64
       style: form
     update::query.if_seq_no:
       in: query
@@ -24920,7 +25182,8 @@ components:
       name: retry_on_conflict
       description: Specify how many times should the operation be retried when a conflict occurs.
       schema:
-        type: number
+        type: integer
+        format: int32
         default: 0
       style: form
     update::query.routing:
@@ -24969,6 +25232,18 @@ components:
                 - type: object
             description: The operation definition and data (action-data pairs), separated by newlines
       required: true
+    bulk_stream:
+      content:
+        application/x-ndjson:
+          schema:
+            type: array
+            items:
+              anyOf:
+                - $ref: '#/components/schemas/_core.bulk:OperationContainer'
+                - $ref: '#/components/schemas/_core.bulk:UpdateAction'
+                - type: object
+            description: The operation definition and data (action-data pairs), separated by newlines
+      required: true
     cat.pit_segments:
       content:
         application/json:
@@ -25091,7 +25366,8 @@ components:
             properties:
               max_docs:
                 description: The maximum number of documents to delete.
-                type: number
+                type: integer
+                format: int32
               query:
                 $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
               slice:
@@ -25628,11 +25904,16 @@ components:
                 format: int32
               description:
                 type: string
+              mode:
+                type: string
+              compression_level:
+                type: string
               method:
                 type: string
+              spaceType:
+                type: string
             required:
               - dimension
-              - method
               - training_field
               - training_index
       required: true
@@ -25878,11 +26159,13 @@ components:
                 $ref: '#/components/schemas/_core.reindex:Destination'
               max_docs:
                 description: The maximum number of documents to reindex.
-                type: number
+                type: integer
+                format: int32
               script:
                 $ref: '#/components/schemas/_common:Script'
               size:
-                type: number
+                type: integer
+                format: int32
               source:
                 $ref: '#/components/schemas/_core.reindex:Source'
             required:
@@ -25993,7 +26276,8 @@ components:
                   Needs to be non-negative.
                   By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
                   To page through more hits, use the `search_after` parameter.
-                type: number
+                type: integer
+                format: int32
               highlight:
                 $ref: '#/components/schemas/_core.search:Highlight'
               track_total_hits:
@@ -26005,6 +26289,7 @@ components:
                   type: object
                   additionalProperties:
                     type: number
+                    format: float
               docvalue_fields:
                 description: |-
                   Array of wildcard (`*`) patterns.
@@ -26019,6 +26304,7 @@ components:
                   Minimum `_score` for matching documents.
                   Documents with a lower `_score` are not included in the search results.
                 type: number
+                format: float
               post_filter:
                 $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
               profile:
@@ -26047,7 +26333,8 @@ components:
                   The number of hits to return.
                   By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters.
                   To page through more hits, use the `search_after` parameter.
-                type: number
+                type: integer
+                format: int32
               slice:
                 $ref: '#/components/schemas/_common:SlicedScroll'
               sort:
@@ -26073,7 +26360,8 @@ components:
                   When possible, let OpenSearch perform early termination automatically.
                   Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
                   If set to `0` (default), the query does not terminate early.
-                type: number
+                type: integer
+                format: int32
               timeout:
                 description: |-
                   Specifies the period of time to wait for a response from each shard.
@@ -26527,7 +26815,8 @@ components:
             properties:
               max_docs:
                 description: The maximum number of documents to update.
-                type: number
+                type: integer
+                format: int32
               query:
                 $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
               script:
@@ -26561,6 +26850,32 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/asynchronous_search._common:StatsResponse'
+    bulk_stream@200:
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              errors:
+                type: boolean
+              items:
+                type: array
+                items:
+                  type: object
+                  additionalProperties:
+                    $ref: '#/components/schemas/_core.bulk:ResponseItem'
+                  minProperties: 1
+                  maxProperties: 1
+              took:
+                type: integer
+                format: int64
+              ingest_took:
+                type: integer
+                format: int64
+            required:
+              - errors
+              - items
+              - took
     bulk@200:
       content:
         application/json:
@@ -26578,9 +26893,11 @@ components:
                   minProperties: 1
                   maxProperties: 1
               took:
-                type: number
+                type: integer
+                format: int64
               ingest_took:
-                type: number
+                type: integer
+                format: int64
             required:
               - errors
               - items
@@ -26836,7 +27153,8 @@ components:
               succeeded:
                 type: boolean
               num_freed:
-                type: number
+                type: integer
+                format: int32
             required:
               - num_freed
               - succeeded
@@ -27067,7 +27385,8 @@ components:
               terminated_early:
                 type: boolean
               count:
-                type: number
+                type: integer
+                format: int64
               _shards:
                 $ref: '#/components/schemas/_common:ShardStatistics'
             required:
@@ -27162,6 +27481,11 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/_common:WriteResponseBase'
+    delete@404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/_common:WriteResponseBase'
     exists_source@200:
       content:
         application/json: {}
@@ -27445,6 +27769,11 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/_core.get:GetResult'
+    get@404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/_core.get:GetResult'
     index@200:
       content:
         application/json:
@@ -27600,6 +27929,11 @@ components:
         application/json:
           schema:
             $ref: '#/components/schemas/_common:IndicesResponseBase'
+    indices.delete@404:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/indices._common:IndexErrorCause'
     indices.exists_alias@200:
       content:
         application/json: {}
@@ -28069,7 +28403,16 @@ components:
     knn.get_model@200: {}
     knn.search_models@200: {}
     knn.stats@200: {}
-    knn.train_model@200: {}
+    knn.train_model@200:
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              model_id:
+                type: string
+            required:
+              - model_id
     knn.warmup@200: {}
     mget@200:
       content:
@@ -28474,6 +28817,7 @@ components:
               metric_score:
                 description: The overall evaluation quality calculated by the defined metric
                 type: number
+                format: double
               details:
                 description: The details section contains one entry for every query in the original requests section, keyed by the search request id
                 type: object
@@ -28627,7 +28971,8 @@ components:
             type: object
             properties:
               took:
-                type: number
+                type: integer
+                format: int64
               timed_out:
                 type: boolean
               _shards:
@@ -28646,8 +28991,10 @@ components:
                   type: object
               max_score:
                 type: number
+                format: float
               num_reduce_phases:
-                type: number
+                type: integer
+                format: int32
               profile:
                 $ref: '#/components/schemas/_core.search:Profile'
               pit_id:
@@ -29501,7 +29848,8 @@ components:
                 additionalProperties:
                   $ref: '#/components/schemas/_core.termvectors:TermVector'
               took:
-                type: number
+                type: integer
+                format: int64
               _version:
                 $ref: '#/components/schemas/_common:VersionNumber'
             required:
@@ -29608,6 +29956,9 @@ components:
           $ref: '#/components/schemas/_common:TransportAddress'
       required:
         - name
+    _common:BatchSize:
+      type: integer
+      format: int64
     _common:BulkByScrollFailure:
       anyOf:
         - $ref: '#/components/schemas/_common:BulkItemResponseFailure'
@@ -29814,12 +30165,16 @@ components:
       properties:
         top:
           type: number
+          format: double
         bottom:
           type: number
+          format: double
         left:
           type: number
+          format: double
         right:
           type: number
+          format: double
       required:
         - bottom
         - left
@@ -29856,7 +30211,7 @@ components:
       enum:
         - b
         - l
-        - no
+        - 'no'
     _common:DFRBasicModel:
       type: string
       enum:
@@ -29972,13 +30327,22 @@ components:
         - error
         - status
     _common:ExpandWildcard:
-      type: string
-      enum:
-        - all
-        - closed
-        - hidden
-        - none
-        - open
+      oneOf:
+        - type: string
+          const: all
+          description: Match any index, including hidden ones.
+        - type: string
+          const: closed
+          description: Match closed, non-hidden indices.
+        - type: string
+          const: hidden
+          description: Match hidden indices. Must be combined with open, closed, or both.
+        - type: string
+          const: none
+          description: Wildcard expressions are not accepted.
+        - type: string
+          const: open
+          description: Match open, non-hidden indices.
     _common:ExpandWildcards:
       oneOf:
         - $ref: '#/components/schemas/_common:ExpandWildcard'
@@ -30066,10 +30430,14 @@ components:
         - as 2 top_right / bottom_left points
         - as a WKT bounding box.
       oneOf:
-        - $ref: '#/components/schemas/_common:CoordsGeoBounds'
-        - $ref: '#/components/schemas/_common:TopLeftBottomRightGeoBounds'
-        - $ref: '#/components/schemas/_common:TopRightBottomLeftGeoBounds'
-        - $ref: '#/components/schemas/_common:WktGeoBounds'
+        - title: coords
+          $ref: '#/components/schemas/_common:CoordsGeoBounds'
+        - title: tlbr
+          $ref: '#/components/schemas/_common:TopLeftBottomRightGeoBounds'
+        - title: trbl
+          $ref: '#/components/schemas/_common:TopRightBottomLeftGeoBounds'
+        - title: wkt
+          $ref: '#/components/schemas/_common:WktGeoBounds'
     _common:GeoDistanceSort:
       type: object
       properties:
@@ -30123,18 +30491,23 @@ components:
         - type
     _common:GeoLocation:
       description: |-
-        A latitude/longitude as a 2 dimensional point. It can be represented in various ways:
+        A latitude/longitude as a 2-dimensional point. It can be represented in various ways:
         - as a `{lat, long}` object
         - as a geo hash value
         - as a `[lon, lat]` array
         - as a string in `"<lat>, <lon>"` or WKT point formats.
       oneOf:
-        - $ref: '#/components/schemas/_common:LatLonGeoLocation'
-        - $ref: '#/components/schemas/_common:GeoHashLocation'
-        - type: array
+        - title: latlon
+          $ref: '#/components/schemas/_common:LatLonGeoLocation'
+        - title: geohash
+          $ref: '#/components/schemas/_common:GeoHashLocation'
+        - title: coords
+          type: array
           items:
             type: number
-        - type: string
+            format: double
+        - title: text
+          type: string
     _common:GeoShapeRelation:
       type: string
       enum:
@@ -30339,21 +30712,24 @@ components:
       required:
         - found
     _common:InlineScript:
-      allOf:
-        - $ref: '#/components/schemas/_common:ScriptBase'
-        - type: object
-          properties:
-            lang:
-              $ref: '#/components/schemas/_common:ScriptLanguage'
-            options:
-              type: object
-              additionalProperties:
-                type: string
-            source:
-              description: The script source.
-              type: string
-          required:
-            - source
+      oneOf:
+        - title: source
+          type: string
+        - allOf:
+            - $ref: '#/components/schemas/_common:ScriptBase'
+            - type: object
+              properties:
+                lang:
+                  $ref: '#/components/schemas/_common:ScriptLanguage'
+                options:
+                  type: object
+                  additionalProperties:
+                    type: string
+                source:
+                  description: The script source.
+                  type: string
+              required:
+                - source
     _common:Ip:
       type: string
     _common:KnnField:
@@ -30382,6 +30758,16 @@ components:
         boost:
           description: Boost value to apply to kNN scores
           type: number
+        method_parameters:
+          type: object
+          x-version-added: '2.16'
+          additionalProperties:
+            type: number
+        rescore:
+          type: object
+          x-version-added: '2.17'
+          additionalProperties:
+            type: number
       required:
         - vector
     _common:LatLonGeoLocation:
@@ -30390,9 +30776,11 @@ components:
         lat:
           description: Latitude
           type: number
+          format: double
         lon:
           description: Longitude
           type: number
+          format: double
       required:
         - lat
         - lon
@@ -30481,7 +30869,7 @@ components:
         filter:
           $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
         max_children:
-          type: number
+          type: integer
         nested:
           $ref: '#/components/schemas/_common:NestedSortValue'
         path:
@@ -30609,14 +30997,6 @@ components:
         - failed
         - successful
         - total
-    _common:Normalization:
-      type: string
-      enum:
-        - h1
-        - h2
-        - h3
-        - no
-        - z
     _common:OpenSearchVersionInfo:
       type: object
       properties:
@@ -31033,6 +31413,10 @@ components:
           type: number
         total:
           type: number
+    _common:ResourceType:
+      type: string
+      enum:
+        - index_or_alias
     _common:Result:
       type: string
       enum:
@@ -31082,8 +31466,10 @@ components:
           $ref: '#/components/schemas/_common:SortOrder'
     _common:Script:
       oneOf:
-        - $ref: '#/components/schemas/_common:InlineScript'
-        - $ref: '#/components/schemas/_common:StoredScriptId'
+        - title: inline
+          $ref: '#/components/schemas/_common:InlineScript'
+        - title: stored
+          $ref: '#/components/schemas/_common:StoredScriptId'
     _common:ScriptBase:
       type: object
       properties:
@@ -31446,9 +31832,12 @@ components:
             $ref: '#/components/schemas/_common:SortCombinations'
     _common:SortCombinations:
       oneOf:
-        - $ref: '#/components/schemas/_common:Field'
-        - $ref: '#/components/schemas/_common:FieldWithOrder'
-        - $ref: '#/components/schemas/_common:SortOptions'
+        - title: field
+          $ref: '#/components/schemas/_common:Field'
+        - title: field_with_order
+          $ref: '#/components/schemas/_common:FieldWithOrder'
+        - title: options
+          $ref: '#/components/schemas/_common:SortOptions'
     _common:SortMode:
       type: string
       enum:
@@ -31557,7 +31946,7 @@ components:
         Depending on the target language, code generators can keep the union or remove it and leniently parse
         strings to the target type.
       oneOf:
-        - type: number
+        - type: integer
         - type: string
     _common:StringifiedVersionNumber:
       description: |-
@@ -31595,6 +31984,14 @@ components:
       oneOf:
         - type: string
         - type: number
+    _common:TermFrequencyNormalization:
+      type: string
+      enum:
+        - h1
+        - h2
+        - h3
+        - 'no'
+        - z
     _common:TimeOfDay:
       description: Time of day, expressed as HH:MM:SS.
       type: string
@@ -31674,7 +32071,8 @@ components:
       format: int64
     _common:UnitSeconds:
       description: Time unit for seconds.
-      type: number
+      type: integer
+      format: int64
     _common:Username:
       type: string
     _common:Uuid:
@@ -31777,12 +32175,12 @@ components:
         x:
           description: The x coordinate.
           type: number
-        y:
+        'y':
           description: The y coordinate.
           type: number
       required:
         - x
-        - y
+        - 'y'
     _common:XyLocation:
       x-version-added: '2.4'
       description: |-
@@ -31791,11 +32189,14 @@ components:
         - as a `[x, y]` array
         - as a string in `"x, y"` or WKT point formats.
       oneOf:
-        - $ref: '#/components/schemas/_common:XyCartesianCoordinates'
-        - type: array
+        - title: cartesian
+          $ref: '#/components/schemas/_common:XyCartesianCoordinates'
+        - title: coords
+          type: array
           items:
             type: number
-        - type: string
+        - title: text
+          type: string
     _common.aggregations:AdjacencyMatrixAggregate:
       allOf:
         - $ref: '#/components/schemas/_common.aggregations:MultiBucketAggregateBaseAdjacencyMatrixBucket'
@@ -31822,7 +32223,7 @@ components:
           required:
             - key
     _common.aggregations:Aggregate:
-      oneOf:
+      anyOf:
         - $ref: '#/components/schemas/_common.aggregations:CardinalityAggregate'
         - $ref: '#/components/schemas/_common.aggregations:HdrPercentilesAggregate'
         - $ref: '#/components/schemas/_common.aggregations:HdrPercentileRanksAggregate'
@@ -34298,6 +34699,9 @@ components:
       allOf:
         - $ref: '#/components/schemas/_common.aggregations:SingleBucketAggregateBase'
         - type: object
+          properties:
+            doc_count:
+              type: number
     _common.aggregations:NestedAggregation:
       allOf:
         - $ref: '#/components/schemas/_common.aggregations:BucketAggregationBase'
@@ -35409,6 +35813,8 @@ components:
         - $ref: '#/components/schemas/_common.analysis:KuromojiAnalyzer'
         - $ref: '#/components/schemas/_common.analysis:SnowballAnalyzer'
         - $ref: '#/components/schemas/_common.analysis:DutchAnalyzer'
+        - $ref: '#/components/schemas/_common.analysis:SmartcnAnalyzer'
+        - $ref: '#/components/schemas/_common.analysis:CjkAnalyzer'
     _common.analysis:AsciiFoldingTokenFilter:
       allOf:
         - $ref: '#/components/schemas/_common.analysis:TokenFilterBase'
@@ -35424,8 +35830,10 @@ components:
             - type
     _common.analysis:CharFilter:
       oneOf:
-        - type: string
-        - $ref: '#/components/schemas/_common.analysis:CharFilterDefinition'
+        - title: name
+          type: string
+        - title: definition
+          $ref: '#/components/schemas/_common.analysis:CharFilterDefinition'
     _common.analysis:CharFilterBase:
       type: object
       properties:
@@ -35455,10 +35863,21 @@ components:
               items:
                 type: string
             max_token_length:
-              type: number
+              type: integer
           required:
             - tokenize_on_chars
             - type
+    _common.analysis:CjkAnalyzer:
+      type: object
+      properties:
+        type:
+          type: string
+          enum:
+            - cjk
+        stopwords:
+          $ref: '#/components/schemas/_common.analysis:StopWords'
+        stopwords_path:
+          type: string
     _common.analysis:CommonGramsTokenFilter:
       allOf:
         - $ref: '#/components/schemas/_common.analysis:TokenFilterBase'
@@ -35488,11 +35907,11 @@ components:
             hyphenation_patterns_path:
               type: string
             max_subword_size:
-              type: number
+              type: integer
             min_subword_size:
-              type: number
+              type: integer
             min_word_size:
-              type: number
+              type: integer
             only_longest_match:
               type: boolean
             word_list:
@@ -35536,9 +35955,9 @@ components:
           items:
             type: string
         position_increment_gap:
-          type: number
+          type: integer
         position_offset_gap:
-          type: number
+          type: integer
         tokenizer:
           type: string
       required:
@@ -35619,9 +36038,9 @@ components:
               enum:
                 - edge_ngram
             max_gram:
-              type: number
+              type: integer
             min_gram:
-              type: number
+              type: integer
             side:
               $ref: '#/components/schemas/_common.analysis:EdgeNGramSide'
             preserve_original:
@@ -35640,9 +36059,9 @@ components:
             custom_token_chars:
               type: string
             max_gram:
-              type: number
+              type: integer
             min_gram:
-              type: number
+              type: integer
             token_chars:
               type: array
               items:
@@ -35681,7 +36100,7 @@ components:
         version:
           $ref: '#/components/schemas/_common:VersionString'
         max_output_size:
-          type: number
+          type: integer
         preserve_original:
           type: boolean
         separator:
@@ -35705,7 +36124,7 @@ components:
               enum:
                 - fingerprint
             max_output_size:
-              type: number
+              type: integer
             separator:
               type: string
           required:
@@ -35780,8 +36199,8 @@ components:
     _common.analysis:IcuCollationDecomposition:
       type: string
       enum:
-        - identical
-        - no
+        - canonical
+        - 'no'
     _common.analysis:IcuCollationStrength:
       type: string
       enum:
@@ -35997,7 +36416,7 @@ components:
               enum:
                 - keyword
             buffer_size:
-              type: number
+              type: integer
           required:
             - buffer_size
             - type
@@ -36083,7 +36502,7 @@ components:
               enum:
                 - kuromoji_stemmer
             minimum_length:
-              type: number
+              type: integer
           required:
             - minimum_length
             - type
@@ -36107,7 +36526,7 @@ components:
             mode:
               $ref: '#/components/schemas/_common.analysis:KuromojiTokenizationMode'
             nbest_cost:
-              type: number
+              type: integer
             nbest_examples:
               type: string
             user_dictionary:
@@ -36191,9 +36610,9 @@ components:
               enum:
                 - length
             max:
-              type: number
+              type: integer
             min:
-              type: number
+              type: integer
           required:
             - type
     _common.analysis:LetterTokenizer:
@@ -36300,9 +36719,9 @@ components:
               enum:
                 - ngram
             max_gram:
-              type: number
+              type: integer
             min_gram:
-              type: number
+              type: integer
             preserve_original:
               $ref: '#/components/schemas/_common:Stringifiedboolean'
           required:
@@ -36319,9 +36738,9 @@ components:
             custom_token_chars:
               type: string
             max_gram:
-              type: number
+              type: integer
             min_gram:
-              type: number
+              type: integer
             token_chars:
               type: array
               items:
@@ -36512,11 +36931,22 @@ components:
             flags:
               type: string
             group:
-              type: number
+              type: integer
             pattern:
               type: string
           required:
             - type
+    _common.analysis:PersianStemTokenFilter:
+      allOf:
+        - $ref: '#/components/schemas/_common.analysis:TokenFilterBase'
+        - type: object
+          properties:
+            type:
+              type: string
+              enum:
+                - persian_stem
+          required:
+            - type
     _common.analysis:PhoneticEncoder:
       type: string
       enum:
@@ -36574,7 +37004,7 @@ components:
               items:
                 $ref: '#/components/schemas/_common.analysis:PhoneticLanguage'
             max_code_len:
-              type: number
+              type: integer
             name_type:
               $ref: '#/components/schemas/_common.analysis:PhoneticNameType'
             replace:
@@ -36672,6 +37102,35 @@ components:
           $ref: '#/components/schemas/_common:VersionString'
       required:
         - type
+    _common.analysis:SmartcnAnalyzer:
+      type: object
+      properties:
+        type:
+          type: string
+          enum:
+            - smartcn
+    _common.analysis:SmartcnStopTokenFilter:
+      allOf:
+        - $ref: '#/components/schemas/_common.analysis:TokenFilterBase'
+        - type: object
+          properties:
+            type:
+              type: string
+              enum:
+                - smartcn_stop
+          required:
+            - type
+    _common.analysis:SmartcnTokenizer:
+      allOf:
+        - $ref: '#/components/schemas/_common.analysis:TokenizerBase'
+        - type: object
+          properties:
+            type:
+              type: string
+              enum:
+                - smartcn_tokenizer
+          required:
+            - type
     _common.analysis:SnowballAnalyzer:
       type: object
       properties:
@@ -36735,7 +37194,7 @@ components:
           enum:
             - standard
         max_token_length:
-          type: number
+          type: integer
         stopwords:
           $ref: '#/components/schemas/_common.analysis:StopWords'
       required:
@@ -36750,7 +37209,7 @@ components:
               enum:
                 - standard
             max_token_length:
-              type: number
+              type: integer
           required:
             - type
     _common.analysis:StemmerOverrideTokenFilter:
@@ -36897,8 +37356,10 @@ components:
         - whitespace
     _common.analysis:TokenFilter:
       oneOf:
-        - type: string
-        - $ref: '#/components/schemas/_common.analysis:TokenFilterDefinition'
+        - title: name
+          type: string
+        - title: definition
+          $ref: '#/components/schemas/_common.analysis:TokenFilterDefinition'
     _common.analysis:TokenFilterBase:
       type: object
       properties:
@@ -36930,6 +37391,7 @@ components:
         - $ref: '#/components/schemas/_common.analysis:NoriPartOfSpeechTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:PatternCaptureTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:PatternReplaceTokenFilter'
+        - $ref: '#/components/schemas/_common.analysis:PersianStemTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:PorterStemTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:PredicateTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:RemoveDuplicatesTokenFilter'
@@ -36957,10 +37419,13 @@ components:
         - $ref: '#/components/schemas/_common.analysis:IcuTransformTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:PhoneticTokenFilter'
         - $ref: '#/components/schemas/_common.analysis:DictionaryDecompounderTokenFilter'
+        - $ref: '#/components/schemas/_common.analysis:SmartcnStopTokenFilter'
     _common.analysis:Tokenizer:
       oneOf:
-        - type: string
-        - $ref: '#/components/schemas/_common.analysis:TokenizerDefinition'
+        - title: name
+          type: string
+        - title: definition
+          $ref: '#/components/schemas/_common.analysis:TokenizerDefinition'
     _common.analysis:TokenizerBase:
       type: object
       properties:
@@ -36985,6 +37450,7 @@ components:
         - $ref: '#/components/schemas/_common.analysis:KuromojiTokenizer'
         - $ref: '#/components/schemas/_common.analysis:PatternTokenizer'
         - $ref: '#/components/schemas/_common.analysis:IcuTokenizer'
+        - $ref: '#/components/schemas/_common.analysis:SmartcnTokenizer'
     _common.analysis:TrimTokenFilter:
       allOf:
         - $ref: '#/components/schemas/_common.analysis:TokenFilterBase'
@@ -37006,7 +37472,7 @@ components:
               enum:
                 - truncate
             length:
-              type: number
+              type: integer
           required:
             - type
     _common.analysis:UaxEmailUrlTokenizer:
@@ -37019,7 +37485,7 @@ components:
               enum:
                 - uax_url_email
             max_token_length:
-              type: number
+              type: integer
           required:
             - type
     _common.analysis:UniqueTokenFilter:
@@ -37067,7 +37533,7 @@ components:
               enum:
                 - whitespace
             max_token_length:
-              type: number
+              type: integer
           required:
             - type
     _common.analysis:WordDelimiterGraphTokenFilter:
@@ -37229,6 +37695,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             fielddata:
               $ref: '#/components/schemas/indices._common:NumericFielddata'
             index:
@@ -37266,7 +37733,7 @@ components:
               items:
                 $ref: '#/components/schemas/_common.mapping:SuggestContext'
             max_input_length:
-              type: number
+              type: integer
             preserve_position_increments:
               type: boolean
             preserve_separators:
@@ -37284,8 +37751,7 @@ components:
         - $ref: '#/components/schemas/_common.mapping:PropertyBase'
         - type: object
           properties:
-            value:
-              type: object
+            value: {}
             type:
               type: string
               enum:
@@ -37317,6 +37783,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             format:
               type: string
             ignore_malformed:
@@ -37326,7 +37793,7 @@ components:
             null_value:
               $ref: '#/components/schemas/_common:DateTime'
             precision_step:
-              type: number
+              type: integer
             type:
               type: string
               enum:
@@ -37340,6 +37807,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             fielddata:
               $ref: '#/components/schemas/indices._common:NumericFielddata'
             format:
@@ -37351,7 +37819,7 @@ components:
             null_value:
               $ref: '#/components/schemas/_common:DateTime'
             precision_step:
-              type: number
+              type: integer
             locale:
               type: string
             type:
@@ -37424,6 +37892,7 @@ components:
                 - double
             null_value:
               type: number
+              format: double
           required:
             - type
     _common.mapping:DoubleRangeProperty:
@@ -37444,61 +37913,6 @@ components:
         - strict
         - strict_allow_templates
         - 'true'
-    _common.mapping:DynamicProperty:
-      allOf:
-        - $ref: '#/components/schemas/_common.mapping:DocValuesPropertyBase'
-        - type: object
-          properties:
-            type:
-              type: string
-              enum:
-                - '{dynamic_property}'
-            enabled:
-              type: boolean
-            null_value:
-              $ref: '#/components/schemas/_common:FieldValue'
-            boost:
-              type: number
-            coerce:
-              type: boolean
-            script:
-              $ref: '#/components/schemas/_common:Script'
-            on_script_error:
-              $ref: '#/components/schemas/_common.mapping:OnScriptError'
-            ignore_malformed:
-              type: boolean
-            time_series_metric:
-              $ref: '#/components/schemas/_common.mapping:TimeSeriesMetricType'
-            analyzer:
-              type: string
-            eager_global_ordinals:
-              type: boolean
-            index:
-              type: boolean
-            index_options:
-              $ref: '#/components/schemas/_common.mapping:IndexOptions'
-            index_phrases:
-              type: boolean
-            index_prefixes:
-              $ref: '#/components/schemas/_common.mapping:TextIndexPrefixes'
-            norms:
-              type: boolean
-            position_increment_gap:
-              type: number
-            search_analyzer:
-              type: string
-            search_quote_analyzer:
-              type: string
-            term_vector:
-              $ref: '#/components/schemas/_common.mapping:TermVectorOption'
-            format:
-              type: string
-            precision_step:
-              type: number
-            locale:
-              type: string
-          required:
-            - type
     _common.mapping:DynamicTemplate:
       type: object
       properties:
@@ -37557,6 +37971,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             depth_limit:
               type: number
             doc_values:
@@ -37590,6 +38005,7 @@ components:
                 - float
             null_value:
               type: number
+              format: float
           required:
             - type
     _common.mapping:FloatRangeProperty:
@@ -37604,10 +38020,21 @@ components:
           required:
             - type
     _common.mapping:GeoOrientation:
-      type: string
-      enum:
-        - left
-        - right
+      oneOf:
+        - title: left
+          type: string
+          enum:
+            - LEFT
+            - clockwise
+            - cw
+            - left
+        - title: right
+          type: string
+          enum:
+            - RIGHT
+            - ccw
+            - counterclockwise
+            - right
     _common.mapping:GeoPointProperty:
       allOf:
         - $ref: '#/components/schemas/_common.mapping:DocValuesPropertyBase'
@@ -37643,6 +38070,7 @@ components:
               deprecated: true
             distance_error_pct:
               type: number
+              format: double
               deprecated: true
             type:
               type: string
@@ -37666,6 +38094,7 @@ components:
                 - half_float
             null_value:
               type: number
+              format: float
           required:
             - type
     _common.mapping:HistogramProperty:
@@ -37705,7 +38134,7 @@ components:
               enum:
                 - integer
             null_value:
-              type: number
+              type: integer
           required:
             - type
     _common.mapping:IntegerRangeProperty:
@@ -37726,6 +38155,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             index:
               type: boolean
             ignore_malformed:
@@ -37784,6 +38214,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             eager_global_ordinals:
               type: boolean
             index:
@@ -37818,30 +38249,35 @@ components:
           type: string
         parameters:
           type: object
-          additionalProperties:
-            type: object
+          additionalProperties: {}
       required:
         - name
     _common.mapping:KnnVectorProperty:
       allOf:
-        - $ref: '#/components/schemas/_common.mapping:KnnVectorPropertyBase'
+        - $ref: '#/components/schemas/_common.mapping:DocValuesPropertyBase'
         - type: object
           properties:
             type:
               type: string
               enum:
                 - knn_vector
+            dimension:
+              type: integer
+            space_type:
+              type: string
+            data_type:
+              type: string
+            mode:
+              type: string
+            compression_level:
+              type: string
+            method:
+              $ref: '#/components/schemas/_common.mapping:KnnVectorMethod'
+            model_id:
+              type: string
           required:
+            - dimension
             - type
-    _common.mapping:KnnVectorPropertyBase:
-      type: object
-      properties:
-        dimension:
-          type: number
-        method:
-          $ref: '#/components/schemas/_common.mapping:KnnVectorMethod'
-      required:
-        - dimension
     _common.mapping:LongNumberProperty:
       allOf:
         - $ref: '#/components/schemas/_common.mapping:NumberPropertyBase'
@@ -37852,7 +38288,8 @@ components:
               enum:
                 - long
             null_value:
-              type: number
+              type: integer
+              format: int64
           required:
             - type
     _common.mapping:LongRangeProperty:
@@ -37929,6 +38366,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             coerce:
               type: boolean
             ignore_malformed:
@@ -37978,7 +38416,6 @@ components:
       oneOf:
         - $ref: '#/components/schemas/_common.mapping:BinaryProperty'
         - $ref: '#/components/schemas/_common.mapping:BooleanProperty'
-        - $ref: '#/components/schemas/_common.mapping:DynamicProperty'
         - $ref: '#/components/schemas/_common.mapping:JoinProperty'
         - $ref: '#/components/schemas/_common.mapping:KeywordProperty'
         - $ref: '#/components/schemas/_common.mapping:MatchOnlyTextProperty'
@@ -38037,7 +38474,7 @@ components:
           additionalProperties:
             $ref: '#/components/schemas/_common.mapping:Property'
         ignore_above:
-          type: number
+          type: integer
         dynamic:
           $ref: '#/components/schemas/_common.mapping:DynamicMapping'
         fields:
@@ -38051,6 +38488,7 @@ components:
           properties:
             boost:
               type: number
+              format: double
             coerce:
               type: boolean
             index:
@@ -38144,8 +38582,10 @@ components:
                 - scaled_float
             null_value:
               type: number
+              format: double
             scaling_factor:
               type: number
+              format: double
           required:
             - type
     _common.mapping:SearchAsYouTypeProperty:
@@ -38160,7 +38600,7 @@ components:
             index_options:
               $ref: '#/components/schemas/_common.mapping:IndexOptions'
             max_shingle_size:
-              type: number
+              type: integer
             norms:
               type: boolean
             search_analyzer:
@@ -38250,20 +38690,20 @@ components:
     _common.mapping:TermVectorOption:
       type: string
       enum:
-        - no
+        - 'no'
         - with_offsets
         - with_positions
         - with_positions_offsets
         - with_positions_offsets_payloads
         - with_positions_payloads
-        - yes
+        - 'yes'
     _common.mapping:TextIndexPrefixes:
       type: object
       properties:
         max_chars:
-          type: number
+          type: integer
         min_chars:
-          type: number
+          type: integer
       required:
         - max_chars
         - min_chars
@@ -38276,6 +38716,7 @@ components:
               type: string
             boost:
               type: number
+              format: double
             eager_global_ordinals:
               type: boolean
             fielddata:
@@ -38293,7 +38734,7 @@ components:
             norms:
               type: boolean
             position_increment_gap:
-              type: number
+              type: integer
             search_analyzer:
               type: string
             search_quote_analyzer:
@@ -38323,10 +38764,12 @@ components:
               type: string
             boost:
               type: number
+              format: double
             index:
               type: boolean
             null_value:
               type: number
+              format: double
             enable_position_increments:
               type: boolean
             type:
@@ -38502,6 +38945,7 @@ components:
             negative_boost:
               description: Floating point number between 0 and 1.0 used to decrease the relevance scores of documents matching the `negative` query.
               type: number
+              format: float
             negative:
               $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
             positive:
@@ -38564,6 +39008,7 @@ components:
               type: string
             cutoff_frequency:
               type: number
+              format: float
             high_freq_operator:
               $ref: '#/components/schemas/_common.query_dsl:Operator'
             low_freq_operator:
@@ -38642,6 +39087,7 @@ components:
             tie_breaker:
               description: Floating point number between 0 and 1.0 used to increase the relevance scores of documents matching multiple query clauses.
               type: number
+              format: float
           required:
             - queries
     _common.query_dsl:DistanceFeatureQuery:
@@ -38720,11 +39166,13 @@ components:
         factor:
           description: Optional factor to multiply the field value with.
           type: number
+          format: float
         missing:
           description: |-
             Value used if the document doesn't have that field.
             The modifier and factor are still applied to it as though it were read from the document.
           type: number
+          format: double
         modifier:
           $ref: '#/components/schemas/_common.query_dsl:FieldValueFactorModifier'
       required:
@@ -38746,6 +39194,7 @@ components:
               $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
             weight:
               type: number
+              format: float
         - type: object
           properties:
             exp:
@@ -38786,9 +39235,11 @@ components:
             max_boost:
               description: Restricts the new score to not exceed the provided limit.
               type: number
+              format: float
             min_score:
               description: Excludes documents that do not meet the provided score threshold.
               type: number
+              format: float
             query:
               $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
             score_mode:
@@ -38800,10 +39251,12 @@ components:
           properties:
             max_expansions:
               description: Maximum number of variations created.
-              type: number
+              type: integer
+              format: int32
             prefix_length:
               description: Number of beginning characters left unchanged when creating expansions.
-              type: number
+              type: integer
+              format: int32
             rewrite:
               $ref: '#/components/schemas/_common:MultiTermQueryRewrite'
             transpositions:
@@ -38919,12 +39372,14 @@ components:
               description: |-
                 Maximum number of child documents that match the query allowed for a returned parent document.
                 If the parent document exceeds this limit, it is excluded from the search results.
-              type: number
+              type: integer
+              format: int32
             min_children:
               description: |-
                 Minimum number of child documents that match the query required to match the query for a returned parent document.
                 If the parent document does not meet this limit, it is excluded from the search results.
-              type: number
+              type: integer
+              format: int32
             query:
               $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
             score_mode:
@@ -38981,7 +39436,8 @@ components:
           description: |-
             Maximum number of positions between the matching terms.
             Intervals produced by the rules further apart than this are not considered matches.
-          type: number
+          type: integer
+          format: int32
         ordered:
           description: If `true`, intervals produced by the rules should appear in the order in which they are specified.
           type: boolean
@@ -39051,7 +39507,8 @@ components:
           $ref: '#/components/schemas/_common:Fuzziness'
         prefix_length:
           description: Number of beginning characters left unchanged when creating expansions.
-          type: number
+          type: integer
+          format: int32
         term:
           description: The term to match.
           type: string
@@ -39072,7 +39529,8 @@ components:
           description: |-
             Maximum number of positions between the matching terms.
             Terms further apart than this are not considered matches.
-          type: number
+          type: integer
+          format: int32
         ordered:
           description: If `true`, matching terms must appear in their specified order.
           type: boolean
@@ -39190,7 +39648,8 @@ components:
               description: |-
                 Maximum number of terms to which the query will expand.
                 Can be applied to the term subqueries constructed for all terms but the final term.
-              type: number
+              type: integer
+              format: int32
             minimum_should_match:
               $ref: '#/components/schemas/_common:MinimumShouldMatch'
             operator:
@@ -39199,7 +39658,8 @@ components:
               description: |-
                 Number of beginning characters left unchanged for fuzzy matching.
                 Can be applied to the term subqueries constructed for all terms but the final term.
-              type: number
+              type: integer
+              format: int32
             query:
               description: |-
                 Terms you wish to find in the provided field.
@@ -39221,13 +39681,15 @@ components:
               type: string
             max_expansions:
               description: Maximum number of terms to which the last provided term of the query value will expand.
-              type: number
+              type: integer
+              format: int32
             query:
               description: Text you wish to find in the provided field.
               type: string
             slop:
               description: Maximum number of positions allowed between matching tokens.
-              type: number
+              type: integer
+              format: int32
             zero_terms_query:
               $ref: '#/components/schemas/_common.query_dsl:ZeroTermsQuery'
           required:
@@ -39245,7 +39707,8 @@ components:
               type: string
             slop:
               description: Maximum number of positions allowed between matching tokens.
-              type: number
+              type: integer
+              format: int32
             zero_terms_query:
               $ref: '#/components/schemas/_common.query_dsl:ZeroTermsQuery'
           required:
@@ -39264,6 +39727,7 @@ components:
             cutoff_frequency:
               deprecated: true
               type: number
+              format: float
             fuzziness:
               $ref: '#/components/schemas/_common:Fuzziness'
             fuzzy_rewrite:
@@ -39276,14 +39740,16 @@ components:
               type: boolean
             max_expansions:
               description: Maximum number of terms to which the query will expand.
-              type: number
+              type: integer
+              format: int32
             minimum_should_match:
               $ref: '#/components/schemas/_common:MinimumShouldMatch'
             operator:
               $ref: '#/components/schemas/_common.query_dsl:Operator'
             prefix_length:
               description: Number of beginning characters left unchanged for fuzzy matching.
-              type: number
+              type: integer
+              format: int32
             query:
               description: Text, number, boolean value or date you wish to find in the provided field.
               oneOf:
@@ -39310,6 +39776,7 @@ components:
                 This sets the boost factor to use when using this feature.
                 Defaults to deactivated (0).
               type: number
+              format: float
             fail_on_unsupported_field:
               description: Controls whether the query should fail (throw an exception) if any of the specified fields are not of the supported types (`text` or `keyword`).
               type: boolean
@@ -39332,26 +39799,32 @@ components:
                     $ref: '#/components/schemas/_common.query_dsl:Like'
             max_doc_freq:
               description: The maximum document frequency above which the terms are ignored from the input document.
-              type: number
+              type: integer
+              format: int32
             max_query_terms:
               description: The maximum number of query terms that can be selected.
-              type: number
+              type: integer
+              format: int32
             max_word_length:
               description: |-
                 The maximum word length above which the terms are ignored.
                 Defaults to unbounded (`0`).
-              type: number
+              type: integer
+              format: int32
             min_doc_freq:
               description: The minimum document frequency below which the terms are ignored from the input document.
-              type: number
+              type: integer
+              format: int32
             minimum_should_match:
               $ref: '#/components/schemas/_common:MinimumShouldMatch'
             min_term_freq:
               description: The minimum term frequency below which the terms are ignored from the input document.
-              type: number
+              type: integer
+              format: int32
             min_word_length:
               description: The minimum word length below which the terms are ignored.
-              type: number
+              type: integer
+              format: int32
             per_field_analyzer:
               description: Overrides the default analyzer.
               type: object
@@ -39388,6 +39861,7 @@ components:
             cutoff_frequency:
               deprecated: true
               type: number
+              format: float
             fields:
               $ref: '#/components/schemas/_common:Fields'
             fuzziness:
@@ -39404,23 +39878,27 @@ components:
               type: boolean
             max_expansions:
               description: Maximum number of terms to which the query will expand.
-              type: number
+              type: integer
+              format: int32
             minimum_should_match:
               $ref: '#/components/schemas/_common:MinimumShouldMatch'
             operator:
               $ref: '#/components/schemas/_common.query_dsl:Operator'
             prefix_length:
               description: Number of beginning characters left unchanged for fuzzy matching.
-              type: number
+              type: integer
+              format: int32
             query:
               description: Text, number, boolean value or date you wish to find in the provided field.
               type: string
             slop:
               description: Maximum number of positions allowed between matching tokens.
-              type: number
+              type: integer
+              format: int32
             tie_breaker:
               description: Determines how scores for each per-term blended query and scores across groups are combined.
               type: number
+              format: float
             type:
               $ref: '#/components/schemas/_common.query_dsl:TextQueryType'
             zero_terms_query:
@@ -39473,8 +39951,10 @@ components:
           type: integer
         min_score:
           type: number
+          format: float
         max_distance:
           type: number
+          format: float
         filter:
           $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
     _common.query_dsl:NumberRangeQuery:
@@ -39621,6 +40101,7 @@ components:
             A boost value between 0 and 1.0 decreases the relevance score.
             A value greater than 1.0 increases the relevance score.
           type: number
+          format: float
         _name:
           type: string
     _common.query_dsl:QueryContainer:
@@ -39877,10 +40358,12 @@ components:
               $ref: '#/components/schemas/_common:Fuzziness'
             fuzzy_max_expansions:
               description: Maximum number of terms to which the query expands for fuzzy matching.
-              type: number
+              type: integer
+              format: int32
             fuzzy_prefix_length:
               description: Number of beginning characters left unchanged for fuzzy matching.
-              type: number
+              type: integer
+              format: int32
             fuzzy_rewrite:
               $ref: '#/components/schemas/_common:MultiTermQueryRewrite'
             fuzzy_transpositions:
@@ -39891,12 +40374,14 @@ components:
               type: boolean
             max_determinized_states:
               description: Maximum number of automaton states required for the query.
-              type: number
+              type: integer
+              format: int32
             minimum_should_match:
               $ref: '#/components/schemas/_common:MinimumShouldMatch'
             phrase_slop:
               description: Maximum number of positions allowed between matching tokens for phrases.
-              type: number
+              type: integer
+              format: int32
             query:
               description: Query string you wish to parse and use for search.
               type: string
@@ -39915,6 +40400,7 @@ components:
             tie_breaker:
               description: How to combine the queries generated from the individual search terms in the resulting `dis_max` query.
               type: number
+              format: float
             time_zone:
               $ref: '#/components/schemas/_common:TimeZone'
             type:
@@ -39928,7 +40414,8 @@ components:
           $ref: '#/components/schemas/_common:Field'
         seed:
           oneOf:
-            - type: number
+            - type: integer
+              format: int32
             - type: string
     _common.query_dsl:RangeQuery:
       oneOf:
@@ -39961,6 +40448,7 @@ components:
             scaling_factor:
               description: Configurable scaling factor.
               type: number
+              format: float
           required:
             - scaling_factor
     _common.query_dsl:RankFeatureFunctionSaturation:
@@ -39971,6 +40459,7 @@ components:
             pivot:
               description: Configurable pivot value so that the result will be less than 0.5.
               type: number
+              format: float
     _common.query_dsl:RankFeatureFunctionSigmoid:
       allOf:
         - $ref: '#/components/schemas/_common.query_dsl:RankFeatureFunction'
@@ -39979,9 +40468,11 @@ components:
             pivot:
               description: Configurable pivot value so that the result will be less than 0.5.
               type: number
+              format: float
             exponent:
               description: Configurable Exponent.
               type: number
+              format: float
           required:
             - exponent
             - pivot
@@ -40017,7 +40508,8 @@ components:
               type: string
             max_determinized_states:
               description: Maximum number of automaton states required for the query.
-              type: number
+              type: integer
+              format: int32
             rewrite:
               $ref: '#/components/schemas/_common:MultiTermQueryRewrite'
             value:
@@ -40064,6 +40556,7 @@ components:
             min_score:
               description: Documents with a score lower than this floating point number are excluded from the search results.
               type: number
+              format: float
             query:
               $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
             script:
@@ -40120,10 +40613,12 @@ components:
               $ref: '#/components/schemas/_common.query_dsl:SimpleQueryStringFlags'
             fuzzy_max_expansions:
               description: Maximum number of terms to which the query expands for fuzzy matching.
-              type: number
+              type: integer
+              format: int32
             fuzzy_prefix_length:
               description: Number of beginning characters left unchanged for fuzzy matching.
-              type: number
+              type: integer
+              format: int32
             fuzzy_transpositions:
               description: If `true`, edits for fuzzy matching include transpositions of two adjacent characters (for example, `ab` to `ba`).
               type: boolean
@@ -40171,7 +40666,8 @@ components:
           properties:
             end:
               description: Controls the maximum end position permitted in a match.
-              type: number
+              type: integer
+              format: int32
             match:
               $ref: '#/components/schemas/_common.query_dsl:SpanQuery'
           required:
@@ -40208,7 +40704,8 @@ components:
               type: boolean
             slop:
               description: Controls the maximum number of intervening unmatched positions permitted.
-              type: number
+              type: integer
+              format: int32
           required:
             - clauses
     _common.query_dsl:SpanNotQuery:
@@ -40220,17 +40717,20 @@ components:
               description: |-
                 The number of tokens from within the include span that can't have overlap with the exclude span.
                 Equivalent to setting both `pre` and `post`.
-              type: number
+              type: integer
+              format: int32
             exclude:
               $ref: '#/components/schemas/_common.query_dsl:SpanQuery'
             include:
               $ref: '#/components/schemas/_common.query_dsl:SpanQuery'
             post:
               description: The number of tokens after the include span that can't have overlap with the exclude span.
-              type: number
+              type: integer
+              format: int32
             pre:
               description: The number of tokens before the include span that can't have overlap with the exclude span.
-              type: number
+              type: integer
+              format: int32
           required:
             - exclude
             - include
@@ -40561,8 +41061,8 @@ components:
             - string
         _index:
           description: |-
-            Name of the index associated with the operation.
-            If the operation targeted a data stream, this is the backing index into which the document was written.
+            The name of the index associated with the operation.
+            If the operation targets a data stream, this is the backing index into which the document was written.
           type: string
         status:
           description: HTTP status code returned for the operation.
@@ -40595,19 +41095,19 @@ components:
       properties:
         detect_noop:
           description: |-
-            Set to false to disable setting 'result' in the response
+            When `false` disables the setting 'result' in the response
             to 'noop' if no change to the document occurred.
           type: boolean
         doc:
           description: A partial update to an existing document.
           type: object
         doc_as_upsert:
-          description: Set to true to use the contents of 'doc' as the value of 'upsert'
+          description: When `true`, uses the contents of 'doc' as the value of 'upsert'.
           type: boolean
         script:
           $ref: '#/components/schemas/_common:Script'
         scripted_upsert:
-          description: Set to true to execute the script whether or not the document exists.
+          description: When `true`, executes the script whether or not the document exists.
           type: boolean
         _source:
           $ref: '#/components/schemas/_core.search:SourceConfig'
@@ -40622,7 +41122,7 @@ components:
         - type: object
           properties:
             require_alias:
-              description: If `true`, the request's actions must target an index alias.
+              description: When `true`, the request's actions must target an index alias.
               type: boolean
             retry_on_conflict:
               type: number
@@ -40634,7 +41134,6 @@ components:
             dynamic_templates:
               description: |-
                 A map from the full name of fields to the name of dynamic templates.
-                Defaults to an empty map.
                 If a name matches a dynamic template, then that template will be applied regardless of other match predicates defined in the template.
                 If a field is already defined in the mapping, then this parameter won't be used.
               type: object
@@ -40642,12 +41141,12 @@ components:
                 type: string
             pipeline:
               description: |-
-                ID of the pipeline to use to preprocess incoming documents.
-                If the index has a default ingest pipeline specified, then setting the value to `_none` disables the default ingest pipeline for this request.
-                If a final pipeline is configured it will always run, regardless of the value of this parameter.
+                The pipeline ID for preprocessing documents.
+                When the index has a default ingest pipeline specified, then setting the value to `_none` disables the default ingest pipeline for this request.
+                When a final pipeline is configured, that pipeline will always run, regardless of the value of this parameter.
               type: string
             require_alias:
-              description: If `true`, the request's actions must target an index alias.
+              description: When `true`, require that all actions target an index alias rather than an index. Default is `false`.
               type: boolean
     _core.explain:Explanation:
       type: object
@@ -41591,6 +42090,12 @@ components:
         - chars
         - sentence
         - word
+    _core.search:BuiltinHighlighterType:
+      type: string
+      enum:
+        - fvh
+        - plain
+        - unified
     _core.search:Collector:
       type: object
       properties:
@@ -41721,9 +42226,7 @@ components:
                 $ref: '#/components/schemas/_core.search:InnerHits'
         max_concurrent_group_searches:
           description: The number of concurrent requests allowed to retrieve the inner_hits per group
-          type: number
-        collapse:
-          $ref: '#/components/schemas/_core.search:FieldCollapse'
+          type: integer
       required:
         - field
     _core.search:Highlight:
@@ -41841,11 +42344,11 @@ components:
       enum:
         - styled
     _core.search:HighlighterType:
-      type: string
-      enum:
-        - fvh
-        - plain
-        - unified
+      oneOf:
+        - title: builtin
+          $ref: '#/components/schemas/_core.search:BuiltinHighlighterType'
+        - title: custom
+          type: string
     _core.search:HighlightField:
       allOf:
         - $ref: '#/components/schemas/_core.search:HighlightBase'
@@ -41948,10 +42451,10 @@ components:
           $ref: '#/components/schemas/_common:Name'
         size:
           description: The maximum number of hits to return per `inner_hits`.
-          type: number
+          type: integer
         from:
           description: Inner hit starting document offset.
-          type: number
+          type: integer
         collapse:
           $ref: '#/components/schemas/_core.search:FieldCollapse'
         docvalue_fields:
@@ -42242,11 +42745,14 @@ components:
     _core.search:SourceConfig:
       description: Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.
       oneOf:
-        - type: boolean
-        - type: array
+        - title: fetch
+          type: boolean
+        - title: includes
+          type: array
           items:
             $ref: '#/components/schemas/_common:Field'
-        - $ref: '#/components/schemas/_core.search:SourceFilter'
+        - title: filter
+          $ref: '#/components/schemas/_core.search:SourceFilter'
     _core.search:SourceConfigParam:
       description: |-
         Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.
@@ -44754,8 +45260,6 @@ components:
           type: object
           additionalProperties:
             $ref: '#/components/schemas/indices._common:AliasDefinition'
-        lifecycle:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycleWithRollover'
     cluster.allocation_explain:AllocationDecision:
       type: object
       properties:
@@ -44773,9 +45277,9 @@ components:
       type: string
       enum:
         - ALWAYS
-        - NO
+        - 'NO'
         - THROTTLE
-        - YES
+        - 'YES'
     cluster.allocation_explain:AllocationStore:
       type: object
       properties:
@@ -44854,12 +45358,12 @@ components:
       enum:
         - allocation_delayed
         - awaiting_info
-        - no
+        - 'no'
         - no_attempt
         - no_valid_shard_copy
         - throttled
         - worse_balance
-        - yes
+        - 'yes'
     cluster.allocation_explain:DiskUsage:
       type: object
       properties:
@@ -46800,13 +47304,6 @@ components:
             If `true`, the alias is hidden.
             All indices for the alias must have the same `is_hidden` value.
           type: boolean
-    indices._common:CacheQueries:
-      type: object
-      properties:
-        enabled:
-          type: boolean
-      required:
-        - enabled
     indices._common:DataStream:
       type: object
       properties:
@@ -46835,8 +47332,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/indices._common:DataStreamIndex'
-        lifecycle:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycleWithRollover'
         name:
           $ref: '#/components/schemas/_common:DataStreamName'
         replicated:
@@ -46875,55 +47370,6 @@ components:
       required:
         - index_name
         - index_uuid
-    indices._common:DataStreamLifecycle:
-      type: object
-      properties:
-        data_retention:
-          $ref: '#/components/schemas/_common:Duration'
-        downsampling:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycleDownsampling'
-    indices._common:DataStreamLifecycleDownsampling:
-      type: object
-      properties:
-        rounds:
-          description: The list of downsampling rounds to execute as part of this downsampling configuration
-          type: array
-          items:
-            $ref: '#/components/schemas/indices._common:DownsamplingRound'
-      required:
-        - rounds
-    indices._common:DataStreamLifecycleRolloverConditions:
-      type: object
-      properties:
-        min_age:
-          $ref: '#/components/schemas/_common:Duration'
-        max_age:
-          type: string
-        min_docs:
-          type: number
-        max_docs:
-          type: number
-        min_size:
-          $ref: '#/components/schemas/_common:HumanReadableByteCount'
-        max_size:
-          $ref: '#/components/schemas/_common:HumanReadableByteCount'
-        min_primary_shard_size:
-          $ref: '#/components/schemas/_common:HumanReadableByteCount'
-        max_primary_shard_size:
-          $ref: '#/components/schemas/_common:HumanReadableByteCount'
-        min_primary_shard_docs:
-          type: number
-        max_primary_shard_docs:
-          type: number
-    indices._common:DataStreamLifecycleWithRollover:
-      type: object
-      properties:
-        data_retention:
-          $ref: '#/components/schemas/_common:Duration'
-        downsampling:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycleDownsampling'
-        rollover:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycleRolloverConditions'
     indices._common:DataStreamTimestampField:
       type: object
       properties:
@@ -46931,32 +47377,17 @@ components:
           $ref: '#/components/schemas/_common:Field'
       required:
         - name
-    indices._common:DownsampleConfig:
-      type: object
-      properties:
-        fixed_interval:
-          $ref: '#/components/schemas/_common:DurationLarge'
-      required:
-        - fixed_interval
-    indices._common:DownsamplingRound:
-      type: object
-      properties:
-        after:
-          $ref: '#/components/schemas/_common:Duration'
-        config:
-          $ref: '#/components/schemas/indices._common:DownsampleConfig'
-      required:
-        - after
-        - config
     indices._common:FielddataFrequencyFilter:
       type: object
       properties:
         max:
           type: number
+          format: double
         min:
           type: number
+          format: double
         min_segment_size:
-          type: number
+          type: integer
       required:
         - max
         - min
@@ -46967,6 +47398,32 @@ components:
         - checksum
         - 'false'
         - 'true'
+    indices._common:IndexErrorCause:
+      type: object
+      properties:
+        type:
+          description: The type of error
+          type: string
+        reason:
+          description: A human-readable explanation of the error, in english
+          type: string
+        root_cause:
+          type: array
+          items:
+            $ref: '#/components/schemas/indices._common:IndexErrorCause'
+        index:
+          $ref: '#/components/schemas/_common:IndexName'
+        index_uuid:
+          $ref: '#/components/schemas/_common:Uuid'
+        resource.id:
+          $ref: '#/components/schemas/_common:IndexName'
+        resource.type:
+          $ref: '#/components/schemas/_common:ResourceType'
+      required:
+        - type
+      additionalProperties:
+        title: metadata
+        description: Additional details about the error.
     indices._common:IndexingPressure:
       type: object
       properties:
@@ -46982,14 +47439,17 @@ components:
             Number of outstanding bytes that may be consumed by indexing requests. When this limit is reached or exceeded,
             the node will reject new coordinating and primary operations. When replica operations consume 1.5x this limit,
             the node will reject new replica operations. Defaults to 10% of the heap.
-          type: number
-    indices._common:IndexingSlowlogSettings:
+          oneOf:
+            - type: string
+            - type: integer
+              format: int64
+    indices._common:IndexingSlowlog:
       type: object
       properties:
         level:
           type: string
         source:
-          type: number
+          type: integer
         reformat:
           type: boolean
         threshold:
@@ -47021,9 +47481,7 @@ components:
       type: object
       properties:
         threshold_enabled:
-          oneOf:
-            - type: boolean
-            - type: string
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
     indices._common:IndexRoutingAllocationInclude:
       type: object
       properties:
@@ -47109,18 +47567,20 @@ components:
                 type: string
         soft_deletes:
           $ref: '#/components/schemas/indices._common:SoftDeletes'
+        soft_deletes.retention_lease.period:
+          $ref: '#/components/schemas/_common:Duration'
         sort:
           $ref: '#/components/schemas/indices._common:IndexSegmentSort'
         number_of_shards:
           oneOf:
-            - type: number
+            - type: integer
             - type: string
         number_of_replicas:
           oneOf:
-            - type: number
+            - type: integer
             - type: string
         number_of_routing_shards:
-          type: number
+          type: integer
         check_on_startup:
           $ref: '#/components/schemas/indices._common:IndexCheckOnStartup'
         codec:
@@ -47130,43 +47590,59 @@ components:
         load_fixed_bitset_filters_eagerly:
           type: boolean
         hidden:
-          oneOf:
-            - type: boolean
-            - type: string
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
         auto_expand_replicas:
           type: string
         merge:
-          $ref: '#/components/schemas/indices._common:Merge'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMerge'
+        merge.scheduler.max_thread_count:
+          $ref: '#/components/schemas/_common:Stringifiedinteger'
         search:
-          $ref: '#/components/schemas/indices._common:SettingsSearch'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSearch'
+        search.idle.after:
+          $ref: '#/components/schemas/_common:Duration'
         refresh_interval:
           $ref: '#/components/schemas/_common:Duration'
         max_result_window:
-          type: number
+          type: integer
         max_inner_result_window:
-          type: number
+          type: integer
         max_rescore_window:
-          type: number
+          type: integer
         max_docvalue_fields_search:
-          type: number
+          type: integer
         max_script_fields:
-          type: number
+          type: integer
         max_ngram_diff:
-          type: number
+          type: integer
         max_shingle_diff:
-          type: number
+          type: integer
         blocks:
           $ref: '#/components/schemas/indices._common:IndexSettingBlocks'
+        blocks.read_only:
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
+        blocks.read_only_allow_delete:
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
+        blocks.read:
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
+        blocks.write:
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
+        blocks.metadata:
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
         max_refresh_listeners:
-          type: number
+          type: integer
         analyze:
-          $ref: '#/components/schemas/indices._common:SettingsAnalyze'
+          $ref: '#/components/schemas/indices._common:IndexSettingsAnalyze'
+        analyze.max_token_count:
+          $ref: '#/components/schemas/_common:Stringifiedinteger'
         highlight:
-          $ref: '#/components/schemas/indices._common:SettingsHighlight'
+          $ref: '#/components/schemas/indices._common:IndexSettingsHighlight'
+        highlight.max_analyzed_offset:
+          type: integer
         max_terms_count:
-          type: number
+          type: integer
         max_regex_length:
-          type: number
+          type: integer
         routing:
           $ref: '#/components/schemas/indices._common:IndexRouting'
         gc_deletes:
@@ -47177,6 +47653,8 @@ components:
           $ref: '#/components/schemas/_common:PipelineName'
         lifecycle:
           $ref: '#/components/schemas/indices._common:IndexSettingsLifecycle'
+        lifecycle.name:
+          $ref: '#/components/schemas/_common:Name'
         provided_name:
           $ref: '#/components/schemas/_common:Name'
         creation_date:
@@ -47188,25 +47666,29 @@ components:
         version:
           $ref: '#/components/schemas/indices._common:IndexVersioning'
         verified_before_close:
-          oneOf:
-            - type: boolean
-            - type: string
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
         format:
           oneOf:
             - type: string
             - type: number
         max_slices_per_scroll:
-          type: number
+          type: integer
         translog:
           $ref: '#/components/schemas/indices._common:Translog'
+        translog.durability:
+          $ref: '#/components/schemas/indices._common:TranslogDurability'
+        translog.flush_threshold_size:
+          $ref: '#/components/schemas/_common:HumanReadableByteCount'
         query_string:
-          $ref: '#/components/schemas/indices._common:SettingsQueryString'
+          $ref: '#/components/schemas/indices._common:IndexSettingsQueryString'
+        query_string.lenient:
+          $ref: '#/components/schemas/_common:Stringifiedboolean'
         priority:
           oneOf:
             - type: number
             - type: string
         top_metrics_max_size:
-          type: number
+          type: integer
         analysis:
           $ref: '#/components/schemas/indices._common:IndexSettingsAnalysis'
         settings:
@@ -47214,18 +47696,23 @@ components:
         time_series:
           $ref: '#/components/schemas/indices._common:IndexSettingsTimeSeries'
         queries:
-          $ref: '#/components/schemas/indices._common:Queries'
+          $ref: '#/components/schemas/indices._common:IndexSettingsQueries'
         similarity:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarity'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarity'
         mapping:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettings'
-        indexing.slowlog:
-          $ref: '#/components/schemas/indices._common:IndexingSlowlogSettings'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMapping'
+        indexing:
+          $ref: '#/components/schemas/indices._common:IndexSettingsIndexing'
         indexing_pressure:
           $ref: '#/components/schemas/indices._common:IndexingPressure'
         store:
-          $ref: '#/components/schemas/indices._common:Storage'
-      additionalProperties: {}
+          $ref: '#/components/schemas/indices._common:IndexSettingsStore'
+        knn:
+          type: boolean
+        knn.algo_param.ef_search:
+          type: integer
+      additionalProperties:
+        title: custom_settings
     indices._common:IndexSettingsAnalysis:
       type: object
       properties:
@@ -47249,6 +47736,21 @@ components:
           type: object
           additionalProperties:
             $ref: '#/components/schemas/_common.analysis:Tokenizer'
+    indices._common:IndexSettingsAnalyze:
+      type: object
+      properties:
+        max_token_count:
+          $ref: '#/components/schemas/_common:Stringifiedinteger'
+    indices._common:IndexSettingsHighlight:
+      type: object
+      properties:
+        max_analyzed_offset:
+          type: integer
+    indices._common:IndexSettingsIndexing:
+      type: object
+      properties:
+        slowlog:
+          $ref: '#/components/schemas/indices._common:IndexingSlowlog'
     indices._common:IndexSettingsLifecycle:
       type: object
       properties:
@@ -47261,7 +47763,7 @@ components:
             If specified, this is the timestamp used to calculate the index age for its phase transitions. Use this setting
             if you create a new index that contains old data and want to use the original creation date to calculate the index
             age. Specified as a Unix epoch value in milliseconds.
-          type: number
+          $ref: '#/components/schemas/_common:StringifiedEpochTimeUnitMillis'
         parse_origination_date:
           description: |-
             Set to true to parse the origination date from the index name. This origination date is used to calculate the index age
@@ -47284,140 +47786,44 @@ components:
       properties:
         wait_time_threshold:
           $ref: '#/components/schemas/_common:Duration'
-    indices._common:IndexSettingsTimeSeries:
-      type: object
-      properties:
-        end_time:
-          $ref: '#/components/schemas/_common:DateTime'
-        start_time:
-          $ref: '#/components/schemas/_common:DateTime'
-    indices._common:IndexState:
-      type: object
-      properties:
-        aliases:
-          type: object
-          additionalProperties:
-            $ref: '#/components/schemas/indices._common:Alias'
-        mappings:
-          $ref: '#/components/schemas/_common.mapping:TypeMapping'
-        settings:
-          $ref: '#/components/schemas/indices._common:IndexSettings'
-        defaults:
-          $ref: '#/components/schemas/indices._common:IndexSettings'
-        data_stream:
-          $ref: '#/components/schemas/_common:DataStreamName'
-        lifecycle:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycle'
-    indices._common:IndexTemplate:
-      type: object
-      properties:
-        index_patterns:
-          $ref: '#/components/schemas/_common:Names'
-        composed_of:
-          description: |-
-            An ordered list of component template names.
-            Component templates are merged in the order specified, meaning that the last component template specified has the highest precedence.
-          type: array
-          items:
-            $ref: '#/components/schemas/_common:Name'
-        template:
-          $ref: '#/components/schemas/indices._common:IndexTemplateSummary'
-        version:
-          $ref: '#/components/schemas/_common:VersionNumber'
-        priority:
-          description: |-
-            Priority to determine index template precedence when a new data stream or index is created.
-            The index template with the highest priority is chosen.
-            If no priority is specified the template is treated as though it is of priority 0 (lowest priority).
-            This number is not automatically generated by OpenSearch.
-          type: number
-        _meta:
-          $ref: '#/components/schemas/_common:Metadata'
-        allow_auto_create:
-          type: boolean
-        data_stream:
-          $ref: '#/components/schemas/indices._common:IndexTemplateDataStreamConfiguration'
-      required:
-        - index_patterns
-      description: New index template definition to be simulated, if no index template name is specified.
-    indices._common:IndexTemplateDataStreamConfiguration:
-      type: object
-      properties:
-        hidden:
-          description: If true, the data stream is hidden.
-          type: boolean
-        allow_custom_routing:
-          description: If true, the data stream supports custom routing.
-          type: boolean
-        timestamp_field:
-          $ref: '#/components/schemas/indices._common:DataStreamTimestampField'
-    indices._common:IndexTemplateSummary:
-      type: object
-      properties:
-        aliases:
-          description: |-
-            Aliases to add.
-            If the index template includes a `data_stream` object, these are data stream aliases.
-            Otherwise, these are index aliases.
-            Data stream aliases ignore the `index_routing`, `routing`, and `search_routing` options.
-          type: object
-          additionalProperties:
-            $ref: '#/components/schemas/indices._common:Alias'
-        mappings:
-          $ref: '#/components/schemas/_common.mapping:TypeMapping'
-        settings:
-          $ref: '#/components/schemas/indices._common:IndexSettings'
-        lifecycle:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycleWithRollover'
-    indices._common:IndexVersioning:
-      type: object
-      properties:
-        created:
-          $ref: '#/components/schemas/_common:VersionString'
-        created_string:
-          type: string
-    indices._common:ManagedBy:
-      type: string
-      enum:
-        - Data stream lifecycle
-        - Index Lifecycle Management
-        - Unmanaged
-    indices._common:MappingLimitSettings:
+    indices._common:IndexSettingsMapping:
       type: object
       properties:
         coerce:
           type: boolean
         total_fields:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettingsTotalFields'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMappingLimitTotalFields'
         depth:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettingsDepth'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMappingLimitDepth'
         nested_fields:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettingsNestedFields'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMappingLimitNestedFields'
         nested_objects:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettingsNestedObjects'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMappingLimitNestedObjects'
         field_name_length:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettingsFieldNameLength'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMappingLimitFieldNameLength'
         dimension_fields:
-          $ref: '#/components/schemas/indices._common:MappingLimitSettingsDimensionFields'
+          $ref: '#/components/schemas/indices._common:IndexSettingsMappingLimitDimensionFields'
         ignore_malformed:
           type: boolean
-    indices._common:MappingLimitSettingsDepth:
+    indices._common:IndexSettingsMappingLimitDepth:
       type: object
       properties:
         limit:
           description: |-
             The maximum depth for a field, which is measured as the number of inner objects. For instance, if all fields are defined
             at the root object level, then the depth is 1. If there is one object mapping, then the depth is 2, etc.
-          type: number
-    indices._common:MappingLimitSettingsDimensionFields:
+          type: integer
+          format: int64
+    indices._common:IndexSettingsMappingLimitDimensionFields:
       type: object
       properties:
         limit:
           description: |-
             [preview] This functionality is in technical preview and may be changed or removed in a future release.
             OpenSearch will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.
-          type: number
-    indices._common:MappingLimitSettingsFieldNameLength:
+          type: integer
+          format: int64
+    indices._common:IndexSettingsMappingLimitFieldNameLength:
       type: object
       properties:
         limit:
@@ -47425,8 +47831,9 @@ components:
             Setting for the maximum length of a field name. This setting isn't really something that addresses mappings explosion but
             might still be useful if you want to limit the field length. It usually shouldn't be necessary to set this setting. The
             default is okay unless a user starts to add a huge number of fields with really long names. Default is `Long.MAX_VALUE` (no limit).
-          type: number
-    indices._common:MappingLimitSettingsNestedFields:
+          type: integer
+          format: int64
+    indices._common:IndexSettingsMappingLimitNestedFields:
       type: object
       properties:
         limit:
@@ -47434,16 +47841,18 @@ components:
             The maximum number of distinct nested mappings in an index. The nested type should only be used in special cases, when
             arrays of objects need to be queried independently of each other. To safeguard against poorly designed mappings, this
             setting limits the number of unique nested types per index.
-          type: number
-    indices._common:MappingLimitSettingsNestedObjects:
+          type: integer
+          format: int64
+    indices._common:IndexSettingsMappingLimitNestedObjects:
       type: object
       properties:
         limit:
           description: |-
             The maximum number of nested JSON objects that a single document can contain across all nested types. This limit helps
             to prevent out of memory errors when a document contains too many nested objects.
-          type: number
-    indices._common:MappingLimitSettingsTotalFields:
+          type: integer
+          format: int64
+    indices._common:IndexSettingsMappingLimitTotalFields:
       type: object
       properties:
         limit:
@@ -47451,113 +47860,72 @@ components:
             The maximum number of fields in an index. Field and object mappings, as well as field aliases count towards this limit.
             The limit is in place to prevent mappings and searches from becoming too large. Higher values can lead to performance
             degradations and memory issues, especially in clusters with a high load or few resources.
-          type: number
-    indices._common:Merge:
+          type: integer
+          format: int64
+    indices._common:IndexSettingsMerge:
       type: object
       properties:
         scheduler:
-          $ref: '#/components/schemas/indices._common:MergeScheduler'
-    indices._common:MergeScheduler:
+          $ref: '#/components/schemas/indices._common:IndexSettingsMergeScheduler'
+    indices._common:IndexSettingsMergeScheduler:
       type: object
       properties:
         max_thread_count:
           $ref: '#/components/schemas/_common:Stringifiedinteger'
         max_merge_count:
           $ref: '#/components/schemas/_common:Stringifiedinteger'
-    indices._common:NumericFielddata:
-      type: object
-      properties:
-        format:
-          $ref: '#/components/schemas/indices._common:NumericFielddataFormat'
-      required:
-        - format
-    indices._common:NumericFielddataFormat:
-      type: string
-      enum:
-        - array
-        - disabled
-    indices._common:Queries:
+    indices._common:IndexSettingsQueries:
       type: object
       properties:
         cache:
-          $ref: '#/components/schemas/indices._common:CacheQueries'
-    indices._common:RetentionLease:
+          $ref: '#/components/schemas/indices._common:IndexSettingsQueriesCache'
+    indices._common:IndexSettingsQueriesCache:
       type: object
       properties:
-        period:
-          $ref: '#/components/schemas/_common:Duration'
+        enabled:
+          type: boolean
       required:
-        - period
-    indices._common:SearchIdle:
-      type: object
-      properties:
-        after:
-          $ref: '#/components/schemas/_common:Duration'
-    indices._common:SegmentSortMissing:
-      type: string
-      enum:
-        - _first
-        - _last
-    indices._common:SegmentSortMode:
-      type: string
-      enum:
-        - max
-        - min
-    indices._common:SegmentSortOrder:
-      type: string
-      enum:
-        - asc
-        - desc
-    indices._common:SettingsAnalyze:
-      type: object
-      properties:
-        max_token_count:
-          $ref: '#/components/schemas/_common:Stringifiedinteger'
-    indices._common:SettingsHighlight:
-      type: object
-      properties:
-        max_analyzed_offset:
-          type: number
-    indices._common:SettingsQueryString:
+        - enabled
+    indices._common:IndexSettingsQueryString:
       type: object
       properties:
         lenient:
           $ref: '#/components/schemas/_common:Stringifiedboolean'
-      required:
-        - lenient
-    indices._common:SettingsSearch:
+    indices._common:IndexSettingsSearch:
       type: object
       properties:
         idle:
           $ref: '#/components/schemas/indices._common:SearchIdle'
         slowlog:
-          $ref: '#/components/schemas/indices._common:SlowlogSettings'
-    indices._common:SettingsSimilarity:
+          $ref: '#/components/schemas/indices._common:SearchSlowlog'
+    indices._common:IndexSettingsSimilarity:
       type: object
       properties:
         bm25:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityBm25'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityBm25'
         dfi:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityDfi'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityDfi'
         dfr:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityDfr'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityDfr'
         ib:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityIb'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityIb'
         lmd:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityLmd'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityLmd'
         lmj:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityLmj'
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityLmj'
         scripted_tfidf:
-          $ref: '#/components/schemas/indices._common:SettingsSimilarityScriptedTfidf'
-    indices._common:SettingsSimilarityBm25:
+          $ref: '#/components/schemas/indices._common:IndexSettingsSimilarityScriptedTfidf'
+    indices._common:IndexSettingsSimilarityBm25:
       type: object
       properties:
         b:
           type: number
+          format: float
         discount_overlaps:
           type: boolean
         k1:
           type: number
+          format: float
         type:
           type: string
           enum:
@@ -47567,7 +47935,7 @@ components:
         - discount_overlaps
         - k1
         - type
-    indices._common:SettingsSimilarityDfi:
+    indices._common:IndexSettingsSimilarityDfi:
       type: object
       properties:
         independence_measure:
@@ -47579,7 +47947,7 @@ components:
       required:
         - independence_measure
         - type
-    indices._common:SettingsSimilarityDfr:
+    indices._common:IndexSettingsSimilarityDfr:
       type: object
       properties:
         after_effect:
@@ -47587,7 +47955,7 @@ components:
         basic_model:
           $ref: '#/components/schemas/_common:DFRBasicModel'
         normalization:
-          $ref: '#/components/schemas/_common:Normalization'
+          $ref: '#/components/schemas/_common:TermFrequencyNormalization'
         type:
           type: string
           enum:
@@ -47597,7 +47965,7 @@ components:
         - basic_model
         - normalization
         - type
-    indices._common:SettingsSimilarityIb:
+    indices._common:IndexSettingsSimilarityIb:
       type: object
       properties:
         distribution:
@@ -47605,7 +47973,7 @@ components:
         lambda:
           $ref: '#/components/schemas/_common:IBLambda'
         normalization:
-          $ref: '#/components/schemas/_common:Normalization'
+          $ref: '#/components/schemas/_common:TermFrequencyNormalization'
         type:
           type: string
           enum:
@@ -47615,11 +47983,12 @@ components:
         - lambda
         - normalization
         - type
-    indices._common:SettingsSimilarityLmd:
+    indices._common:IndexSettingsSimilarityLmd:
       type: object
       properties:
         mu:
           type: number
+          format: float
         type:
           type: string
           enum:
@@ -47627,11 +47996,12 @@ components:
       required:
         - mu
         - type
-    indices._common:SettingsSimilarityLmj:
+    indices._common:IndexSettingsSimilarityLmj:
       type: object
       properties:
         lambda:
           type: number
+          format: float
         type:
           type: string
           enum:
@@ -47639,7 +48009,7 @@ components:
       required:
         - lambda
         - type
-    indices._common:SettingsSimilarityScriptedTfidf:
+    indices._common:IndexSettingsSimilarityScriptedTfidf:
       type: object
       properties:
         script:
@@ -47651,17 +48021,169 @@ components:
       required:
         - script
         - type
-    indices._common:SlowlogSettings:
+    indices._common:IndexSettingsStore:
+      type: object
+      properties:
+        type:
+          $ref: '#/components/schemas/indices._common:StorageType'
+        allow_mmap:
+          description: |-
+            You can restrict the use of the mmapfs and the related hybridfs store type via the setting node.store.allow_mmap.
+            This is a boolean setting indicating whether or not memory-mapping is allowed. The default is to allow it. This
+            setting is useful, for example, if you are in an environment where you can not control the ability to create a lot
+            of memory maps so you need disable the ability to use memory-mapping.
+          type: boolean
+      required:
+        - type
+    indices._common:IndexSettingsTimeSeries:
+      type: object
+      properties:
+        end_time:
+          $ref: '#/components/schemas/_common:DateTime'
+        start_time:
+          $ref: '#/components/schemas/_common:DateTime'
+    indices._common:IndexState:
+      type: object
+      properties:
+        aliases:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/indices._common:Alias'
+        mappings:
+          $ref: '#/components/schemas/_common.mapping:TypeMapping'
+        settings:
+          $ref: '#/components/schemas/indices._common:IndexSettings'
+        defaults:
+          $ref: '#/components/schemas/indices._common:IndexSettings'
+        data_stream:
+          $ref: '#/components/schemas/_common:DataStreamName'
+    indices._common:IndexTemplate:
+      type: object
+      properties:
+        index_patterns:
+          $ref: '#/components/schemas/_common:Names'
+        composed_of:
+          description: |-
+            An ordered list of component template names.
+            Component templates are merged in the order specified, meaning that the last component template specified has the highest precedence.
+          type: array
+          items:
+            $ref: '#/components/schemas/_common:Name'
+        template:
+          $ref: '#/components/schemas/indices._common:IndexTemplateSummary'
+        version:
+          $ref: '#/components/schemas/_common:VersionNumber'
+        priority:
+          description: |-
+            Priority to determine index template precedence when a new data stream or index is created.
+            The index template with the highest priority is chosen.
+            If no priority is specified the template is treated as though it is of priority 0 (lowest priority).
+            This number is not automatically generated by OpenSearch.
+          type: number
+        _meta:
+          $ref: '#/components/schemas/_common:Metadata'
+        allow_auto_create:
+          type: boolean
+        data_stream:
+          $ref: '#/components/schemas/indices._common:IndexTemplateDataStreamConfiguration'
+      required:
+        - index_patterns
+      description: New index template definition to be simulated, if no index template name is specified.
+    indices._common:IndexTemplateDataStreamConfiguration:
+      type: object
+      properties:
+        hidden:
+          description: If true, the data stream is hidden.
+          type: boolean
+        allow_custom_routing:
+          description: If true, the data stream supports custom routing.
+          type: boolean
+        timestamp_field:
+          $ref: '#/components/schemas/indices._common:DataStreamTimestampField'
+    indices._common:IndexTemplateSummary:
+      type: object
+      properties:
+        aliases:
+          description: |-
+            Aliases to add.
+            If the index template includes a `data_stream` object, these are data stream aliases.
+            Otherwise, these are index aliases.
+            Data stream aliases ignore the `index_routing`, `routing`, and `search_routing` options.
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/indices._common:Alias'
+        mappings:
+          $ref: '#/components/schemas/_common.mapping:TypeMapping'
+        settings:
+          $ref: '#/components/schemas/indices._common:IndexSettings'
+    indices._common:IndexVersioning:
+      type: object
+      properties:
+        created:
+          $ref: '#/components/schemas/_common:VersionString'
+        created_string:
+          type: string
+    indices._common:ManagedBy:
+      type: string
+      enum:
+        - Data stream lifecycle
+        - Index Lifecycle Management
+        - Unmanaged
+    indices._common:NumericFielddata:
+      type: object
+      properties:
+        format:
+          $ref: '#/components/schemas/indices._common:NumericFielddataFormat'
+      required:
+        - format
+    indices._common:NumericFielddataFormat:
+      type: string
+      enum:
+        - array
+        - disabled
+    indices._common:RetentionLease:
+      type: object
+      properties:
+        period:
+          $ref: '#/components/schemas/_common:Duration'
+      required:
+        - period
+    indices._common:SearchIdle:
+      type: object
+      properties:
+        after:
+          $ref: '#/components/schemas/_common:Duration'
+    indices._common:SearchSlowlog:
       type: object
       properties:
         level:
           type: string
-        source:
-          type: number
         reformat:
           type: boolean
         threshold:
-          $ref: '#/components/schemas/indices._common:SlowlogThresholds'
+          $ref: '#/components/schemas/indices._common:SearchSlowlogThresholds'
+    indices._common:SearchSlowlogThresholds:
+      type: object
+      properties:
+        query:
+          $ref: '#/components/schemas/indices._common:SlowlogThresholdLevels'
+        fetch:
+          $ref: '#/components/schemas/indices._common:SlowlogThresholdLevels'
+    indices._common:SegmentSortMissing:
+      type: string
+      enum:
+        - _first
+        - _last
+    indices._common:SegmentSortMode:
+      type: string
+      enum:
+        - max
+        - min
+    indices._common:SegmentSortOrder:
+      type: string
+      enum:
+        - asc
+        - desc
     indices._common:SlowlogThresholdLevels:
       type: object
       properties:
@@ -47673,13 +48195,6 @@ components:
           $ref: '#/components/schemas/_common:Duration'
         trace:
           $ref: '#/components/schemas/_common:Duration'
-    indices._common:SlowlogThresholds:
-      type: object
-      properties:
-        query:
-          $ref: '#/components/schemas/indices._common:SlowlogThresholdLevels'
-        fetch:
-          $ref: '#/components/schemas/indices._common:SlowlogThresholdLevels'
     indices._common:SoftDeletes:
       type: object
       properties:
@@ -47688,20 +48203,6 @@ components:
           type: boolean
         retention_lease:
           $ref: '#/components/schemas/indices._common:RetentionLease'
-    indices._common:Storage:
-      type: object
-      properties:
-        type:
-          $ref: '#/components/schemas/indices._common:StorageType'
-        allow_mmap:
-          description: |-
-            You can restrict the use of the mmapfs and the related hybridfs store type via the setting node.store.allow_mmap.
-            This is a boolean setting indicating whether or not memory-mapping is allowed. The default is to allow it. This
-            setting is useful, for example, if you are in an environment where you can not control the ability to create a lot
-            of memory maps so you need disable the ability to use memory-mapping.
-          type: boolean
-      required:
-        - type
     indices._common:StorageType:
       type: string
       enum:
@@ -47750,6 +48251,8 @@ components:
     indices._common:TranslogDurability:
       type: string
       enum:
+        - ASYNC
+        - REQUEST
         - async
         - request
     indices._common:TranslogRetention:
@@ -47981,8 +48484,6 @@ components:
           $ref: '#/components/schemas/_common.mapping:TypeMapping'
         settings:
           $ref: '#/components/schemas/indices._common:IndexSettings'
-        lifecycle:
-          $ref: '#/components/schemas/indices._common:DataStreamLifecycle'
     indices.recovery:FileDetails:
       type: object
       properties:
@@ -53034,7 +53535,7 @@ components:
           type: string
         x:
           type: integer
-        y:
+        'y':
           type: integer
         w:
           type: integer
@@ -53046,7 +53547,7 @@ components:
         - savedVisualizationId
         - w
         - x
-        - y
+        - 'y'
     query._common:Credentials:
       type: object
       properties:
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/CodeGenerator.java b/java-codegen/src/main/java/org/opensearch/client/codegen/CodeGenerator.java
index 70d12db927..8aaa9eb50d 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/CodeGenerator.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/CodeGenerator.java
@@ -43,6 +43,7 @@ public class CodeGenerator {
     private static final OperationGroupMatcher OPERATION_MATCHER = or(
         and(namespace(""), named("info")),
         namespace("dangling_indices"),
+        and(namespace("indices"), named("get")),
         and(namespace("ml"), not(named("search_models"))), // TODO: search_models is complex and ideally should re-use the search structures
         and(namespace("snapshot"), named("cleanup_repository", "clone", "verify_repository")),
         and(namespace("tasks"))
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/EnumShape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/EnumShape.java
index 90a2fae57c..1150a1813f 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/EnumShape.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/EnumShape.java
@@ -13,7 +13,9 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
+import javax.annotation.Nullable;
 import org.opensearch.client.codegen.utils.JavaClassKind;
+import org.opensearch.client.codegen.utils.Markdown;
 import org.opensearch.client.codegen.utils.Strings;
 
 public class EnumShape extends Shape {
@@ -38,14 +40,17 @@ public Collection<Type> getImplementsTypes() {
         return List.of(Types.Client.Json.JsonEnum);
     }
 
-    public void addVariant(String value, boolean deprecated) {
+    public void addVariant(String value, String description, boolean deprecated) {
         var variant = variants.get(value.toLowerCase());
         if (variant == null) {
-            variant = new Variant(value, deprecated);
+            variant = new Variant(value, description, deprecated);
             variants.put(value.toLowerCase(), variant);
         } else {
             variant.addAlias(value);
             variant.setDeprecated(variant.isDeprecated() || deprecated);
+            if (description != null) {
+                variant.setDescription(description);
+            }
         }
     }
 
@@ -61,9 +66,11 @@ public static class Variant {
         private final String wireName;
         private final Set<String> aliases = new HashSet<>();
         private boolean deprecated;
+        private String description;
 
-        public Variant(String wireName, boolean deprecated) {
+        public Variant(String wireName, String description, boolean deprecated) {
             this.wireName = wireName;
+            setDescription(description);
             this.deprecated = deprecated;
         }
 
@@ -71,6 +78,14 @@ public String getWireName() {
             return wireName;
         }
 
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(@Nullable String description) {
+            this.description = description != null ? Markdown.toJavaDocHtml(description) : null;
+        }
+
         public Set<String> getAliases() {
             return aliases;
         }
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java
index 3ecac3830d..9caa269bf5 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java
@@ -21,6 +21,7 @@
 public class ObjectShape extends Shape {
     protected final Map<String, Field> bodyFields = new TreeMap<>();
     protected Field additionalPropertiesField;
+    private String shortcutProperty;
 
     public ObjectShape(Namespace parent, String className, String typedefName, String description) {
         super(parent, className, typedefName, description);
@@ -62,6 +63,14 @@ public Field getAdditionalPropertiesField() {
         return additionalPropertiesField;
     }
 
+    public String getShortcutProperty() {
+        return shortcutProperty;
+    }
+
+    public void setShortcutProperty(String shortcutProperty) {
+        this.shortcutProperty = shortcutProperty;
+    }
+
     public boolean hasFieldsToSerialize() {
         return !bodyFields.isEmpty() || additionalPropertiesField != null;
     }
@@ -108,6 +117,10 @@ public Collection<Type> getAnnotations() {
         return (hasFieldsToSerialize() || extendsOtherShape()) && !isAbstract() ? List.of(Types.Client.Json.JsonpDeserializable) : null;
     }
 
+    public boolean shouldImplementPlainDeserializable() {
+        return Set.of("SourceField", "TypeMapping").contains(getClassName());
+    }
+
     public static class ReferencingDiscriminatedUnion {
         private final TaggedUnionShape union;
         private final String discriminatorValue;
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/SpecTransformer.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/SpecTransformer.java
index b9452504f1..93e18efdb5 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/SpecTransformer.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/SpecTransformer.java
@@ -28,6 +28,7 @@
 import org.opensearch.client.codegen.model.overrides.Overrides;
 import org.opensearch.client.codegen.model.overrides.PropertyOverride;
 import org.opensearch.client.codegen.model.overrides.SchemaOverride;
+import org.opensearch.client.codegen.model.overrides.ShouldGenerate;
 import org.opensearch.client.codegen.openapi.HttpStatusCode;
 import org.opensearch.client.codegen.openapi.In;
 import org.opensearch.client.codegen.openapi.JsonPointer;
@@ -252,33 +253,27 @@ private Shape visit(Namespace parent, String className, String typedefName, Open
 
         var description = schema.getDescription().orElse(null);
 
-        var oneOf = schema.getOneOf();
-        var isTaggedUnion = oneOf.isPresent()
-            && (schema.getDiscriminator().isPresent() || oneOf.orElseThrow().stream().allMatch(OpenApiSchema::hasTitle));
+        var oneOf = schema.getOneOf().orElse(null);
+        var isTaggedUnion = oneOf != null
+            && (schema.getDiscriminator().isPresent() || oneOf.stream().allMatch(OpenApiSchema::hasTitle));
+        var isShortcutPropertyObject = oneOf != null && isShortcutPropertyObject(oneOf);
 
         if (schema.isArray()) {
             shape = new ArrayShape(parent, className, mapType(schema), typedefName, description);
             visitedSchemas.putIfAbsent(schema, shape);
-        } else if (schema.isStringEnum() || (oneOf.isPresent() && oneOf.get().stream().allMatch(OpenApiSchema::isStringEnum))) {
+        } else if (isEnum(schema)) {
             var enumShape = new EnumShape(parent, className, typedefName, description);
             shape = enumShape;
             visitedSchemas.putIfAbsent(schema, shape);
 
-            if (oneOf.isPresent()) {
-                oneOf.get().forEach(s -> {
-                    var isDeprecated = s.getVersionDeprecated().isPresent();
-                    s.getEnums().orElseThrow().forEach(v -> enumShape.addVariant(v, isDeprecated));
-                });
-            } else {
-                schema.getEnums().orElseThrow().forEach(v -> enumShape.addVariant(v, false));
-            }
+            visitInto(schema, enumShape);
         } else if (isTaggedUnion) {
             var discriminatingField = schema.getDiscriminator().flatMap(OpenApiDiscriminator::getPropertyName).orElse(null);
             var taggedUnion = new TaggedUnionShape(parent, className, typedefName, description, discriminatingField);
             shape = taggedUnion;
             visitedSchemas.putIfAbsent(schema, shape);
 
-            oneOf.get().forEach(s -> {
+            oneOf.forEach(s -> {
                 String name;
                 if (discriminatingField != null) {
                     var props = new HashMap<String, OpenApiSchema>();
@@ -301,7 +296,7 @@ private Shape visit(Namespace parent, String className, String typedefName, Open
                 }
                 taggedUnion.addVariant(name, mapType(s));
             });
-        } else if (schema.determineSingleType().orElse(null) == OpenApiSchemaType.Object) {
+        } else if (isShortcutPropertyObject || schema.determineSingleType().orElse(null) == OpenApiSchemaType.Object) {
             if (schema.getProperties().isEmpty() && schema.getAdditionalProperties().isPresent()) {
                 shape = new DictionaryResponseShape(
                     parent,
@@ -317,6 +312,12 @@ private Shape visit(Namespace parent, String className, String typedefName, Open
                 shape = objShape;
                 visitedSchemas.putIfAbsent(schema, shape);
 
+                if (isShortcutPropertyObject) {
+                    var shortcutProperty = oneOf.get(0).getTitle().orElseThrow();
+                    objShape.setShortcutProperty(shortcutProperty);
+                    schema = oneOf.get(1);
+                }
+
                 visitInto(schema, objShape);
             }
         } else {
@@ -369,7 +370,7 @@ private void visitInto(OpenApiSchema schema, ObjectShape shape) {
         }
     }
 
-    private Set<String> collectObjectProperties(
+    private static Set<String> collectObjectProperties(
         OpenApiSchema schema,
         Map<String, OpenApiSchema> properties,
         List<OpenApiSchema> additionalProperties
@@ -428,6 +429,21 @@ private Set<String> collectObjectProperties(
         return schema.getRequired().orElseGet(Collections::emptySet);
     }
 
+    private void visitInto(OpenApiSchema schema, EnumShape shape) {
+        var isDeprecated = schema.getVersionDeprecated().isPresent();
+
+        if (schema.hasOneOf()) {
+            schema.getOneOf().orElseThrow().forEach(s -> visitInto(s, shape));
+        } else if (schema.hasEnums()) {
+            var enums = schema.getEnums().orElseThrow();
+            var description = enums.size() == 1 ? schema.getDescription().orElse(null) : null;
+            enums.forEach(v -> shape.addVariant(v, description, isDeprecated));
+        } else if (schema.hasConst()) {
+            var value = (String) schema.getConst().orElseThrow();
+            shape.addVariant(value, schema.getDescription().orElse(null), isDeprecated);
+        }
+    }
+
     private Type mapType(OpenApiSchema schema) {
         return mapType(schema, false);
     }
@@ -452,10 +468,26 @@ private Type mapTypeInner(OpenApiSchema schema) {
         if (schema.has$ref()) {
             schema = schema.resolve();
 
+            var schemaOverrides = overrides.getSchema(schema.getPointer());
+            var overriddenMappedType = schemaOverrides.flatMap(SchemaOverride::getMappedType);
+
+            if (overriddenMappedType.isPresent()) {
+                return overriddenMappedType.get();
+            }
+
             if (!shouldKeepRef(schema)) {
                 return mapType(schema);
             }
 
+            var shouldGenerate = schemaOverrides.map(SchemaOverride::shouldGenerate).orElse(ShouldGenerate.IfNeeded);
+
+            if (shouldGenerate == ShouldGenerate.Never) {
+                return Type.builder()
+                    .withPackage(Types.Client.OpenSearch.PACKAGE + "." + schema.getNamespace().orElseThrow())
+                    .withName(schema.getName().orElseThrow())
+                    .build();
+            }
+
             var shape = visit(schema);
 
             return shape.getType();
@@ -582,8 +614,11 @@ private boolean shouldKeepRef(OpenApiSchema schema) {
         if (schema.isArray() || schema.isBoolean() || schema.isInteger() || schema.isNumber()) {
             return false;
         }
+        if (isEnum(schema)) {
+            return true;
+        }
         if (schema.isString()) {
-            return schema.hasEnums();
+            return false;
         }
         if (schema.isObject()
             && schema.getProperties().map(Map::isEmpty).orElse(true)
@@ -594,21 +629,24 @@ private boolean shouldKeepRef(OpenApiSchema schema) {
             if (schema.getDiscriminator().isPresent()) {
                 return true;
             }
+
+            var oneOf = schema.getOneOf().orElseThrow();
+
+            if (isShortcutPropertyObject(oneOf)) {
+                return true;
+            }
+
             var allObject = true;
             var allHaveTitle = true;
-            var allStringEnum = true;
-            for (var s : schema.getOneOf().orElseThrow()) {
+            for (var s : oneOf) {
                 if (s.determineSingleType().orElse(null) != OpenApiSchemaType.Object) {
                     allObject = false;
                 }
                 if (s.getTitle().isEmpty()) {
                     allHaveTitle = false;
                 }
-                if (!s.isStringEnum()) {
-                    allStringEnum = false;
-                }
             }
-            return allObject || allHaveTitle || allStringEnum;
+            return allObject || allHaveTitle;
         }
         if (schema.getAllOf().isPresent()) {
             return schema.determineSingleType().orElse(null) == OpenApiSchemaType.Object;
@@ -628,4 +666,37 @@ private static boolean isOneOfSingleAndArray(List<OpenApiSchema> oneOf) {
         var items = second.getItems().orElseThrow();
         return first.getTypes().equals(items.getTypes()) && first.get$ref().equals(items.get$ref());
     }
+
+    private static boolean isEnum(OpenApiSchema schema) {
+        if (schema.isString()) {
+            return schema.hasEnums() || schema.hasConst();
+        }
+        if (schema.getOneOf().isPresent()) {
+            return schema.getOneOf().get().stream().allMatch(SpecTransformer::isEnum);
+        }
+        return false;
+    }
+
+    private static boolean isShortcutPropertyObject(List<OpenApiSchema> oneOf) {
+        if (oneOf.size() != 2) {
+            return false;
+        }
+
+        var first = oneOf.get(0);
+        var second = oneOf.get(1);
+
+        if (!first.hasTitle() || second.hasTitle()) {
+            return false;
+        }
+
+        var secondType = second.determineSingleType().orElse(null);
+        if (secondType != OpenApiSchemaType.Object) {
+            return false;
+        }
+
+        var properties = new HashMap<String, OpenApiSchema>();
+        collectObjectProperties(second, properties, new ArrayList<>());
+
+        return properties.containsKey(first.getTitle().orElseThrow());
+    }
 }
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/TaggedUnionShape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/TaggedUnionShape.java
index 8e317e2ef8..907f745c5f 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/TaggedUnionShape.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/TaggedUnionShape.java
@@ -36,10 +36,6 @@ public Collection<Variant> getVariants() {
         return variants.values();
     }
 
-    public Collection<Variant> getShapeVariants() {
-        return Lists.filter(getVariants(), v -> v.getType().isInsidePackage("org.opensearch") && !v.getType().isEnum());
-    }
-
     public Collection<Variant> getNonShapeVariants() {
         return Lists.filter(getVariants(), v -> !v.getType().isInsidePackage("org.opensearch"));
     }
@@ -82,8 +78,9 @@ public boolean canStringify() {
     @Override
     public void render(ShapeRenderingContext ctx) throws RenderException {
         super.render(ctx);
-        if (!getShapeVariants().isEmpty()) {
-            new Builders(this).render(ctx);
+        var buildableVariants = Lists.filter(getVariants(), v -> v.getType().hasBuilder());
+        if (!buildableVariants.isEmpty()) {
+            new Builders(this, buildableVariants).render(ctx);
         }
         if (isDiscriminated()) {
             new VariantInterface(this).render(ctx);
@@ -130,9 +127,9 @@ private static String buildDescription(TaggedUnionShape union) {
         private final String unionClassName;
         private final Collection<Variant> variants;
 
-        private Builders(TaggedUnionShape union) {
+        private Builders(TaggedUnionShape union, Collection<Variant> variants) {
             super(union.getParent(), union.getClassName() + "Builders", null, buildDescription(union));
-            variants = union.getShapeVariants();
+            this.variants = variants;
             unionClassName = union.getClassName();
         }
 
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
index 7545444777..79d82cc30c 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
@@ -142,6 +142,7 @@ public static final class Json {
                 .withName("ObjectBuilderDeserializer")
                 .build();
             public static final Type ObjectDeserializer = Type.builder().withPackage(PACKAGE).withName("ObjectDeserializer").build();
+            public static final Type PlainDeserializable = Type.builder().withPackage(PACKAGE).withName("PlainDeserializable").build();
             public static final Type PlainJsonSerializable = Type.builder().withPackage(PACKAGE).withName("PlainJsonSerializable").build();
             public static final Type UnionDeserializer = Type.builder().withPackage(PACKAGE).withName("UnionDeserializer").build();
         }
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java
index 7a8ef32339..750a4e8e88 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java
@@ -12,10 +12,10 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import org.opensearch.client.codegen.model.Types;
 import org.opensearch.client.codegen.openapi.JsonPointer;
 import org.opensearch.client.codegen.utils.builder.ObjectBuilder;
 import org.opensearch.client.codegen.utils.builder.ObjectBuilderBase;
@@ -24,20 +24,16 @@ public class Overrides {
     private static final JsonPointer SCHEMAS = JsonPointer.of("components", "schemas");
 
     public static final Overrides OVERRIDES = builder().withSchemas(
-        s -> s.with(SCHEMAS.append("_common.query_dsl:QueryContainer"), so -> so.withClassName("Query"))
-            .with(SCHEMAS.append("indices._common:IndexSettings"), so -> so.withAliasProvider((k) -> {
-                switch (k) {
-                    case "index":
-                    case "indexing":
-                    case "mapping":
-                    case "search":
-                    case "settings":
-                    case "top_metrics_max_size":
-                        return null;
-                    default:
-                        return Set.of("index." + k);
-                }
-            }))
+        s -> s
+            // TODO: Remove this to generate property mapping types
+            .with(SCHEMAS.append("_common.mapping:Property"), so -> so.withShouldGenerate(ShouldGenerate.Never))
+            // TODO: Remove this to generate query types
+            .with(
+                SCHEMAS.append("_common.query_dsl:QueryContainer"),
+                so -> so.withMappedType(t -> t.withPackage(Types.Client.OpenSearch._Types.PACKAGE + ".query_dsl").withName("Query"))
+            )
+            // TODO: Remove this to generate index settings types
+            .with(SCHEMAS.append("indices._common:IndexSettings"), so -> so.withShouldGenerate(ShouldGenerate.Never))
     ).build();
 
     @Nonnull
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/SchemaOverride.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/SchemaOverride.java
index a72db9173e..a1ee81b882 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/SchemaOverride.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/SchemaOverride.java
@@ -24,19 +24,22 @@
 import org.opensearch.client.codegen.utils.builder.ObjectMapBuilderBase;
 
 public final class SchemaOverride {
-    private final boolean skipGeneration;
+    private final ShouldGenerate shouldGenerate;
     @Nonnull
     private final Map<String, PropertyOverride> properties;
     @Nullable
     private final Function<String, Set<String>> aliasProvider;
     @Nullable
     private final String className;
+    @Nullable
+    private final Type mappedType;
 
     private SchemaOverride(Builder builder) {
-        this.skipGeneration = builder.skipGeneration;
+        this.shouldGenerate = builder.shouldGenerate;
         this.properties = builder.properties != null ? Collections.unmodifiableMap(builder.properties) : Collections.emptyMap();
         this.aliasProvider = builder.aliasProvider;
         this.className = builder.className;
+        this.mappedType = builder.mappedType;
     }
 
     @Nonnull
@@ -63,8 +66,8 @@ public PropertyOverride getProperty(@Nonnull String key) {
         return PropertyOverride.builder().withMappedType(mappedType).withAliases(aliases).build();
     }
 
-    public boolean shouldSkipGeneration() {
-        return skipGeneration;
+    public ShouldGenerate shouldGenerate() {
+        return shouldGenerate;
     }
 
     @Nonnull
@@ -72,6 +75,11 @@ public Optional<String> getClassName() {
         return Optional.ofNullable(className);
     }
 
+    @Nonnull
+    public Optional<Type> getMappedType() {
+        return Optional.ofNullable(mappedType);
+    }
+
     @Nonnull
     public static Builder builder() {
         return new Builder();
@@ -83,13 +91,16 @@ public static MapBuilder mapBuilder() {
     }
 
     public static final class Builder extends ObjectBuilderBase<SchemaOverride, Builder> {
-        private boolean skipGeneration;
+        @Nonnull
+        private ShouldGenerate shouldGenerate = ShouldGenerate.IfNeeded;
         @Nullable
         private Map<String, PropertyOverride> properties;
         @Nullable
         private Function<String, Set<String>> aliasProvider;
         @Nullable
         private String className;
+        @Nullable
+        private Type mappedType;
 
         private Builder() {}
 
@@ -100,8 +111,8 @@ protected SchemaOverride construct() {
         }
 
         @Nonnull
-        public Builder withSkipGeneration(boolean skipGeneration) {
-            this.skipGeneration = skipGeneration;
+        public Builder withShouldGenerate(ShouldGenerate shouldGenerate) {
+            this.shouldGenerate = Objects.requireNonNull(shouldGenerate, "shouldGenerate must not be null");
             return this;
         }
 
@@ -122,6 +133,18 @@ public Builder withClassName(@Nullable String className) {
             this.className = className;
             return this;
         }
+
+        @Nonnull
+        public Builder withMappedType(@Nullable Type mappedType) {
+            this.mappedType = mappedType;
+            return this;
+        }
+
+        @Nonnull
+        public Builder withMappedType(@Nonnull Function<Type.Builder, ObjectBuilder<Type>> fn) {
+            this.mappedType = Objects.requireNonNull(fn, "fn must not be null").apply(Type.builder()).build();
+            return this;
+        }
     }
 
     public static final class MapBuilder extends ObjectMapBuilderBase<JsonPointer, SchemaOverride, Builder, MapBuilder> {
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/ShouldGenerate.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/ShouldGenerate.java
new file mode 100644
index 0000000000..068511302c
--- /dev/null
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/ShouldGenerate.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.client.codegen.model.overrides;
+
+public enum ShouldGenerate {
+    Always,
+    IfNeeded,
+    Never
+}
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/openapi/OpenApiSchema.java b/java-codegen/src/main/java/org/opensearch/client/codegen/openapi/OpenApiSchema.java
index 304b3e4055..79ca01555f 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/openapi/OpenApiSchema.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/openapi/OpenApiSchema.java
@@ -68,6 +68,8 @@ public class OpenApiSchema extends OpenApiRefElement<OpenApiSchema> {
     @Nullable
     private final OpenApiDiscriminator discriminator;
     @Nullable
+    private final Object constValue;
+    @Nullable
     private final Semver versionRemoved;
     @Nullable
     private final Semver versionDeprecated;
@@ -90,6 +92,7 @@ private OpenApiSchema(@Nonnull Builder builder) {
         title = builder.title;
         pattern = builder.pattern;
         discriminator = builder.discriminator;
+        constValue = builder.constValue;
         versionRemoved = builder.versionRemoved;
         versionDeprecated = builder.versionDeprecated;
     }
@@ -144,6 +147,8 @@ protected OpenApiSchema(@Nullable OpenApiElement<?> parent, @Nonnull JsonPointer
 
         discriminator = child("discriminator", schema.getDiscriminator(), OpenApiDiscriminator::new);
 
+        constValue = schema.getConst();
+
         var extensions = schema.getExtensions();
 
         versionRemoved = Maps.tryGet(extensions, "x-version-removed").map(v -> Versions.coerce((String) v)).orElse(null);
@@ -204,10 +209,6 @@ public boolean isString() {
         return is(OpenApiSchemaType.String);
     }
 
-    public boolean isStringEnum() {
-        return isString() && hasEnums();
-    }
-
     public boolean hasAllOf() {
         return allOf != null && !allOf.isEmpty();
     }
@@ -283,6 +284,15 @@ public Optional<OpenApiDiscriminator> getDiscriminator() {
         return Optional.ofNullable(discriminator);
     }
 
+    public boolean hasConst() {
+        return constValue != null;
+    }
+
+    @Nonnull
+    public Optional<Object> getConst() {
+        return Optional.ofNullable(constValue);
+    }
+
     @Nonnull
     public Optional<Semver> getVersionRemoved() {
         return Optional.ofNullable(versionRemoved);
@@ -374,6 +384,8 @@ public static class Builder extends ObjectBuilderBase<OpenApiSchema, Builder> {
         @Nullable
         private OpenApiDiscriminator discriminator;
         @Nullable
+        private Object constValue;
+        @Nullable
         private Semver versionRemoved;
         @Nullable
         private Semver versionDeprecated;
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/utils/Markdown.java b/java-codegen/src/main/java/org/opensearch/client/codegen/utils/Markdown.java
index 4f005f2a87..c8476f465b 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/utils/Markdown.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/utils/Markdown.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.codegen.utils;
 
+import javax.annotation.Nonnull;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.html.HtmlRenderer;
 
@@ -17,7 +18,8 @@ private Markdown() {}
     private static final Parser PARSER = Parser.builder().build();
     private static final HtmlRenderer RENDERER = HtmlRenderer.builder().omitSingleParagraphP(true).build();
 
-    public static String toJavaDocHtml(String markdown) {
+    @Nonnull
+    public static String toJavaDocHtml(@Nonnull String markdown) {
         return RENDERER.render(PARSER.parse(markdown)).strip();
     }
 }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/EnumShape.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/EnumShape.mustache
index 719c40ba20..543bfdb110 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/EnumShape.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/EnumShape.mustache
@@ -3,6 +3,11 @@
 {{^-first}}
 
 {{/-first}}
+{{#description}}
+    /**
+     * {{.}}
+     */
+{{/description}}
 {{#deprecated}}
     @Deprecated
 {{/deprecated}}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache
index f9a8abeeaa..f715bd75d5 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache
@@ -4,7 +4,7 @@
     */
     {{#extendsOtherShape}}
         public static class Builder extends {{extendsType}}.AbstractBuilder<Builder>
-                                    implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}> {
+                                    implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}> {{#shouldImplementPlainDeserializable}}, {{TYPES.Client.Json.PlainDeserializable}}<Builder>{{/shouldImplementPlainDeserializable}} {
             {{>ObjectShape/Builder/Fields}}
 
             {{>ObjectShape/Builder/SelfImpl}}
@@ -15,7 +15,8 @@
     {{^extendsOtherShape}}
         {{#extendedByOtherShape}}
             public static class Builder extends {{type}}.AbstractBuilder<Builder>
-                                        implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}> {
+                                        implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}>{{#shouldImplementPlainDeserializable}}, {{TYPES.Client.Json.PlainDeserializable}}<Builder>{{/shouldImplementPlainDeserializable}}
+            {
                 {{>ObjectShape/Builder/SelfImpl}}
 
                 {{>ObjectShape/Builder/BuildImpl}}
@@ -23,7 +24,12 @@
         {{/extendedByOtherShape}}
         {{^extendedByOtherShape}}
             public static class Builder extends {{TYPES.Client.Util.ObjectBuilderBase}}
-                                        implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}> {
+                                        implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}>{{#shouldImplementPlainDeserializable}}, {{TYPES.Client.Json.PlainDeserializable}}<Builder>{{/shouldImplementPlainDeserializable}}
+            {
+            {{#shouldImplementPlainDeserializable}}
+                {{>ObjectShape/Builder/SelfImpl}}
+
+            {{/shouldImplementPlainDeserializable}}
                 {{>ObjectShape/Builder/Fields}}
 
                 {{>ObjectShape/Builder/BuildImpl}}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder/SelfImpl.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder/SelfImpl.mustache
index 7d897fe252..ce3c4f49ed 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder/SelfImpl.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder/SelfImpl.mustache
@@ -1,4 +1,4 @@
 @Override
-protected Builder self() {
+{{#shouldImplementPlainDeserializable}}public{{/shouldImplementPlainDeserializable}}{{^shouldImplementPlainDeserializable}}protected{{/shouldImplementPlainDeserializable}} Builder self() {
     return this;
 }
\ No newline at end of file
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Deserialize.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Deserialize.mustache
index ddb9adaddc..4d37bb6a2f 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Deserialize.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Deserialize.mustache
@@ -29,4 +29,8 @@
 
         op.ignore({{#quoted}}{{key}}{{/quoted}});
     {{/distinctDiscriminatorFieldValues}}
+    {{#shortcutProperty}}
+
+        op.shortcutProperty({{#quoted}}{{.}}{{/quoted}});
+    {{/shortcutProperty}}
     }
\ No newline at end of file
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache
index f0768a1e03..1f4eec4047 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache
@@ -15,7 +15,16 @@
 {{/type.isMap}}
 {{#type.isList}}
     for ({{type.listValueType}} item{{depth}} : {{value}}) {
-        {{#type.listValueType.serializer}}item{{depth}}{{/type.listValueType.serializer}}
+        {{#type.listValueType.isMap}}
+            generator.writeStartObject();
+            if (item{{depth}} != null) {
+                {{#type.listValueType.directSerializer}}item{{depth}}{{/type.listValueType.directSerializer}}
+            }
+            generator.writeEnd();
+        {{/type.listValueType.isMap}}
+        {{^type.listValueType.isMap}}
+            {{#type.listValueType.serializer}}item{{depth}}{{/type.listValueType.serializer}}
+        {{/type.listValueType.isMap}}
     }
 {{/type.isList}}
 {{^type.isListOrMap}}