diff --git a/UPGRADING.md b/UPGRADING.md
index 7edfe5b589..d756de966b 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -143,4 +143,12 @@ After:
 
 ### QueryStringQuery
 - The `phraseSlop` property has been corrected to be of type `Integer` instead of `Double`.
-- The `tieBreaker` property has been corrected to be of type `Float` instead of `Double`.
\ No newline at end of file
+- The `tieBreaker` property has been corrected to be of type `Float` instead of `Double`.
+
+### simulate_template.Template
+- The `settings` property is now of type `IndexSettings` instead of `Map<String, JsonData>`.
+- The `overlapping` property has been moved to `SimulateTemplateResponse`.
+
+### PutTemplateRequest
+- The `flatSettings` property has been removed as it is not supported by OpenSearch.
+- The `timeout` property has been removed as it is not supported by OpenSearch.
\ No newline at end of file
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
similarity index 57%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
index f6994928bb..aebbba89f1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.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 java.util.HashMap;
 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.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,24 +49,27 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.delete_template.Request
 
 /**
  * Deletes an index template.
- *
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class DeleteTemplateRequest extends RequestBase implements ToCopyableBuilder<DeleteTemplateRequest.Builder, DeleteTemplateRequest> {
 
-public class DeleteTemplateRequest extends RequestBase {
-    @Deprecated
     @Nullable
-    private final Time masterTimeout;
+    private final Time clusterManagerTimeout;
 
+    @Deprecated
     @Nullable
-    private final Time clusterManagerTimeout;
+    private final Time masterTimeout;
 
+    @Nonnull
     private final String name;
 
     @Nullable
@@ -68,52 +78,56 @@ public class DeleteTemplateRequest extends RequestBase {
     // ---------------------------------------------------------------------------------------------
 
     private DeleteTemplateRequest(Builder builder) {
-
-        this.masterTimeout = builder.masterTimeout;
         this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.masterTimeout = builder.masterTimeout;
         this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
         this.timeout = builder.timeout;
-
     }
 
-    public static DeleteTemplateRequest of(Function<Builder, ObjectBuilder<DeleteTemplateRequest>> fn) {
+    public static DeleteTemplateRequest of(Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Specify timeout for connection to master
+     * Operation timeout for connection to cluster-manager node.
      * <p>
-     * API name: {@code master_timeout}
+     * API name: {@code cluster_manager_timeout}
+     * </p>
      */
-    @Deprecated
     @Nullable
-    public final Time masterTimeout() {
-        return this.masterTimeout;
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
     }
 
     /**
-     * Specify timeout for connection to cluster-manager
+     * 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}
+     * API name: {@code master_timeout}
+     * </p>
      */
+    @Deprecated
     @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
+    public final Time masterTimeout() {
+        return this.masterTimeout;
     }
 
     /**
-     * Required - The name of the template
+     * Required - The name of the legacy index template to delete. Wildcard (<code>*</code>) expressions are supported.
      * <p>
      * API name: {@code name}
+     * </p>
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
 
     /**
-     * Explicit operation timeout
+     * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
      * <p>
      * API name: {@code timeout}
+     * </p>
      */
     @Nullable
     public final Time timeout() {
@@ -122,98 +136,143 @@ public final Time timeout() {
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link DeleteTemplateRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteTemplateRequest> {
-        @Deprecated
-        @Nullable
-        private Time masterTimeout;
-
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, DeleteTemplateRequest> {
         @Nullable
         private Time clusterManagerTimeout;
-
+        @Nullable
+        private Time masterTimeout;
         private String name;
-
         @Nullable
         private Time timeout;
 
+        public Builder() {}
+
+        private Builder(DeleteTemplateRequest o) {
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.masterTimeout = o.masterTimeout;
+            this.name = o.name;
+            this.timeout = o.timeout;
+        }
+
+        private Builder(Builder o) {
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.masterTimeout = o.masterTimeout;
+            this.name = o.name;
+            this.timeout = o.timeout;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         /**
-         * Specify timeout for connection to master
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code master_timeout}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        @Deprecated
-        public final Builder masterTimeout(@Nullable Time value) {
-            this.masterTimeout = value;
+        @Nonnull
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code master_timeout}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        @Deprecated
-        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
+         * 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}
+         * API name: {@code master_timeout}
+         * </p>
          */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
+        @Deprecated
+        @Nonnull
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
+         * 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}
+         * API name: {@code master_timeout}
+         * </p>
          */
-        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        @Deprecated
+        @Nonnull
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Required - The name of the template
+         * Required - The name of the legacy index template to delete. Wildcard (<code>*</code>) expressions are supported.
          * <p>
          * API name: {@code name}
+         * </p>
          */
+        @Nonnull
         public final Builder name(String value) {
             this.name = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout
+         * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
          * <p>
          * API name: {@code timeout}
+         * </p>
          */
+        @Nonnull
         public final Builder timeout(@Nullable Time value) {
             this.timeout = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout
+         * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
          * <p>
          * API name: {@code timeout}
+         * </p>
          */
+        @Nonnull
         public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.timeout(fn.apply(new Time.Builder()).build());
+            return timeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
          * Builds a {@link DeleteTemplateRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public DeleteTemplateRequest build() {
             _checkSingleUse();
 
@@ -227,49 +286,52 @@ public DeleteTemplateRequest build() {
      * Endpoint "{@code indices.delete_template}".
      */
     public static final Endpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "DELETE";
-
-        },
-
+        request -> "DELETE",
         // Request path
         request -> {
-            final int _name = 1 << 0;
-
-            int propsSet = 0;
-
-            propsSet |= _name;
-
-            if (propsSet == (_name)) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_template");
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.name, buf);
-                return buf.toString();
-            }
-            throw SimpleEndpoint.noPathTemplateFound("path");
-
+            StringBuilder buf = new StringBuilder();
+            buf.append("/_template/");
+            SimpleEndpoint.pathEncode(request.name, 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.clusterManagerTimeout != null) {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
             }
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
             if (request.timeout != null) {
                 params.put("timeout", request.timeout._toJsonString());
             }
             return params;
-
         },
         SimpleEndpoint.emptyMap(),
         false,
         DeleteTemplateResponse._DESERIALIZER
     );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + this.name.hashCode();
+        result = 31 * result + Objects.hashCode(this.timeout);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeleteTemplateRequest other = (DeleteTemplateRequest) o;
+        return Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && this.name.equals(other.name)
+            && Objects.equals(this.timeout, other.timeout);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
similarity index 62%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
index 84f613a4b2..ad24c02322 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
@@ -30,39 +30,80 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.delete_template.Response
 
 @JsonpDeserializable
-public class DeleteTemplateResponse extends AcknowledgedResponseBase {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class DeleteTemplateResponse extends AcknowledgedResponseBase
+    implements
+        ToCopyableBuilder<DeleteTemplateResponse.Builder, DeleteTemplateResponse> {
+
     // ---------------------------------------------------------------------------------------------
 
     private DeleteTemplateResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static DeleteTemplateResponse of(Function<Builder, ObjectBuilder<DeleteTemplateResponse>> fn) {
+    public static DeleteTemplateResponse of(Function<DeleteTemplateResponse.Builder, ObjectBuilder<DeleteTemplateResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link DeleteTemplateResponse}.
      */
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            CopyableBuilder<Builder, DeleteTemplateResponse> {
+
+        public Builder() {}
+
+        private Builder(DeleteTemplateResponse o) {
+            super(o);
+        }
+
+        private Builder(Builder o) {
+            super(o);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
-    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteTemplateResponse> {
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -70,9 +111,10 @@ protected Builder self() {
         /**
          * Builds a {@link DeleteTemplateResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public DeleteTemplateResponse build() {
             _checkSingleUse();
 
@@ -91,8 +133,22 @@ public DeleteTemplateResponse build() {
     );
 
     protected static void setupDeleteTemplateResponseDeserializer(ObjectDeserializer<DeleteTemplateResponse.Builder> op) {
-        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        setupAcknowledgedResponseBaseDeserializer(op);
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
similarity index 66%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
index 52a4d5b0b0..bf1df9d4f5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
@@ -30,13 +30,19 @@
  * 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.RequestBase;
@@ -46,17 +52,22 @@
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.exists_template.Request
 
 /**
  * Returns information about whether a particular index template exists.
- *
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class ExistsTemplateRequest extends RequestBase implements ToCopyableBuilder<ExistsTemplateRequest.Builder, ExistsTemplateRequest> {
+
+    @Nullable
+    private final Time clusterManagerTimeout;
 
-public class ExistsTemplateRequest extends RequestBase {
     @Nullable
     private final Boolean flatSettings;
 
@@ -67,31 +78,39 @@ public class ExistsTemplateRequest extends RequestBase {
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
+    @Nonnull
     private final List<String> name;
 
     // ---------------------------------------------------------------------------------------------
 
     private ExistsTemplateRequest(Builder builder) {
-
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.flatSettings = builder.flatSettings;
         this.local = builder.local;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-
     }
 
-    public static ExistsTemplateRequest of(Function<Builder, ObjectBuilder<ExistsTemplateRequest>> fn) {
+    public static ExistsTemplateRequest of(Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Return settings in flat format (default: false)
+     * Operation timeout for connection to cluster-manager node.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     * </p>
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Return settings in flat format.
      * <p>
      * API name: {@code flat_settings}
+     * </p>
      */
     @Nullable
     public final Boolean flatSettings() {
@@ -99,10 +118,10 @@ public final Boolean flatSettings() {
     }
 
     /**
-     * Return local information, do not retrieve the state from cluster-manager node
-     * (default: false)
+     * Return local information, do not retrieve the state from cluster-manager node.
      * <p>
      * API name: {@code local}
+     * </p>
      */
     @Nullable
     public final Boolean local() {
@@ -110,9 +129,10 @@ public final Boolean local() {
     }
 
     /**
-     * Explicit operation timeout for connection to master node
+     * Explicit operation timeout for connection to cluster-manager node
      * <p>
      * API name: {@code master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -120,115 +140,151 @@ public final Time masterTimeout() {
         return this.masterTimeout;
     }
 
-    /**
-     * Explicit operation timeout for connection to cluster-manager node
-     * <p>
-     * API name: {@code cluster_manager_timeout}
-     */
-    @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
-    }
-
     /**
      * Required - The comma separated names of the index templates
      * <p>
      * API name: {@code name}
+     * </p>
      */
+    @Nonnull
     public final List<String> name() {
         return this.name;
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link ExistsTemplateRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsTemplateRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, ExistsTemplateRequest> {
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private Boolean flatSettings;
-
         @Nullable
         private Boolean local;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
+        private List<String> name;
 
-        @Nullable
-        private Time clusterManagerTimeout;
+        public Builder() {}
 
-        private List<String> name;
+        private Builder(ExistsTemplateRequest o) {
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.flatSettings = o.flatSettings;
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+            this.name = _listCopy(o.name);
+        }
+
+        private Builder(Builder o) {
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.flatSettings = o.flatSettings;
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+            this.name = _listCopy(o.name);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
         /**
-         * Return settings in flat format (default: false)
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        @Nonnull
+        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>
+         */
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Return settings in flat format.
          * <p>
          * API name: {@code flat_settings}
+         * </p>
          */
+        @Nonnull
         public final Builder flatSettings(@Nullable Boolean value) {
             this.flatSettings = value;
             return this;
         }
 
         /**
-         * Return local information, do not retrieve the state from cluster-manager node
-         * (default: false)
+         * Return local information, do not retrieve the state from cluster-manager node.
          * <p>
          * API name: {@code local}
+         * </p>
          */
+        @Nonnull
         public final Builder local(@Nullable Boolean value) {
             this.local = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout for connection to master node
+         * Explicit operation timeout for connection to cluster-manager node
          * <p>
          * API name: {@code master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout for connection to master node
+         * Explicit operation timeout for connection to cluster-manager node
          * <p>
          * API name: {@code master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
-        }
-
-        /**
-         * Explicit operation timeout for connection to cluster-manager node
-         * <p>
-         * API name: {@code cluster_manager_timeout}
-         */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
-            return this;
-        }
-
-        /**
-         * Explicit operation timeout for connection to cluster-manager node
-         * <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());
         }
 
         /**
          * Required - The comma separated names of the index templates
          * <p>
          * API name: {@code name}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>name</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder name(List<String> list) {
             this.name = _listAddAll(this.name, list);
             return this;
@@ -238,9 +294,13 @@ public final Builder name(List<String> list) {
          * Required - The comma separated names of the index templates
          * <p>
          * API name: {@code name}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>name</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder name(String value, String... values) {
             this.name = _listAdd(this.name, value, values);
             return this;
@@ -249,9 +309,10 @@ public final Builder name(String value, String... values) {
         /**
          * Builds a {@link ExistsTemplateRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public ExistsTemplateRequest build() {
             _checkSingleUse();
 
@@ -265,39 +326,18 @@ public ExistsTemplateRequest build() {
      * Endpoint "{@code indices.exists_template}".
      */
     public static final Endpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-        "opensearch/indices.exists_template",
-
         // Request method
-        request -> {
-            return "HEAD";
-
-        },
-
+        request -> "HEAD",
         // Request path
         request -> {
-            final int _name = 1 << 0;
-
-            int propsSet = 0;
-
-            propsSet |= _name;
-
-            if (propsSet == (_name)) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_template");
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                return buf.toString();
-            }
-            throw SimpleEndpoint.noPathTemplateFound("path");
-
+            StringBuilder buf = new StringBuilder();
+            buf.append("/_template/");
+            SimpleEndpoint.pathEncode(String.join(",", request.name), 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.clusterManagerTimeout != null) {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
             }
@@ -307,11 +347,34 @@ public ExistsTemplateRequest build() {
             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,
-        null
+        SimpleEndpoint.emptyMap()
     );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
+        result = 31 * result + Objects.hashCode(this.flatSettings);
+        result = 31 * result + Objects.hashCode(this.local);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + this.name.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ExistsTemplateRequest other = (ExistsTemplateRequest) o;
+        return Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.flatSettings, other.flatSettings)
+            && Objects.equals(this.local, other.local)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && this.name.equals(other.name);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
similarity index 56%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
index d19083af7d..cead52f23d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.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;
@@ -45,20 +52,28 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.get_settings.Request
 
 /**
- * Returns settings for one or more indices.
- *
+ * Returns settings for one or more indexes.
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class GetIndicesSettingsRequest extends RequestBase
+    implements
+        ToCopyableBuilder<GetIndicesSettingsRequest.Builder, GetIndicesSettingsRequest> {
 
-public class GetIndicesSettingsRequest extends RequestBase {
     @Nullable
     private final Boolean allowNoIndices;
 
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nonnull
     private final List<ExpandWildcard> expandWildcards;
 
     @Nullable
@@ -70,6 +85,7 @@ public class GetIndicesSettingsRequest extends RequestBase {
     @Nullable
     private final Boolean includeDefaults;
 
+    @Nonnull
     private final List<String> index;
 
     @Nullable
@@ -79,16 +95,14 @@ public class GetIndicesSettingsRequest extends RequestBase {
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
+    @Nonnull
     private final List<String> name;
 
     // ---------------------------------------------------------------------------------------------
 
     private GetIndicesSettingsRequest(Builder builder) {
-
         this.allowNoIndices = builder.allowNoIndices;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
         this.flatSettings = builder.flatSettings;
         this.ignoreUnavailable = builder.ignoreUnavailable;
@@ -96,21 +110,20 @@ private GetIndicesSettingsRequest(Builder builder) {
         this.index = ApiTypeHelper.unmodifiable(builder.index);
         this.local = builder.local;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.name = ApiTypeHelper.unmodifiable(builder.name);
-
     }
 
-    public static GetIndicesSettingsRequest of(Function<Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn) {
+    public static GetIndicesSettingsRequest of(Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Whether to ignore if a wildcard indices expression resolves into no concrete
-     * indices. (This includes <code>_all</code> string or when no indices have been
-     * specified)
+     * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets only
+     * missing or closed indexes. This behavior applies even if the request targets other open indexes. For example, a request targeting
+     * <code>foo*,bar*</code> returns an error if an index starts with foo but no index starts with <code>bar</code>.
      * <p>
      * API name: {@code allow_no_indices}
+     * </p>
      */
     @Nullable
     public final Boolean allowNoIndices() {
@@ -118,19 +131,33 @@ public final Boolean allowNoIndices() {
     }
 
     /**
-     * Whether to expand wildcard expression to concrete indices that are open,
-     * closed or both.
+     * 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 patterns 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 <code>open,hidden</code>.
      * <p>
      * API name: {@code expand_wildcards}
+     * </p>
      */
+    @Nonnull
     public final List<ExpandWildcard> expandWildcards() {
         return this.expandWildcards;
     }
 
     /**
-     * Return settings in flat format (default: false)
+     * If <code>true</code>, returns settings in flat format.
      * <p>
      * API name: {@code flat_settings}
+     * </p>
      */
     @Nullable
     public final Boolean flatSettings() {
@@ -138,10 +165,10 @@ public final Boolean flatSettings() {
     }
 
     /**
-     * Whether specified concrete indices should be ignored when unavailable
-     * (missing or closed)
+     * If <code>false</code>, the request returns an error if it targets a missing or closed index.
      * <p>
      * API name: {@code ignore_unavailable}
+     * </p>
      */
     @Nullable
     public final Boolean ignoreUnavailable() {
@@ -149,9 +176,10 @@ public final Boolean ignoreUnavailable() {
     }
 
     /**
-     * Whether to return all default setting for each of the indices.
+     * If <code>true</code>, return all default settings in the response.
      * <p>
      * API name: {@code include_defaults}
+     * </p>
      */
     @Nullable
     public final Boolean includeDefaults() {
@@ -159,20 +187,23 @@ public final Boolean includeDefaults() {
     }
 
     /**
-     * A comma-separated list of index names; use <code>_all</code> or empty string
-     * to perform the operation on all indices
+     * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To target
+     * all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
      * <p>
      * API name: {@code index}
+     * </p>
      */
+    @Nonnull
     public final List<String> index() {
         return this.index;
     }
 
     /**
-     * Return local information, do not retrieve the state from cluster-manager node
-     * (default: false)
+     * If <code>true</code>, the request retrieves information from the local node only. If <code>false</code>, information is retrieved
+     * from the cluster-manager node.
      * <p>
      * API name: {@code local}
+     * </p>
      */
     @Nullable
     public final Boolean local() {
@@ -180,9 +211,11 @@ public final Boolean local() {
     }
 
     /**
-     * Specify timeout for connection to master
+     * 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 master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -191,227 +224,296 @@ public final Time masterTimeout() {
     }
 
     /**
-     * Specify timeout for connection to cluster-manager
-     * <p>
-     * API name: {@code cluster_manager_timeout}
-     */
-    @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
-    }
-
-    /**
-     * The name of the settings that should be included
+     * Comma-separated list or wildcard expression of settings to retrieve.
      * <p>
      * API name: {@code name}
+     * </p>
      */
+    @Nonnull
     public final List<String> name() {
         return this.name;
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link GetIndicesSettingsRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndicesSettingsRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, GetIndicesSettingsRequest> {
         @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;
-
         @Nullable
         private List<String> index;
-
         @Nullable
         private Boolean local;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
-
-        @Nullable
-        private Time clusterManagerTimeout;
-
         @Nullable
         private List<String> name;
 
+        public Builder() {}
+
+        private Builder(GetIndicesSettingsRequest o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.flatSettings = o.flatSettings;
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.includeDefaults = o.includeDefaults;
+            this.index = _listCopy(o.index);
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+            this.name = _listCopy(o.name);
+        }
+
+        private Builder(Builder o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.flatSettings = o.flatSettings;
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.includeDefaults = o.includeDefaults;
+            this.index = _listCopy(o.index);
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+            this.name = _listCopy(o.name);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         /**
-         * Whether to ignore if a wildcard indices expression resolves into no concrete
-         * indices. (This includes <code>_all</code> string or when no indices have been
-         * specified)
+         * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets
+         * only missing or closed indexes. This behavior applies even if the request targets other open indexes. For example, a request
+         * targeting <code>foo*,bar*</code> returns an error if an index starts with foo but no index starts with <code>bar</code>.
          * <p>
          * API name: {@code allow_no_indices}
+         * </p>
          */
+        @Nonnull
         public final Builder allowNoIndices(@Nullable Boolean value) {
             this.allowNoIndices = value;
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        @Nonnull
+        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>
+         */
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(List<ExpandWildcard> list) {
             this.expandWildcards = _listAddAll(this.expandWildcards, list);
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
             this.expandWildcards = _listAdd(this.expandWildcards, value, values);
             return this;
         }
 
         /**
-         * Return settings in flat format (default: false)
+         * If <code>true</code>, returns settings in flat format.
          * <p>
          * API name: {@code flat_settings}
+         * </p>
          */
+        @Nonnull
         public final Builder flatSettings(@Nullable Boolean value) {
             this.flatSettings = value;
             return this;
         }
 
         /**
-         * Whether specified concrete indices should be ignored when unavailable
-         * (missing or closed)
+         * If <code>false</code>, the request returns an error if it targets a missing or closed index.
          * <p>
          * API name: {@code ignore_unavailable}
+         * </p>
          */
+        @Nonnull
         public final Builder ignoreUnavailable(@Nullable Boolean value) {
             this.ignoreUnavailable = value;
             return this;
         }
 
         /**
-         * Whether to return all default setting for each of the indices.
+         * If <code>true</code>, return all default settings in the response.
          * <p>
          * API name: {@code include_defaults}
+         * </p>
          */
+        @Nonnull
         public final Builder includeDefaults(@Nullable Boolean value) {
             this.includeDefaults = value;
             return this;
         }
 
         /**
-         * A comma-separated list of index names; use <code>_all</code> or empty string
-         * to perform the operation on all indices
+         * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To
+         * target all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(List<String> list) {
             this.index = _listAddAll(this.index, list);
             return this;
         }
 
         /**
-         * A comma-separated list of index names; use <code>_all</code> or empty string
-         * to perform the operation on all indices
+         * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To
+         * target all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(String value, String... values) {
             this.index = _listAdd(this.index, value, values);
             return this;
         }
 
         /**
-         * Return local information, do not retrieve the state from cluster-manager node
-         * (default: false)
+         * If <code>true</code>, the request retrieves information from the local node only. If <code>false</code>, information is retrieved
+         * from the cluster-manager node.
          * <p>
          * API name: {@code local}
+         * </p>
          */
+        @Nonnull
         public final Builder local(@Nullable Boolean value) {
             this.local = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
-         * <p>
-         * API name: {@code cluster_manager_timeout}
-         */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
-            return this;
-        }
-
-        /**
-         * Specify timeout for connection to cluster-manager
-         * <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());
-        }
-
-        /**
-         * The name of the settings that should be included
+         * Comma-separated list or wildcard expression of settings to retrieve.
          * <p>
          * API name: {@code name}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>name</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder name(List<String> list) {
             this.name = _listAddAll(this.name, list);
             return this;
         }
 
         /**
-         * The name of the settings that should be included
+         * Comma-separated list or wildcard expression of settings to retrieve.
          * <p>
          * API name: {@code name}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>name</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder name(String value, String... values) {
             this.name = _listAdd(this.name, value, values);
             return this;
@@ -420,9 +522,10 @@ public final Builder name(String value, String... values) {
         /**
          * Builds a {@link GetIndicesSettingsRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public GetIndicesSettingsRequest build() {
             _checkSingleUse();
 
@@ -436,87 +539,109 @@ public GetIndicesSettingsRequest build() {
      * Endpoint "{@code indices.get_settings}".
      */
     public static final Endpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "GET";
-
-        },
-
+        request -> "GET",
         // Request path
         request -> {
-            final int _name = 1 << 0;
-            final int _index = 1 << 1;
+            final int _index = 1 << 0;
+            final int _name = 1 << 1;
 
             int propsSet = 0;
 
-            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
             if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
 
             if (propsSet == 0) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_settings");
-                return buf.toString();
+                return "/_settings";
             }
             if (propsSet == (_index)) {
                 StringBuilder buf = new StringBuilder();
                 buf.append("/");
-                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                SimpleEndpoint.pathEncode(String.join(",", request.index), buf);
                 buf.append("/_settings");
                 return buf.toString();
             }
             if (propsSet == (_index | _name)) {
                 StringBuilder buf = new StringBuilder();
                 buf.append("/");
-                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                buf.append("/_settings");
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                SimpleEndpoint.pathEncode(String.join(",", request.index), buf);
+                buf.append("/_settings/");
+                SimpleEndpoint.pathEncode(String.join(",", request.name), buf);
                 return buf.toString();
             }
             if (propsSet == (_name)) {
                 StringBuilder buf = new StringBuilder();
-                buf.append("/_settings");
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_settings/");
+                SimpleEndpoint.pathEncode(String.join(",", request.name), buf);
                 return buf.toString();
             }
-            throw SimpleEndpoint.noPathTemplateFound("path");
 
+            throw SimpleEndpoint.noPathTemplateFound("path");
         },
-
         // 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,
         GetIndicesSettingsResponse._DESERIALIZER
     );
+
+    @Override
+    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 + Objects.hashCode(this.index);
+        result = 31 * result + Objects.hashCode(this.local);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + Objects.hashCode(this.name);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetIndicesSettingsRequest other = (GetIndicesSettingsRequest) 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)
+            && Objects.equals(this.index, other.index)
+            && Objects.equals(this.local, other.local)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && Objects.equals(this.name, other.name);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
index 88528509e1..5885d45eb4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
@@ -30,9 +30,15 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -43,15 +49,17 @@
 // typedef: indices.get_settings.Response
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetIndicesSettingsResponse extends DictionaryResponse<String, IndexState> {
     // ---------------------------------------------------------------------------------------------
 
     private GetIndicesSettingsResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static GetIndicesSettingsResponse of(Function<Builder, ObjectBuilder<GetIndicesSettingsResponse>> fn) {
+    public static GetIndicesSettingsResponse of(
+        Function<GetIndicesSettingsResponse.Builder, ObjectBuilder<GetIndicesSettingsResponse>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
@@ -60,11 +68,11 @@ public static GetIndicesSettingsResponse of(Function<Builder, ObjectBuilder<GetI
     /**
      * Builder for {@link GetIndicesSettingsResponse}.
      */
-
     public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexState, Builder>
         implements
             ObjectBuilder<GetIndicesSettingsResponse> {
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -72,8 +80,7 @@ protected Builder self() {
         /**
          * Builds a {@link GetIndicesSettingsResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public GetIndicesSettingsResponse build() {
             _checkSingleUse();
@@ -95,8 +102,6 @@ public GetIndicesSettingsResponse build() {
     );
 
     protected static void setupGetIndicesSettingsResponseDeserializer(ObjectDeserializer<GetIndicesSettingsResponse.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/GetMappingRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
similarity index 55%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
index 86dad6e8e4..baab0141c4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetMappingRequest.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;
@@ -45,25 +52,32 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.get_mapping.Request
 
 /**
- * Returns mappings for one or more indices.
- *
+ * Returns mappings for one or more indexes.
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class GetMappingRequest extends RequestBase implements ToCopyableBuilder<GetMappingRequest.Builder, GetMappingRequest> {
 
-public class GetMappingRequest extends RequestBase {
     @Nullable
     private final Boolean allowNoIndices;
 
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nonnull
     private final List<ExpandWildcard> expandWildcards;
 
     @Nullable
     private final Boolean ignoreUnavailable;
 
+    @Nonnull
     private final List<String> index;
 
     @Nullable
@@ -73,33 +87,28 @@ public class GetMappingRequest extends RequestBase {
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
     // ---------------------------------------------------------------------------------------------
 
     private GetMappingRequest(Builder builder) {
-
         this.allowNoIndices = builder.allowNoIndices;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
         this.ignoreUnavailable = builder.ignoreUnavailable;
         this.index = ApiTypeHelper.unmodifiable(builder.index);
         this.local = builder.local;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
-
     }
 
-    public static GetMappingRequest of(Function<Builder, ObjectBuilder<GetMappingRequest>> fn) {
+    public static GetMappingRequest of(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Whether to ignore if a wildcard indices expression resolves into no concrete
-     * indices. (This includes <code>_all</code> string or when no indices have been
-     * specified)
+     * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets only
+     * missing or closed indexes. This behavior applies even if the request targets other open indexes.
      * <p>
      * API name: {@code allow_no_indices}
+     * </p>
      */
     @Nullable
     public final Boolean allowNoIndices() {
@@ -107,20 +116,34 @@ public final Boolean allowNoIndices() {
     }
 
     /**
-     * Whether to expand wildcard expression to concrete indices that are open,
-     * closed or both.
+     * 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 patterns 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 <code>open,hidden</code>. Valid values are:
+     * <code>all</code>, <code>open</code>, <code>closed</code>, <code>hidden</code>, <code>none</code>.
      * <p>
      * API name: {@code expand_wildcards}
+     * </p>
      */
+    @Nonnull
     public final List<ExpandWildcard> expandWildcards() {
         return this.expandWildcards;
     }
 
     /**
-     * Whether specified concrete indices should be ignored when unavailable
-     * (missing or closed)
+     * If <code>false</code>, the request returns an error if it targets a missing or closed index.
      * <p>
      * API name: {@code ignore_unavailable}
+     * </p>
      */
     @Nullable
     public final Boolean ignoreUnavailable() {
@@ -128,19 +151,22 @@ public final Boolean ignoreUnavailable() {
     }
 
     /**
-     * A comma-separated list of index names
+     * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To target
+     * all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
      * <p>
      * API name: {@code index}
+     * </p>
      */
+    @Nonnull
     public final List<String> index() {
         return this.index;
     }
 
     /**
-     * Return local information, do not retrieve the state from cluster-manager node
-     * (default: false)
+     * If <code>true</code>, the request retrieves information from the local node only.
      * <p>
      * API name: {@code local}
+     * </p>
      */
     @Nullable
     public final Boolean local() {
@@ -148,9 +174,11 @@ public final Boolean local() {
     }
 
     /**
-     * Specify timeout for connection to master
+     * 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 master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -158,175 +186,230 @@ public final Time masterTimeout() {
         return this.masterTimeout;
     }
 
-    /**
-     * Specify timeout for connection to cluster-manager
-     * <p>
-     * API name: {@code cluster_manager_timeout}
-     */
-    @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
+    // ---------------------------------------------------------------------------------------------
+
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
     }
 
-    // ---------------------------------------------------------------------------------------------
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
 
     /**
      * Builder for {@link GetMappingRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetMappingRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, GetMappingRequest> {
         @Nullable
         private Boolean allowNoIndices;
-
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private List<ExpandWildcard> expandWildcards;
-
         @Nullable
         private Boolean ignoreUnavailable;
-
         @Nullable
         private List<String> index;
-
         @Nullable
         private Boolean local;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
 
-        @Nullable
-        private Time clusterManagerTimeout;
+        public Builder() {}
+
+        private Builder(GetMappingRequest o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.index = _listCopy(o.index);
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+        }
+
+        private Builder(Builder o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.index = _listCopy(o.index);
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
         /**
-         * Whether to ignore if a wildcard indices expression resolves into no concrete
-         * indices. (This includes <code>_all</code> string or when no indices have been
-         * specified)
+         * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets
+         * only missing or closed indexes. This behavior applies even if the request targets other open indexes.
          * <p>
          * API name: {@code allow_no_indices}
+         * </p>
          */
+        @Nonnull
         public final Builder allowNoIndices(@Nullable Boolean value) {
             this.allowNoIndices = value;
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        @Nonnull
+        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>
+         */
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>. Valid values are:
+         * <code>all</code>, <code>open</code>, <code>closed</code>, <code>hidden</code>, <code>none</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(List<ExpandWildcard> list) {
             this.expandWildcards = _listAddAll(this.expandWildcards, list);
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>. Valid values are:
+         * <code>all</code>, <code>open</code>, <code>closed</code>, <code>hidden</code>, <code>none</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
             this.expandWildcards = _listAdd(this.expandWildcards, value, values);
             return this;
         }
 
         /**
-         * Whether specified concrete indices should be ignored when unavailable
-         * (missing or closed)
+         * If <code>false</code>, the request returns an error if it targets a missing or closed index.
          * <p>
          * API name: {@code ignore_unavailable}
+         * </p>
          */
+        @Nonnull
         public final Builder ignoreUnavailable(@Nullable Boolean value) {
             this.ignoreUnavailable = value;
             return this;
         }
 
         /**
-         * A comma-separated list of index names
+         * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To
+         * target all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(List<String> list) {
             this.index = _listAddAll(this.index, list);
             return this;
         }
 
         /**
-         * A comma-separated list of index names
+         * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To
+         * target all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(String value, String... values) {
             this.index = _listAdd(this.index, value, values);
             return this;
         }
 
         /**
-         * Return local information, do not retrieve the state from cluster-manager node
-         * (default: false)
+         * If <code>true</code>, the request retrieves information from the local node only.
          * <p>
          * API name: {@code local}
+         * </p>
          */
+        @Nonnull
         public final Builder local(@Nullable Boolean value) {
             this.local = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
-        }
-
-        /**
-         * Specify timeout for connection to cluster-manager
-         * <p>
-         * API name: {@code cluster_manager_timeout}
-         */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
-            return this;
-        }
-
-        /**
-         * Specify timeout for connection to cluster-manager
-         * <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 GetMappingRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public GetMappingRequest build() {
             _checkSingleUse();
 
@@ -340,13 +423,8 @@ public GetMappingRequest build() {
      * Endpoint "{@code indices.get_mapping}".
      */
     public static final Endpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "GET";
-
-        },
-
+        request -> "GET",
         // Request path
         request -> {
             final int _index = 1 << 0;
@@ -356,26 +434,23 @@ public GetMappingRequest build() {
             if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
 
             if (propsSet == 0) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_mapping");
-                return buf.toString();
+                return "/_mapping";
             }
             if (propsSet == (_index)) {
                 StringBuilder buf = new StringBuilder();
                 buf.append("/");
-                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                SimpleEndpoint.pathEncode(String.join(",", request.index), buf);
                 buf.append("/_mapping");
                 return buf.toString();
             }
-            throw SimpleEndpoint.noPathTemplateFound("path");
 
+            throw SimpleEndpoint.noPathTemplateFound("path");
         },
-
         // 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());
@@ -386,17 +461,46 @@ public GetMappingRequest build() {
             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 (ApiTypeHelper.isDefined(request.index)) {
+                params.put("index", String.join(",", request.index));
             }
             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,
         GetMappingResponse._DESERIALIZER
     );
+
+    @Override
+    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.ignoreUnavailable);
+        result = 31 * result + Objects.hashCode(this.index);
+        result = 31 * result + Objects.hashCode(this.local);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetMappingRequest other = (GetMappingRequest) o;
+        return Objects.equals(this.allowNoIndices, other.allowNoIndices)
+            && Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.expandWildcards, other.expandWildcards)
+            && Objects.equals(this.ignoreUnavailable, other.ignoreUnavailable)
+            && Objects.equals(this.index, 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/GetMappingResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
index 0f36d4121e..ee1f709235 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
@@ -30,9 +30,15 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -44,15 +50,15 @@
 // typedef: indices.get_mapping.Response
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetMappingResponse extends DictionaryResponse<String, IndexMappingRecord> {
     // ---------------------------------------------------------------------------------------------
 
     private GetMappingResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static GetMappingResponse of(Function<Builder, ObjectBuilder<GetMappingResponse>> fn) {
+    public static GetMappingResponse of(Function<GetMappingResponse.Builder, ObjectBuilder<GetMappingResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -61,11 +67,11 @@ public static GetMappingResponse of(Function<Builder, ObjectBuilder<GetMappingRe
     /**
      * Builder for {@link GetMappingResponse}.
      */
-
     public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexMappingRecord, Builder>
         implements
             ObjectBuilder<GetMappingResponse> {
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -73,8 +79,7 @@ protected Builder self() {
         /**
          * Builds a {@link GetMappingResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public GetMappingResponse build() {
             _checkSingleUse();
@@ -96,12 +101,6 @@ public GetMappingResponse build() {
     );
 
     protected static void setupGetMappingResponseDeserializer(ObjectDeserializer<GetMappingResponse.Builder> op) {
-        DictionaryResponse.setupDictionaryResponseDeserializer(
-            op,
-            JsonpDeserializer.stringDeserializer(),
-            IndexMappingRecord._DESERIALIZER
-        );
-
+        setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), IndexMappingRecord._DESERIALIZER);
     }
-
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
similarity index 59%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
index fffb7b92ce..fada14bad7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
@@ -30,13 +30,19 @@
  * 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.RequestBase;
@@ -44,17 +50,22 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.get_template.Request
 
 /**
  * Returns an index template.
- *
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class GetTemplateRequest extends RequestBase implements ToCopyableBuilder<GetTemplateRequest.Builder, GetTemplateRequest> {
+
+    @Nullable
+    private final Time clusterManagerTimeout;
 
-public class GetTemplateRequest extends RequestBase {
     @Nullable
     private final Boolean flatSettings;
 
@@ -65,31 +76,39 @@ public class GetTemplateRequest extends RequestBase {
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
+    @Nonnull
     private final List<String> name;
 
     // ---------------------------------------------------------------------------------------------
 
     private GetTemplateRequest(Builder builder) {
-
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.flatSettings = builder.flatSettings;
         this.local = builder.local;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.name = ApiTypeHelper.unmodifiable(builder.name);
-
     }
 
-    public static GetTemplateRequest of(Function<Builder, ObjectBuilder<GetTemplateRequest>> fn) {
+    public static GetTemplateRequest of(Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Return settings in flat format (default: false)
+     * Operation timeout for connection to cluster-manager node.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     * </p>
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * If <code>true</code>, returns settings in flat format.
      * <p>
      * API name: {@code flat_settings}
+     * </p>
      */
     @Nullable
     public final Boolean flatSettings() {
@@ -97,10 +116,10 @@ public final Boolean flatSettings() {
     }
 
     /**
-     * Return local information, do not retrieve the state from cluster-manager node
-     * (default: false)
+     * If <code>true</code>, the request retrieves information from the local node only.
      * <p>
      * API name: {@code local}
+     * </p>
      */
     @Nullable
     public final Boolean local() {
@@ -108,9 +127,11 @@ public final Boolean local() {
     }
 
     /**
-     * Explicit operation timeout for connection to master node
+     * 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 master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -119,127 +140,172 @@ public final Time masterTimeout() {
     }
 
     /**
-     * Explicit operation timeout for connection to cluster-manager node
-     * <p>
-     * API name: {@code cluster_manager_timeout}
-     */
-    @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
-    }
-
-    /**
-     * The comma separated names of the index templates
+     * Comma-separated list of index template names used to limit the request. Wildcard (<code>*</code>) expressions are supported. To
+     * return all index templates, omit this parameter or use a value of <code>_all</code> or <code>*</code>.
      * <p>
      * API name: {@code name}
+     * </p>
      */
+    @Nonnull
     public final List<String> name() {
         return this.name;
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link GetTemplateRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTemplateRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, GetTemplateRequest> {
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private Boolean flatSettings;
-
         @Nullable
         private Boolean local;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
-
-        @Nullable
-        private Time clusterManagerTimeout;
-
         @Nullable
         private List<String> name;
 
+        public Builder() {}
+
+        private Builder(GetTemplateRequest o) {
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.flatSettings = o.flatSettings;
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+            this.name = _listCopy(o.name);
+        }
+
+        private Builder(Builder o) {
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.flatSettings = o.flatSettings;
+            this.local = o.local;
+            this.masterTimeout = o.masterTimeout;
+            this.name = _listCopy(o.name);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
+        /**
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        @Nonnull
+        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>
+         */
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
         /**
-         * Return settings in flat format (default: false)
+         * If <code>true</code>, returns settings in flat format.
          * <p>
          * API name: {@code flat_settings}
+         * </p>
          */
+        @Nonnull
         public final Builder flatSettings(@Nullable Boolean value) {
             this.flatSettings = value;
             return this;
         }
 
         /**
-         * Return local information, do not retrieve the state from cluster-manager node
-         * (default: false)
+         * If <code>true</code>, the request retrieves information from the local node only.
          * <p>
          * API name: {@code local}
+         * </p>
          */
+        @Nonnull
         public final Builder local(@Nullable Boolean value) {
             this.local = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout for connection to master node
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout for connection to master node
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Explicit operation timeout for connection to cluster-manager node
-         * <p>
-         * API name: {@code cluster_manager_timeout}
-         */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
-            return this;
-        }
-
-        /**
-         * Explicit operation timeout for connection to cluster-manager node
-         * <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());
-        }
-
-        /**
-         * The comma separated names of the index templates
+         * Comma-separated list of index template names used to limit the request. Wildcard (<code>*</code>) expressions are supported. To
+         * return all index templates, omit this parameter or use a value of <code>_all</code> or <code>*</code>.
          * <p>
          * API name: {@code name}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>name</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder name(List<String> list) {
             this.name = _listAddAll(this.name, list);
             return this;
         }
 
         /**
-         * The comma separated names of the index templates
+         * Comma-separated list of index template names used to limit the request. Wildcard (<code>*</code>) expressions are supported. To
+         * return all index templates, omit this parameter or use a value of <code>_all</code> or <code>*</code>.
          * <p>
          * API name: {@code name}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>name</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder name(String value, String... values) {
             this.name = _listAdd(this.name, value, values);
             return this;
@@ -248,9 +314,10 @@ public final Builder name(String value, String... values) {
         /**
          * Builds a {@link GetTemplateRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public GetTemplateRequest build() {
             _checkSingleUse();
 
@@ -264,13 +331,8 @@ public GetTemplateRequest build() {
      * Endpoint "{@code indices.get_template}".
      */
     public static final Endpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "GET";
-
-        },
-
+        request -> "GET",
         // Request path
         request -> {
             final int _name = 1 << 0;
@@ -280,27 +342,20 @@ public GetTemplateRequest build() {
             if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
 
             if (propsSet == 0) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_template");
-                return buf.toString();
+                return "/_template";
             }
             if (propsSet == (_name)) {
                 StringBuilder buf = new StringBuilder();
-                buf.append("/_template");
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_template/");
+                SimpleEndpoint.pathEncode(String.join(",", request.name), buf);
                 return buf.toString();
             }
-            throw SimpleEndpoint.noPathTemplateFound("path");
 
+            throw SimpleEndpoint.noPathTemplateFound("path");
         },
-
         // Request parameters
         request -> {
             Map<String, String> params = new HashMap<>();
-            if (request.masterTimeout != null) {
-                params.put("master_timeout", request.masterTimeout._toJsonString());
-            }
             if (request.clusterManagerTimeout != null) {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
             }
@@ -310,11 +365,36 @@ public GetTemplateRequest build() {
             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,
         GetTemplateResponse._DESERIALIZER
     );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
+        result = 31 * result + Objects.hashCode(this.flatSettings);
+        result = 31 * result + Objects.hashCode(this.local);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + Objects.hashCode(this.name);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetTemplateRequest other = (GetTemplateRequest) o;
+        return Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.flatSettings, other.flatSettings)
+            && Objects.equals(this.local, other.local)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && Objects.equals(this.name, other.name);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
index 590cb1a696..5265654646 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
@@ -30,9 +30,15 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -43,15 +49,15 @@
 // typedef: indices.get_template.Response
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetTemplateResponse extends DictionaryResponse<String, TemplateMapping> {
     // ---------------------------------------------------------------------------------------------
 
     private GetTemplateResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static GetTemplateResponse of(Function<Builder, ObjectBuilder<GetTemplateResponse>> fn) {
+    public static GetTemplateResponse of(Function<GetTemplateResponse.Builder, ObjectBuilder<GetTemplateResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -60,11 +66,11 @@ public static GetTemplateResponse of(Function<Builder, ObjectBuilder<GetTemplate
     /**
      * Builder for {@link GetTemplateResponse}.
      */
-
     public static class Builder extends DictionaryResponse.AbstractBuilder<String, TemplateMapping, Builder>
         implements
             ObjectBuilder<GetTemplateResponse> {
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -72,8 +78,7 @@ protected Builder self() {
         /**
          * Builds a {@link GetTemplateResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public GetTemplateResponse build() {
             _checkSingleUse();
@@ -95,8 +100,6 @@ public GetTemplateResponse build() {
     );
 
     protected static void setupGetTemplateResponseDeserializer(ObjectDeserializer<GetTemplateResponse.Builder> op) {
-        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), TemplateMapping._DESERIALIZER);
-
+        setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), TemplateMapping._DESERIALIZER);
     }
-
 }
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
index c031703329..2959a09154 100644
--- 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
@@ -118,6 +118,26 @@ public final CompletableFuture<DeleteIndexTemplateResponse> deleteIndexTemplate(
         return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
     }
 
+    // ----- Endpoint: indices.delete_template
+
+    /**
+     * Deletes an index template.
+     */
+    public CompletableFuture<DeleteTemplateResponse> deleteTemplate(DeleteTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, DeleteTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index template.
+     *
+     * @param fn a function that initializes a builder to create the {@link DeleteTemplateRequest}
+     */
+    public final CompletableFuture<DeleteTemplateResponse> deleteTemplate(
+        Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
+    }
+
     // ----- Endpoint: indices.exists
 
     /**
@@ -158,6 +178,26 @@ public final CompletableFuture<BooleanResponse> existsIndexTemplate(
         return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
     }
 
+    // ----- Endpoint: indices.exists_template
+
+    /**
+     * Returns information about whether a particular index template exists.
+     */
+    public CompletableFuture<BooleanResponse> existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, ExistsTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     * @param fn a function that initializes a builder to create the {@link ExistsTemplateRequest}
+     */
+    public final CompletableFuture<BooleanResponse> existsTemplate(
+        Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
+    }
+
     // ----- Endpoint: indices.get
 
     /**
@@ -205,6 +245,87 @@ public final CompletableFuture<GetIndexTemplateResponse> getIndexTemplate() thro
         return getIndexTemplate(new GetIndexTemplateRequest.Builder().build());
     }
 
+    // ----- Endpoint: indices.get_mapping
+
+    /**
+     * Returns mappings for one or more indexes.
+     */
+    public CompletableFuture<GetMappingResponse> getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, GetMappingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns mappings for one or more indexes.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetMappingRequest}
+     */
+    public final CompletableFuture<GetMappingResponse> getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
+    }
+
+    /**
+     * Returns mappings for one or more indexes.
+     */
+    public final CompletableFuture<GetMappingResponse> getMapping() throws IOException, OpenSearchException {
+        return getMapping(new GetMappingRequest.Builder().build());
+    }
+
+    // ----- Endpoint: indices.get_settings
+
+    /**
+     * Returns settings for one or more indexes.
+     */
+    public CompletableFuture<GetIndicesSettingsResponse> getSettings(GetIndicesSettingsRequest request) throws IOException,
+        OpenSearchException {
+        return this.transport.performRequestAsync(request, GetIndicesSettingsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns settings for one or more indexes.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetIndicesSettingsRequest}
+     */
+    public final CompletableFuture<GetIndicesSettingsResponse> getSettings(
+        Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns settings for one or more indexes.
+     */
+    public final CompletableFuture<GetIndicesSettingsResponse> getSettings() throws IOException, OpenSearchException {
+        return getSettings(new GetIndicesSettingsRequest.Builder().build());
+    }
+
+    // ----- Endpoint: indices.get_template
+
+    /**
+     * Returns an index template.
+     */
+    public CompletableFuture<GetTemplateResponse> getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, GetTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns an index template.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetTemplateRequest}
+     */
+    public final CompletableFuture<GetTemplateResponse> getTemplate(
+        Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an index template.
+     */
+    public final CompletableFuture<GetTemplateResponse> getTemplate() throws IOException, OpenSearchException {
+        return getTemplate(new GetTemplateRequest.Builder().build());
+    }
+
     // ----- Endpoint: indices.put_index_template
 
     /**
@@ -226,6 +347,66 @@ public final CompletableFuture<PutIndexTemplateResponse> putIndexTemplate(
         return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
     }
 
+    // ----- Endpoint: indices.put_mapping
+
+    /**
+     * Updates the index mappings.
+     */
+    public CompletableFuture<PutMappingResponse> putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, PutMappingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Updates the index mappings.
+     *
+     * @param fn a function that initializes a builder to create the {@link PutMappingRequest}
+     */
+    public final CompletableFuture<PutMappingResponse> putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_settings
+
+    /**
+     * Updates the index settings.
+     */
+    public CompletableFuture<PutIndicesSettingsResponse> putSettings(PutIndicesSettingsRequest request) throws IOException,
+        OpenSearchException {
+        return this.transport.performRequestAsync(request, PutIndicesSettingsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Updates the index settings.
+     *
+     * @param fn a function that initializes a builder to create the {@link PutIndicesSettingsRequest}
+     */
+    public final CompletableFuture<PutIndicesSettingsResponse> putSettings(
+        Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_template
+
+    /**
+     * Creates or updates an index template.
+     */
+    public CompletableFuture<PutTemplateResponse> putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(request, PutTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an index template.
+     *
+     * @param fn a function that initializes a builder to create the {@link PutTemplateRequest}
+     */
+    public final CompletableFuture<PutTemplateResponse> putTemplate(
+        Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
+    }
+
     // ----- Endpoint: indices.simulate_index_template
 
     /**
@@ -246,4 +427,25 @@ public final CompletableFuture<SimulateIndexTemplateResponse> simulateIndexTempl
     ) throws IOException, OpenSearchException {
         return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
     }
+
+    // ----- Endpoint: indices.simulate_template
+
+    /**
+     * Simulate resolving the given template name or body.
+     */
+    public CompletableFuture<SimulateTemplateResponse> simulateTemplate(SimulateTemplateRequest request) throws IOException,
+        OpenSearchException {
+        return this.transport.performRequestAsync(request, SimulateTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Simulate resolving the given template name or body.
+     *
+     * @param fn a function that initializes a builder to create the {@link SimulateTemplateRequest}
+     */
+    public final CompletableFuture<SimulateTemplateResponse> simulateTemplate(
+        Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return simulateTemplate(fn.apply(new SimulateTemplateRequest.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
index 01da5df600..c9c20e12d3 100644
--- 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
@@ -116,6 +116,25 @@ public final DeleteIndexTemplateResponse deleteIndexTemplate(
         return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
     }
 
+    // ----- Endpoint: indices.delete_template
+
+    /**
+     * Deletes an index template.
+     */
+    public DeleteTemplateResponse deleteTemplate(DeleteTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, DeleteTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index template.
+     *
+     * @param fn a function that initializes a builder to create the {@link DeleteTemplateRequest}
+     */
+    public final DeleteTemplateResponse deleteTemplate(Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
+    }
+
     // ----- Endpoint: indices.exists
 
     /**
@@ -155,6 +174,25 @@ public final BooleanResponse existsIndexTemplate(
         return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
     }
 
+    // ----- Endpoint: indices.exists_template
+
+    /**
+     * Returns information about whether a particular index template exists.
+     */
+    public BooleanResponse existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, ExistsTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     * @param fn a function that initializes a builder to create the {@link ExistsTemplateRequest}
+     */
+    public final BooleanResponse existsTemplate(Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
+    }
+
     // ----- Endpoint: indices.get
 
     /**
@@ -201,6 +239,85 @@ public final GetIndexTemplateResponse getIndexTemplate() throws IOException, Ope
         return getIndexTemplate(new GetIndexTemplateRequest.Builder().build());
     }
 
+    // ----- Endpoint: indices.get_mapping
+
+    /**
+     * Returns mappings for one or more indexes.
+     */
+    public GetMappingResponse getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, GetMappingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns mappings for one or more indexes.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetMappingRequest}
+     */
+    public final GetMappingResponse getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn) throws IOException,
+        OpenSearchException {
+        return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
+    }
+
+    /**
+     * Returns mappings for one or more indexes.
+     */
+    public final GetMappingResponse getMapping() throws IOException, OpenSearchException {
+        return getMapping(new GetMappingRequest.Builder().build());
+    }
+
+    // ----- Endpoint: indices.get_settings
+
+    /**
+     * Returns settings for one or more indexes.
+     */
+    public GetIndicesSettingsResponse getSettings(GetIndicesSettingsRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, GetIndicesSettingsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns settings for one or more indexes.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetIndicesSettingsRequest}
+     */
+    public final GetIndicesSettingsResponse getSettings(
+        Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns settings for one or more indexes.
+     */
+    public final GetIndicesSettingsResponse getSettings() throws IOException, OpenSearchException {
+        return getSettings(new GetIndicesSettingsRequest.Builder().build());
+    }
+
+    // ----- Endpoint: indices.get_template
+
+    /**
+     * Returns an index template.
+     */
+    public GetTemplateResponse getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, GetTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Returns an index template.
+     *
+     * @param fn a function that initializes a builder to create the {@link GetTemplateRequest}
+     */
+    public final GetTemplateResponse getTemplate(Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an index template.
+     */
+    public final GetTemplateResponse getTemplate() throws IOException, OpenSearchException {
+        return getTemplate(new GetTemplateRequest.Builder().build());
+    }
+
     // ----- Endpoint: indices.put_index_template
 
     /**
@@ -221,6 +338,64 @@ public final PutIndexTemplateResponse putIndexTemplate(
         return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
     }
 
+    // ----- Endpoint: indices.put_mapping
+
+    /**
+     * Updates the index mappings.
+     */
+    public PutMappingResponse putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, PutMappingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Updates the index mappings.
+     *
+     * @param fn a function that initializes a builder to create the {@link PutMappingRequest}
+     */
+    public final PutMappingResponse putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn) throws IOException,
+        OpenSearchException {
+        return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_settings
+
+    /**
+     * Updates the index settings.
+     */
+    public PutIndicesSettingsResponse putSettings(PutIndicesSettingsRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, PutIndicesSettingsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Updates the index settings.
+     *
+     * @param fn a function that initializes a builder to create the {@link PutIndicesSettingsRequest}
+     */
+    public final PutIndicesSettingsResponse putSettings(
+        Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_template
+
+    /**
+     * Creates or updates an index template.
+     */
+    public PutTemplateResponse putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, PutTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an index template.
+     *
+     * @param fn a function that initializes a builder to create the {@link PutTemplateRequest}
+     */
+    public final PutTemplateResponse putTemplate(Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
+    }
+
     // ----- Endpoint: indices.simulate_index_template
 
     /**
@@ -241,4 +416,24 @@ public final SimulateIndexTemplateResponse simulateIndexTemplate(
     ) throws IOException, OpenSearchException {
         return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
     }
+
+    // ----- Endpoint: indices.simulate_template
+
+    /**
+     * Simulate resolving the given template name or body.
+     */
+    public SimulateTemplateResponse simulateTemplate(SimulateTemplateRequest request) throws IOException, OpenSearchException {
+        return this.transport.performRequest(request, SimulateTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    /**
+     * Simulate resolving the given template name or body.
+     *
+     * @param fn a function that initializes a builder to create the {@link SimulateTemplateRequest}
+     */
+    public final SimulateTemplateResponse simulateTemplate(
+        Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
similarity index 58%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
index aa71f98e2c..e338763804 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
@@ -30,14 +30,21 @@
  * 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.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.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -50,20 +57,30 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.put_settings.Request
 
 /**
  * Updates the index settings.
- *
  */
 @JsonpDeserializable
-public class PutIndicesSettingsRequest extends RequestBase implements PlainJsonSerializable {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PutIndicesSettingsRequest extends RequestBase
+    implements
+        PlainJsonSerializable,
+        ToCopyableBuilder<PutIndicesSettingsRequest.Builder, PutIndicesSettingsRequest> {
+
     @Nullable
     private final Boolean allowNoIndices;
 
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nonnull
     private final List<ExpandWildcard> expandWildcards;
 
     @Nullable
@@ -72,50 +89,48 @@ public class PutIndicesSettingsRequest extends RequestBase implements PlainJsonS
     @Nullable
     private final Boolean ignoreUnavailable;
 
+    @Nonnull
     private final List<String> index;
 
     @Deprecated
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
     @Nullable
     private final Boolean preserveExisting;
 
+    @Nonnull
+    private final IndexSettings settings;
+
     @Nullable
     private final Time timeout;
 
-    private final IndexSettings settings;
-
     // ---------------------------------------------------------------------------------------------
 
     private PutIndicesSettingsRequest(Builder builder) {
-
         this.allowNoIndices = builder.allowNoIndices;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
         this.flatSettings = builder.flatSettings;
         this.ignoreUnavailable = builder.ignoreUnavailable;
         this.index = ApiTypeHelper.unmodifiable(builder.index);
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.preserveExisting = builder.preserveExisting;
-        this.timeout = builder.timeout;
         this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
+        this.timeout = builder.timeout;
     }
 
-    public static PutIndicesSettingsRequest of(Function<Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
+    public static PutIndicesSettingsRequest of(Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Whether to ignore if a wildcard indices expression resolves into no concrete
-     * indices. (This includes <code>_all</code> string or when no indices have been
-     * specified)
+     * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets only
+     * missing or closed indexes. This behavior applies even if the request targets other open indexes. For example, a request targeting
+     * <code>foo*,bar*</code> returns an error if an index starts with <code>foo</code> but no index starts with <code>bar</code>.
      * <p>
      * API name: {@code allow_no_indices}
+     * </p>
      */
     @Nullable
     public final Boolean allowNoIndices() {
@@ -123,19 +138,33 @@ public final Boolean allowNoIndices() {
     }
 
     /**
-     * Whether to expand wildcard expression to concrete indices that are open,
-     * closed or both.
+     * 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 patterns 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 <code>open,hidden</code>.
      * <p>
      * API name: {@code expand_wildcards}
+     * </p>
      */
+    @Nonnull
     public final List<ExpandWildcard> expandWildcards() {
         return this.expandWildcards;
     }
 
     /**
-     * Return settings in flat format (default: false)
+     * If <code>true</code>, returns settings in flat format.
      * <p>
      * API name: {@code flat_settings}
+     * </p>
      */
     @Nullable
     public final Boolean flatSettings() {
@@ -143,10 +172,10 @@ public final Boolean flatSettings() {
     }
 
     /**
-     * Whether specified concrete indices should be ignored when unavailable
-     * (missing or closed)
+     * Whether specified concrete indexes should be ignored when unavailable (missing or closed).
      * <p>
      * API name: {@code ignore_unavailable}
+     * </p>
      */
     @Nullable
     public final Boolean ignoreUnavailable() {
@@ -154,19 +183,23 @@ public final Boolean ignoreUnavailable() {
     }
 
     /**
-     * A comma-separated list of index names; use <code>_all</code> or empty string
-     * to perform the operation on all indices
+     * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To target
+     * all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
      * <p>
      * API name: {@code index}
+     * </p>
      */
+    @Nonnull
     public final List<String> index() {
         return this.index;
     }
 
     /**
-     * Specify timeout for connection to master
+     * 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 master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -175,270 +208,330 @@ public final Time masterTimeout() {
     }
 
     /**
-     * Specify timeout for connection to cluster-manager
+     * If <code>true</code>, existing index settings remain unchanged.
      * <p>
-     * API name: {@code cluster_manager_timeout}
+     * API name: {@code preserve_existing}
+     * </p>
      */
     @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
+    public final Boolean preserveExisting() {
+        return this.preserveExisting;
     }
 
     /**
-     * Whether to update existing settings. If set to <code>true</code> existing
-     * settings on an index remain unchanged, the default is <code>false</code>
-     * <p>
-     * API name: {@code preserve_existing}
+     * Required - Request body.
      */
-    @Nullable
-    public final Boolean preserveExisting() {
-        return this.preserveExisting;
+    @Nonnull
+    public final IndexSettings settings() {
+        return this.settings;
     }
 
     /**
-     * Explicit operation timeout
+     * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
      * <p>
      * API name: {@code timeout}
+     * </p>
      */
     @Nullable
     public final Time timeout() {
         return this.timeout;
     }
 
-    /**
-     * Required - Request body.
-     * <p>
-     * API name: {@code _value_body}
-     */
-    public final IndexSettings settings() {
-        return this.settings;
-    }
-
     /**
      * Serialize this value to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         this.settings.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link PutIndicesSettingsRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutIndicesSettingsRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, PutIndicesSettingsRequest> {
         @Nullable
         private Boolean allowNoIndices;
-
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private List<ExpandWildcard> expandWildcards;
-
         @Nullable
         private Boolean flatSettings;
-
         @Nullable
         private Boolean ignoreUnavailable;
-
         @Nullable
         private List<String> index;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
-
-        @Nullable
-        private Time clusterManagerTimeout;
-
         @Nullable
         private Boolean preserveExisting;
-
+        private IndexSettings settings;
         @Nullable
         private Time timeout;
 
-        private IndexSettings settings;
+        public Builder() {}
+
+        private Builder(PutIndicesSettingsRequest o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.flatSettings = o.flatSettings;
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.index = _listCopy(o.index);
+            this.masterTimeout = o.masterTimeout;
+            this.preserveExisting = o.preserveExisting;
+            this.settings = o.settings;
+            this.timeout = o.timeout;
+        }
+
+        private Builder(Builder o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.flatSettings = o.flatSettings;
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.index = _listCopy(o.index);
+            this.masterTimeout = o.masterTimeout;
+            this.preserveExisting = o.preserveExisting;
+            this.settings = o.settings;
+            this.timeout = o.timeout;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
         /**
-         * Whether to ignore if a wildcard indices expression resolves into no concrete
-         * indices. (This includes <code>_all</code> string or when no indices have been
-         * specified)
+         * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets
+         * only missing or closed indexes. This behavior applies even if the request targets other open indexes. For example, a request
+         * targeting <code>foo*,bar*</code> returns an error if an index starts with <code>foo</code> but no index starts with
+         * <code>bar</code>.
          * <p>
          * API name: {@code allow_no_indices}
+         * </p>
          */
+        @Nonnull
         public final Builder allowNoIndices(@Nullable Boolean value) {
             this.allowNoIndices = value;
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
+         */
+        @Nonnull
+        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>
+         */
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(List<ExpandWildcard> list) {
             this.expandWildcards = _listAddAll(this.expandWildcards, list);
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
             this.expandWildcards = _listAdd(this.expandWildcards, value, values);
             return this;
         }
 
         /**
-         * Return settings in flat format (default: false)
+         * If <code>true</code>, returns settings in flat format.
          * <p>
          * API name: {@code flat_settings}
+         * </p>
          */
+        @Nonnull
         public final Builder flatSettings(@Nullable Boolean value) {
             this.flatSettings = value;
             return this;
         }
 
         /**
-         * Whether specified concrete indices should be ignored when unavailable
-         * (missing or closed)
+         * Whether specified concrete indexes should be ignored when unavailable (missing or closed).
          * <p>
          * API name: {@code ignore_unavailable}
+         * </p>
          */
+        @Nonnull
         public final Builder ignoreUnavailable(@Nullable Boolean value) {
             this.ignoreUnavailable = value;
             return this;
         }
 
         /**
-         * A comma-separated list of index names; use <code>_all</code> or empty string
-         * to perform the operation on all indices
+         * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To
+         * target all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(List<String> list) {
             this.index = _listAddAll(this.index, list);
             return this;
         }
 
         /**
-         * A comma-separated list of index names; use <code>_all</code> or empty string
-         * to perform the operation on all indices
+         * Comma-separated list of data streams, indexes, and aliases used to limit the request. Supports wildcards (<code>*</code>). To
+         * target all data streams and indexes, omit this parameter or use <code>*</code> or <code>_all</code>.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(String value, String... values) {
             this.index = _listAdd(this.index, value, values);
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
+         * If <code>true</code>, existing index settings remain unchanged.
          * <p>
-         * API name: {@code cluster_manager_timeout}
+         * API name: {@code preserve_existing}
+         * </p>
          */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
+        @Nonnull
+        public final Builder preserveExisting(@Nullable Boolean value) {
+            this.preserveExisting = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
-         * <p>
-         * API name: {@code cluster_manager_timeout}
+         * Required - Request body.
          */
-        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        @Nonnull
+        public final Builder settings(IndexSettings value) {
+            this.settings = value;
+            return this;
         }
 
         /**
-         * Whether to update existing settings. If set to <code>true</code> existing
-         * settings on an index remain unchanged, the default is <code>false</code>
-         * <p>
-         * API name: {@code preserve_existing}
+         * Required - Request body.
          */
-        public final Builder preserveExisting(@Nullable Boolean value) {
-            this.preserveExisting = value;
-            return this;
+        @Nonnull
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return settings(fn.apply(new IndexSettings.Builder()).build());
         }
 
         /**
-         * Explicit operation timeout
+         * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
          * <p>
          * API name: {@code timeout}
+         * </p>
          */
+        @Nonnull
         public final Builder timeout(@Nullable Time value) {
             this.timeout = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout
+         * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
          * <p>
          * API name: {@code timeout}
+         * </p>
          */
+        @Nonnull
         public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.timeout(fn.apply(new Time.Builder()).build());
-        }
-
-        /**
-         * Required - Request body.
-         * <p>
-         * API name: {@code _value_body}
-         */
-        public final Builder settings(IndexSettings value) {
-            this.settings = value;
-            return this;
-        }
-
-        /**
-         * Required - Request body.
-         * <p>
-         * API name: {@code _value_body}
-         */
-        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+            return timeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
          * Builds a {@link PutIndicesSettingsRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public PutIndicesSettingsRequest build() {
             _checkSingleUse();
 
@@ -446,12 +539,12 @@ public PutIndicesSettingsRequest build() {
         }
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     public static final JsonpDeserializer<PutIndicesSettingsRequest> _DESERIALIZER = createPutIndicesSettingsRequestDeserializer();
 
     protected static JsonpDeserializer<PutIndicesSettingsRequest> createPutIndicesSettingsRequestDeserializer() {
-
         JsonpDeserializer<IndexSettings> valueDeserializer = IndexSettings._DESERIALIZER;
-
         return JsonpDeserializer.of(
             valueDeserializer.acceptedEvents(),
             (parser, mapper) -> new Builder().settings(valueDeserializer.deserialize(parser, mapper)).build()
@@ -464,13 +557,8 @@ protected static JsonpDeserializer<PutIndicesSettingsRequest> createPutIndicesSe
      * Endpoint "{@code indices.put_settings}".
      */
     public static final Endpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "PUT";
-
-        },
-
+        request -> "PUT",
         // Request path
         request -> {
             final int _index = 1 << 0;
@@ -480,41 +568,38 @@ protected static JsonpDeserializer<PutIndicesSettingsRequest> createPutIndicesSe
             if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
 
             if (propsSet == 0) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_settings");
-                return buf.toString();
+                return "/_settings";
             }
             if (propsSet == (_index)) {
                 StringBuilder buf = new StringBuilder();
                 buf.append("/");
-                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                SimpleEndpoint.pathEncode(String.join(",", request.index), buf);
                 buf.append("/_settings");
                 return buf.toString();
             }
-            throw SimpleEndpoint.noPathTemplateFound("path");
 
+            throw SimpleEndpoint.noPathTemplateFound("path");
         },
-
         // 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.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
             }
             if (request.preserveExisting != null) {
                 params.put("preserve_existing", String.valueOf(request.preserveExisting));
@@ -523,10 +608,42 @@ protected static JsonpDeserializer<PutIndicesSettingsRequest> createPutIndicesSe
                 params.put("timeout", request.timeout._toJsonString());
             }
             return params;
-
         },
         SimpleEndpoint.emptyMap(),
         true,
         PutIndicesSettingsResponse._DESERIALIZER
     );
+
+    @Override
+    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.index);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + Objects.hashCode(this.preserveExisting);
+        result = 31 * result + this.settings.hashCode();
+        result = 31 * result + Objects.hashCode(this.timeout);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PutIndicesSettingsRequest other = (PutIndicesSettingsRequest) 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.index, other.index)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && Objects.equals(this.preserveExisting, other.preserveExisting)
+            && this.settings.equals(other.settings)
+            && Objects.equals(this.timeout, other.timeout);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
similarity index 63%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
index 39a4a769cf..098dd80a0b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
@@ -30,41 +30,82 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.put_settings.Response
 
 @JsonpDeserializable
-public class PutIndicesSettingsResponse extends AcknowledgedResponseBase {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PutIndicesSettingsResponse extends AcknowledgedResponseBase
+    implements
+        ToCopyableBuilder<PutIndicesSettingsResponse.Builder, PutIndicesSettingsResponse> {
+
     // ---------------------------------------------------------------------------------------------
 
     private PutIndicesSettingsResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static PutIndicesSettingsResponse of(Function<Builder, ObjectBuilder<PutIndicesSettingsResponse>> fn) {
+    public static PutIndicesSettingsResponse of(
+        Function<PutIndicesSettingsResponse.Builder, ObjectBuilder<PutIndicesSettingsResponse>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link PutIndicesSettingsResponse}.
      */
-
     public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
         implements
-            ObjectBuilder<PutIndicesSettingsResponse> {
+            CopyableBuilder<Builder, PutIndicesSettingsResponse> {
+
+        public Builder() {}
+
+        private Builder(PutIndicesSettingsResponse o) {
+            super(o);
+        }
+
+        private Builder(Builder o) {
+            super(o);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -72,9 +113,10 @@ protected Builder self() {
         /**
          * Builds a {@link PutIndicesSettingsResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public PutIndicesSettingsResponse build() {
             _checkSingleUse();
 
@@ -93,8 +135,22 @@ public PutIndicesSettingsResponse build() {
     );
 
     protected static void setupPutIndicesSettingsResponseDeserializer(ObjectDeserializer<PutIndicesSettingsResponse.Builder> op) {
-        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        setupAcknowledgedResponseBaseDeserializer(op);
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
similarity index 67%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
index 98229cf9a8..f5d9b4ada3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
@@ -30,14 +30,21 @@
  * 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.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.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -59,30 +66,28 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.put_mapping.Request
 
 /**
  * Updates the index mappings.
- *
  */
 @JsonpDeserializable
-public class PutMappingRequest extends RequestBase implements PlainJsonSerializable {
-    @Nullable
-    private final FieldNamesField fieldNames;
-
-    private final Map<String, JsonData> meta;
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PutMappingRequest extends RequestBase
+    implements
+        PlainJsonSerializable,
+        ToCopyableBuilder<PutMappingRequest.Builder, PutMappingRequest> {
 
     @Nullable
-    private final RoutingField routing;
-
-    @Nullable
-    private final SourceField source;
+    private final Boolean allowNoIndices;
 
     @Nullable
-    private final Boolean allowNoIndices;
+    private final Time clusterManagerTimeout;
 
     @Nullable
     private final Boolean dateDetection;
@@ -90,29 +95,43 @@ public class PutMappingRequest extends RequestBase implements PlainJsonSerializa
     @Nullable
     private final DynamicMapping dynamic;
 
+    @Nonnull
     private final List<String> dynamicDateFormats;
 
+    @Nonnull
     private final List<Map<String, DynamicTemplate>> dynamicTemplates;
 
+    @Nonnull
     private final List<ExpandWildcard> expandWildcards;
 
+    @Nullable
+    private final FieldNamesField fieldNames;
+
     @Nullable
     private final Boolean ignoreUnavailable;
 
+    @Nonnull
     private final List<String> index;
 
     @Deprecated
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
+    @Nonnull
+    private final Map<String, JsonData> meta;
 
     @Nullable
     private final Boolean numericDetection;
 
+    @Nonnull
     private final Map<String, Property> properties;
 
+    @Nullable
+    private final RoutingField routing;
+
+    @Nullable
+    private final SourceField source;
+
     @Nullable
     private final Time timeout;
 
@@ -122,89 +141,58 @@ public class PutMappingRequest extends RequestBase implements PlainJsonSerializa
     // ---------------------------------------------------------------------------------------------
 
     private PutMappingRequest(Builder builder) {
-
-        this.fieldNames = builder.fieldNames;
-        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-        this.routing = builder.routing;
-        this.source = builder.source;
         this.allowNoIndices = builder.allowNoIndices;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.dateDetection = builder.dateDetection;
         this.dynamic = builder.dynamic;
         this.dynamicDateFormats = ApiTypeHelper.unmodifiable(builder.dynamicDateFormats);
         this.dynamicTemplates = ApiTypeHelper.unmodifiable(builder.dynamicTemplates);
         this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.fieldNames = builder.fieldNames;
         this.ignoreUnavailable = builder.ignoreUnavailable;
         this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
         this.numericDetection = builder.numericDetection;
         this.properties = ApiTypeHelper.unmodifiable(builder.properties);
+        this.routing = builder.routing;
+        this.source = builder.source;
         this.timeout = builder.timeout;
         this.writeIndexOnly = builder.writeIndexOnly;
-
     }
 
-    public static PutMappingRequest of(Function<Builder, ObjectBuilder<PutMappingRequest>> fn) {
+    public static PutMappingRequest of(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Control whether field names are enabled for the index.
+     * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets only
+     * missing or closed indexes. This behavior applies even if the request targets other open indexes.
      * <p>
-     * API name: {@code _field_names}
-     */
-    @Nullable
-    public final FieldNamesField fieldNames() {
-        return this.fieldNames;
-    }
-
-    /**
-     * A mapping type can have custom meta data associated with it. These are not
-     * used at all by OpenSearch, but can be used to store application-specific
-     * metadata.
-     * <p>
-     * API name: {@code _meta}
-     */
-    public final Map<String, JsonData> meta() {
-        return this.meta;
-    }
-
-    /**
-     * Enable making a routing value required on indexed documents.
-     * <p>
-     * API name: {@code _routing}
-     */
-    @Nullable
-    public final RoutingField routing() {
-        return this.routing;
-    }
-
-    /**
-     * Control whether the _source field is enabled on the index.
-     * <p>
-     * API name: {@code _source}
+     * API name: {@code allow_no_indices}
+     * </p>
      */
     @Nullable
-    public final SourceField source() {
-        return this.source;
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
     }
 
     /**
-     * Whether to ignore if a wildcard indices expression resolves into no concrete
-     * indices. (This includes <code>_all</code> string or when no indices have been
-     * specified)
+     * Operation timeout for connection to cluster-manager node.
      * <p>
-     * API name: {@code allow_no_indices}
+     * API name: {@code cluster_manager_timeout}
+     * </p>
      */
     @Nullable
-    public final Boolean allowNoIndices() {
-        return this.allowNoIndices;
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
     }
 
     /**
      * Controls whether dynamic date detection is enabled.
      * <p>
      * API name: {@code date_detection}
+     * </p>
      */
     @Nullable
     public final Boolean dateDetection() {
@@ -212,8 +200,6 @@ public final Boolean dateDetection() {
     }
 
     /**
-     * Controls whether new fields are added dynamically.
-     * <p>
      * API name: {@code dynamic}
      */
     @Nullable
@@ -222,12 +208,13 @@ public final DynamicMapping dynamic() {
     }
 
     /**
-     * If date detection is enabled then new string fields are checked against
-     * 'dynamic_date_formats' and if the value matches then a new date field is
-     * added instead of string.
+     * If date detection is enabled then new string fields are checked against <code>dynamic_date_formats</code> and if the value matches
+     * then a new date field is added instead of string.
      * <p>
      * API name: {@code dynamic_date_formats}
+     * </p>
      */
+    @Nonnull
     public final List<String> dynamicDateFormats() {
         return this.dynamicDateFormats;
     }
@@ -236,26 +223,39 @@ public final List<String> dynamicDateFormats() {
      * Specify dynamic templates for the mapping.
      * <p>
      * API name: {@code dynamic_templates}
+     * </p>
      */
+    @Nonnull
     public final List<Map<String, DynamicTemplate>> dynamicTemplates() {
         return this.dynamicTemplates;
     }
 
     /**
-     * Whether to expand wildcard expression to concrete indices that are open,
-     * closed or both.
+     * Type of index that wildcard patterns 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 <code>open,hidden</code>. Valid values are:
+     * <code>all</code>, <code>open</code>, <code>closed</code>, <code>hidden</code>, <code>none</code>.
      * <p>
      * API name: {@code expand_wildcards}
+     * </p>
      */
+    @Nonnull
     public final List<ExpandWildcard> expandWildcards() {
         return this.expandWildcards;
     }
 
     /**
-     * Whether specified concrete indices should be ignored when unavailable
-     * (missing or closed)
+     * API name: {@code _field_names}
+     */
+    @Nullable
+    public final FieldNamesField fieldNames() {
+        return this.fieldNames;
+    }
+
+    /**
+     * If <code>false</code>, the request returns an error if it targets a missing or closed index.
      * <p>
      * API name: {@code ignore_unavailable}
+     * </p>
      */
     @Nullable
     public final Boolean ignoreUnavailable() {
@@ -263,20 +263,23 @@ public final Boolean ignoreUnavailable() {
     }
 
     /**
-     * Required - A comma-separated list of index names the mapping should be added
-     * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
-     * all indices.
+     * Required - A comma-separated list of index names the mapping should be added to (supports wildcards); use <code>_all</code> or omit
+     * to add the mapping on all indexes.
      * <p>
      * API name: {@code index}
+     * </p>
      */
+    @Nonnull
     public final List<String> index() {
         return this.index;
     }
 
     /**
-     * Specify timeout for connection to master
+     * 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 master_timeout}
+     * </p>
      */
     @Deprecated
     @Nullable
@@ -285,19 +288,18 @@ public final Time masterTimeout() {
     }
 
     /**
-     * Specify timeout for connection to cluster-manager
-     * <p>
-     * API name: {@code cluster_manager_timeout}
+     * API name: {@code _meta}
      */
-    @Nullable
-    public final Time clusterManagerTimeout() {
-        return this.clusterManagerTimeout;
+    @Nonnull
+    public final Map<String, JsonData> meta() {
+        return this.meta;
     }
 
     /**
      * Automatically map strings into numeric data types for all fields.
      * <p>
      * API name: {@code numeric_detection}
+     * </p>
      */
     @Nullable
     public final Boolean numericDetection() {
@@ -305,7 +307,9 @@ public final Boolean numericDetection() {
     }
 
     /**
+     * <p>
      * Mapping for a field. For new fields, this mapping can include:
+     * </p>
      * <ul>
      * <li>Field name</li>
      * <li>Field data type</li>
@@ -313,15 +317,34 @@ public final Boolean numericDetection() {
      * </ul>
      * <p>
      * API name: {@code properties}
+     * </p>
      */
+    @Nonnull
     public final Map<String, Property> properties() {
         return this.properties;
     }
 
     /**
-     * Explicit operation timeout
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final RoutingField routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceField source() {
+        return this.source;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
      * <p>
      * API name: {@code timeout}
+     * </p>
      */
     @Nullable
     public final Time timeout() {
@@ -329,10 +352,10 @@ public final Time timeout() {
     }
 
     /**
-     * When true, applies mappings only to the write index of an alias or data
-     * stream
+     * If <code>true</code>, the mappings are applied only to the current write index for the target.
      * <p>
      * API name: {@code write_index_only}
+     * </p>
      */
     @Nullable
     public final Boolean writeIndexOnly() {
@@ -342,6 +365,7 @@ public final Boolean writeIndexOnly() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -349,52 +373,25 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-        if (this.fieldNames != null) {
-            generator.writeKey("_field_names");
-            this.fieldNames.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.routing != null) {
-            generator.writeKey("_routing");
-            this.routing.serialize(generator, mapper);
-
-        }
-        if (this.source != null) {
-            generator.writeKey("_source");
-            this.source.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();
@@ -404,234 +401,242 @@ 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.fieldNames != null) {
+            generator.writeKey("_field_names");
+            this.fieldNames.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.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+        }
+    }
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link PutMappingRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutMappingRequest> {
-        @Nullable
-        private FieldNamesField fieldNames;
-
-        @Nullable
-        private Map<String, JsonData> meta;
-
-        @Nullable
-        private RoutingField routing;
-
-        @Nullable
-        private SourceField source;
-
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, PutMappingRequest> {
         @Nullable
         private Boolean allowNoIndices;
-
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private Boolean dateDetection;
-
         @Nullable
         private DynamicMapping dynamic;
-
         @Nullable
         private List<String> dynamicDateFormats;
-
         @Nullable
         private List<Map<String, DynamicTemplate>> dynamicTemplates;
-
         @Nullable
         private List<ExpandWildcard> expandWildcards;
-
+        @Nullable
+        private FieldNamesField fieldNames;
         @Nullable
         private Boolean ignoreUnavailable;
-
         private List<String> index;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
-
         @Nullable
-        private Time clusterManagerTimeout;
-
+        private Map<String, JsonData> meta;
         @Nullable
         private Boolean numericDetection;
-
         @Nullable
         private Map<String, Property> properties;
-
+        @Nullable
+        private RoutingField routing;
+        @Nullable
+        private SourceField source;
         @Nullable
         private Time timeout;
-
         @Nullable
         private Boolean writeIndexOnly;
 
-        /**
-         * Control whether field names are enabled for the index.
-         * <p>
-         * API name: {@code _field_names}
-         */
-        public final Builder fieldNames(@Nullable FieldNamesField value) {
-            this.fieldNames = value;
-            return this;
+        public Builder() {}
+
+        private Builder(PutMappingRequest o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.dateDetection = o.dateDetection;
+            this.dynamic = o.dynamic;
+            this.dynamicDateFormats = _listCopy(o.dynamicDateFormats);
+            this.dynamicTemplates = _listCopy(o.dynamicTemplates);
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.fieldNames = o.fieldNames;
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.index = _listCopy(o.index);
+            this.masterTimeout = o.masterTimeout;
+            this.meta = _mapCopy(o.meta);
+            this.numericDetection = o.numericDetection;
+            this.properties = _mapCopy(o.properties);
+            this.routing = o.routing;
+            this.source = o.source;
+            this.timeout = o.timeout;
+            this.writeIndexOnly = o.writeIndexOnly;
         }
 
-        /**
-         * Control whether field names are enabled for the index.
-         * <p>
-         * API name: {@code _field_names}
-         */
-        public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
-            return this.fieldNames(fn.apply(new FieldNamesField.Builder()).build());
+        private Builder(Builder o) {
+            this.allowNoIndices = o.allowNoIndices;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.dateDetection = o.dateDetection;
+            this.dynamic = o.dynamic;
+            this.dynamicDateFormats = _listCopy(o.dynamicDateFormats);
+            this.dynamicTemplates = _listCopy(o.dynamicTemplates);
+            this.expandWildcards = _listCopy(o.expandWildcards);
+            this.fieldNames = o.fieldNames;
+            this.ignoreUnavailable = o.ignoreUnavailable;
+            this.index = _listCopy(o.index);
+            this.masterTimeout = o.masterTimeout;
+            this.meta = _mapCopy(o.meta);
+            this.numericDetection = o.numericDetection;
+            this.properties = _mapCopy(o.properties);
+            this.routing = o.routing;
+            this.source = o.source;
+            this.timeout = o.timeout;
+            this.writeIndexOnly = o.writeIndexOnly;
         }
 
-        /**
-         * A mapping type can have custom meta data associated with it. These are not
-         * used at all by OpenSearch, but can be used to store application-specific
-         * metadata.
-         * <p>
-         * API name: {@code _meta}
-         * <p>
-         * Adds all entries of <code>map</code> to <code>meta</code>.
-         */
-        public final Builder meta(Map<String, JsonData> map) {
-            this.meta = _mapPutAll(this.meta, map);
-            return this;
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
         }
 
         /**
-         * A mapping type can have custom meta data associated with it. These are not
-         * used at all by OpenSearch, but can be used to store application-specific
-         * metadata.
-         * <p>
-         * API name: {@code _meta}
+         * If <code>false</code>, the request returns an error if any wildcard expression, index alias, or <code>_all</code> value targets
+         * only missing or closed indexes. This behavior applies even if the request targets other open indexes.
          * <p>
-         * Adds an entry to <code>meta</code>.
-         */
-        public final Builder meta(String key, JsonData value) {
-            this.meta = _mapPut(this.meta, key, value);
-            return this;
-        }
-
-        /**
-         * Enable making a routing value required on indexed documents.
-         * <p>
-         * API name: {@code _routing}
+         * API name: {@code allow_no_indices}
+         * </p>
          */
-        public final Builder routing(@Nullable RoutingField value) {
-            this.routing = value;
+        @Nonnull
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
             return this;
         }
 
         /**
-         * Enable making a routing value required on indexed documents.
-         * <p>
-         * API name: {@code _routing}
-         */
-        public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
-            return this.routing(fn.apply(new RoutingField.Builder()).build());
-        }
-
-        /**
-         * Control whether the _source field is enabled on the index.
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code _source}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        public final Builder source(@Nullable SourceField value) {
-            this.source = value;
+        @Nonnull
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
             return this;
         }
 
         /**
-         * Control whether the _source field is enabled on the index.
-         * <p>
-         * API name: {@code _source}
-         */
-        public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
-            return this.source(fn.apply(new SourceField.Builder()).build());
-        }
-
-        /**
-         * Whether to ignore if a wildcard indices expression resolves into no concrete
-         * indices. (This includes <code>_all</code> string or when no indices have been
-         * specified)
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code allow_no_indices}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        public final Builder allowNoIndices(@Nullable Boolean value) {
-            this.allowNoIndices = value;
-            return this;
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
          * Controls whether dynamic date detection is enabled.
          * <p>
          * API name: {@code date_detection}
+         * </p>
          */
+        @Nonnull
         public final Builder dateDetection(@Nullable Boolean value) {
             this.dateDetection = value;
             return this;
         }
 
         /**
-         * Controls whether new fields are added dynamically.
-         * <p>
          * API name: {@code dynamic}
          */
+        @Nonnull
         public final Builder dynamic(@Nullable DynamicMapping value) {
             this.dynamic = value;
             return this;
         }
 
         /**
-         * If date detection is enabled then new string fields are checked against
-         * 'dynamic_date_formats' and if the value matches then a new date field is
-         * added instead of string.
+         * If date detection is enabled then new string fields are checked against <code>dynamic_date_formats</code> and if the value
+         * matches then a new date field is added instead of string.
          * <p>
          * API name: {@code dynamic_date_formats}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>dynamicDateFormats</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder dynamicDateFormats(List<String> list) {
             this.dynamicDateFormats = _listAddAll(this.dynamicDateFormats, list);
             return this;
         }
 
         /**
-         * If date detection is enabled then new string fields are checked against
-         * 'dynamic_date_formats' and if the value matches then a new date field is
-         * added instead of string.
+         * If date detection is enabled then new string fields are checked against <code>dynamic_date_formats</code> and if the value
+         * matches then a new date field is added instead of string.
          * <p>
          * API name: {@code dynamic_date_formats}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>dynamicDateFormats</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder dynamicDateFormats(String value, String... values) {
             this.dynamicDateFormats = _listAdd(this.dynamicDateFormats, value, values);
             return this;
@@ -641,9 +646,13 @@ public final Builder dynamicDateFormats(String value, String... values) {
          * Specify dynamic templates for the mapping.
          * <p>
          * API name: {@code dynamic_templates}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>dynamicTemplates</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
             this.dynamicTemplates = _listAddAll(this.dynamicTemplates, list);
             return this;
@@ -653,131 +662,186 @@ public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
          * Specify dynamic templates for the mapping.
          * <p>
          * API name: {@code dynamic_templates}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>dynamicTemplates</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder dynamicTemplates(Map<String, DynamicTemplate> value, Map<String, DynamicTemplate>... values) {
             this.dynamicTemplates = _listAdd(this.dynamicTemplates, value, values);
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>. Valid values are:
+         * <code>all</code>, <code>open</code>, <code>closed</code>, <code>hidden</code>, <code>none</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(List<ExpandWildcard> list) {
             this.expandWildcards = _listAddAll(this.expandWildcards, list);
             return this;
         }
 
         /**
-         * Whether to expand wildcard expression to concrete indices that are open,
-         * closed or both.
+         * Type of index that wildcard patterns 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 <code>open,hidden</code>. Valid values are:
+         * <code>all</code>, <code>open</code>, <code>closed</code>, <code>hidden</code>, <code>none</code>.
          * <p>
          * API name: {@code expand_wildcards}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>expandWildcards</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
             this.expandWildcards = _listAdd(this.expandWildcards, value, values);
             return this;
         }
 
         /**
-         * Whether specified concrete indices should be ignored when unavailable
-         * (missing or closed)
+         * API name: {@code _field_names}
+         */
+        @Nonnull
+        public final Builder fieldNames(@Nullable FieldNamesField value) {
+            this.fieldNames = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _field_names}
+         */
+        @Nonnull
+        public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
+            return fieldNames(fn.apply(new FieldNamesField.Builder()).build());
+        }
+
+        /**
+         * If <code>false</code>, the request returns an error if it targets a missing or closed index.
          * <p>
          * API name: {@code ignore_unavailable}
+         * </p>
          */
+        @Nonnull
         public final Builder ignoreUnavailable(@Nullable Boolean value) {
             this.ignoreUnavailable = value;
             return this;
         }
 
         /**
-         * Required - A comma-separated list of index names the mapping should be added
-         * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
-         * all indices.
+         * Required - A comma-separated list of index names the mapping should be added to (supports wildcards); use <code>_all</code> or
+         * omit to add the mapping on all indexes.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(List<String> list) {
             this.index = _listAddAll(this.index, list);
             return this;
         }
 
         /**
-         * Required - A comma-separated list of index names the mapping should be added
-         * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
-         * all indices.
+         * Required - A comma-separated list of index names the mapping should be added to (supports wildcards); use <code>_all</code> or
+         * omit to add the mapping on all indexes.
          * <p>
          * API name: {@code index}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>index</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder index(String value, String... values) {
             this.index = _listAdd(this.index, value, values);
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * Specify timeout for connection to master
+         * 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 master_timeout}
+         * </p>
          */
         @Deprecated
+        @Nonnull
         public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
+         * API name: {@code _meta}
+         *
          * <p>
-         * API name: {@code cluster_manager_timeout}
+         * Adds all elements of <code>map</code> to <code>meta</code>.
+         * </p>
          */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
+        @Nonnull
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
             return this;
         }
 
         /**
-         * Specify timeout for connection to cluster-manager
+         * API name: {@code _meta}
+         *
          * <p>
-         * API name: {@code cluster_manager_timeout}
+         * Adds an entry to <code>meta</code>.
+         * </p>
          */
-        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        @Nonnull
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
         }
 
         /**
          * Automatically map strings into numeric data types for all fields.
          * <p>
          * API name: {@code numeric_detection}
+         * </p>
          */
+        @Nonnull
         public final Builder numericDetection(@Nullable Boolean value) {
             this.numericDetection = value;
             return this;
         }
 
         /**
+         * <p>
          * Mapping for a field. For new fields, this mapping can include:
+         * </p>
          * <ul>
          * <li>Field name</li>
          * <li>Field data type</li>
@@ -785,16 +849,22 @@ public final Builder numericDetection(@Nullable Boolean value) {
          * </ul>
          * <p>
          * API name: {@code properties}
+         * </p>
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>properties</code>.
+         * Adds all elements of <code>map</code> to <code>properties</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder properties(Map<String, Property> map) {
             this.properties = _mapPutAll(this.properties, map);
             return this;
         }
 
         /**
+         * <p>
          * Mapping for a field. For new fields, this mapping can include:
+         * </p>
          * <ul>
          * <li>Field name</li>
          * <li>Field data type</li>
@@ -802,16 +872,22 @@ public final Builder properties(Map<String, Property> map) {
          * </ul>
          * <p>
          * API name: {@code properties}
+         * </p>
+         *
          * <p>
          * Adds an entry to <code>properties</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder properties(String key, Property value) {
             this.properties = _mapPut(this.properties, key, value);
             return this;
         }
 
         /**
+         * <p>
          * Mapping for a field. For new fields, this mapping can include:
+         * </p>
          * <ul>
          * <li>Field name</li>
          * <li>Field data type</li>
@@ -819,38 +895,81 @@ public final Builder properties(String key, Property value) {
          * </ul>
          * <p>
          * API name: {@code properties}
+         * </p>
+         *
          * <p>
-         * Adds an entry to <code>properties</code> using a builder lambda.
+         * Adds a value to <code>properties</code> using a builder lambda.
+         * </p>
          */
+        @Nonnull
         public final Builder properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
             return properties(key, fn.apply(new Property.Builder()).build());
         }
 
         /**
-         * Explicit operation timeout
+         * API name: {@code _routing}
+         */
+        @Nonnull
+        public final Builder routing(@Nullable RoutingField value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        @Nonnull
+        public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
+            return routing(fn.apply(new RoutingField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        @Nonnull
+        public final Builder source(@Nullable SourceField value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        @Nonnull
+        public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
+            return source(fn.apply(new SourceField.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
          * <p>
          * API name: {@code timeout}
+         * </p>
          */
+        @Nonnull
         public final Builder timeout(@Nullable Time value) {
             this.timeout = value;
             return this;
         }
 
         /**
-         * Explicit operation timeout
+         * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
          * <p>
          * API name: {@code timeout}
+         * </p>
          */
+        @Nonnull
         public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.timeout(fn.apply(new Time.Builder()).build());
+            return timeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * When true, applies mappings only to the write index of an alias or data
-         * stream
+         * If <code>true</code>, the mappings are applied only to the current write index for the target.
          * <p>
          * API name: {@code write_index_only}
+         * </p>
          */
+        @Nonnull
         public final Builder writeIndexOnly(@Nullable Boolean value) {
             this.writeIndexOnly = value;
             return this;
@@ -859,9 +978,10 @@ public final Builder writeIndexOnly(@Nullable Boolean value) {
         /**
          * Builds a {@link PutMappingRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public PutMappingRequest build() {
             _checkSingleUse();
 
@@ -880,11 +1000,6 @@ public PutMappingRequest build() {
     );
 
     protected static void setupPutMappingRequestDeserializer(ObjectDeserializer<PutMappingRequest.Builder> op) {
-
-        op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
-        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-        op.add(Builder::routing, RoutingField._DESERIALIZER, "_routing");
-        op.add(Builder::source, SourceField._DESERIALIZER, "_source");
         op.add(Builder::dateDetection, JsonpDeserializer.booleanDeserializer(), "date_detection");
         op.add(Builder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
         op.add(
@@ -897,8 +1012,13 @@ protected static void setupPutMappingRequestDeserializer(ObjectDeserializer<PutM
             JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(DynamicTemplate._DESERIALIZER)),
             "dynamic_templates"
         );
+        op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
+        op.add(Builder::index, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index");
+        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::source, SourceField._DESERIALIZER, "_source");
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -907,44 +1027,21 @@ protected static void setupPutMappingRequestDeserializer(ObjectDeserializer<PutM
      * Endpoint "{@code indices.put_mapping}".
      */
     public static final Endpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "PUT";
-
-        },
-
+        request -> "PUT",
         // 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);
-                buf.append("/_mapping");
-                return buf.toString();
-            }
-            if (propsSet == (_index)) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                buf.append("/_mappings");
-                return buf.toString();
-            }
-            throw SimpleEndpoint.noPathTemplateFound("path");
-
+            StringBuilder buf = new StringBuilder();
+            buf.append("/");
+            SimpleEndpoint.pathEncode(String.join(",", request.index), buf);
+            buf.append("/_mapping");
+            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());
@@ -955,20 +1052,68 @@ protected static void setupPutMappingRequestDeserializer(ObjectDeserializer<PutM
             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.writeIndexOnly != null) {
-                params.put("write_index_only", String.valueOf(request.writeIndexOnly));
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
             }
             if (request.timeout != null) {
                 params.put("timeout", request.timeout._toJsonString());
             }
+            if (request.writeIndexOnly != null) {
+                params.put("write_index_only", String.valueOf(request.writeIndexOnly));
+            }
             return params;
-
         },
         SimpleEndpoint.emptyMap(),
         true,
         PutMappingResponse._DESERIALIZER
     );
+
+    @Override
+    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.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.expandWildcards);
+        result = 31 * result + Objects.hashCode(this.fieldNames);
+        result = 31 * result + Objects.hashCode(this.ignoreUnavailable);
+        result = 31 * result + this.index.hashCode();
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        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.source);
+        result = 31 * result + Objects.hashCode(this.timeout);
+        result = 31 * result + Objects.hashCode(this.writeIndexOnly);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PutMappingRequest other = (PutMappingRequest) o;
+        return Objects.equals(this.allowNoIndices, other.allowNoIndices)
+            && Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && 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.expandWildcards, other.expandWildcards)
+            && Objects.equals(this.fieldNames, other.fieldNames)
+            && Objects.equals(this.ignoreUnavailable, other.ignoreUnavailable)
+            && this.index.equals(other.index)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && 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.source, other.source)
+            && Objects.equals(this.timeout, other.timeout)
+            && Objects.equals(this.writeIndexOnly, other.writeIndexOnly);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
similarity index 61%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
index 87dbdba7ce..1ef0f2f4ca 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
@@ -30,39 +30,78 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.IndicesResponseBase;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.put_mapping.Response
 
 @JsonpDeserializable
-public class PutMappingResponse extends IndicesResponseBase {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PutMappingResponse extends IndicesResponseBase implements ToCopyableBuilder<PutMappingResponse.Builder, PutMappingResponse> {
+
     // ---------------------------------------------------------------------------------------------
 
     private PutMappingResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static PutMappingResponse of(Function<Builder, ObjectBuilder<PutMappingResponse>> fn) {
+    public static PutMappingResponse of(Function<PutMappingResponse.Builder, ObjectBuilder<PutMappingResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link PutMappingResponse}.
      */
+    public static class Builder extends IndicesResponseBase.AbstractBuilder<Builder>
+        implements
+            CopyableBuilder<Builder, PutMappingResponse> {
+
+        public Builder() {}
+
+        private Builder(PutMappingResponse o) {
+            super(o);
+        }
+
+        private Builder(Builder o) {
+            super(o);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
-    public static class Builder extends IndicesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutMappingResponse> {
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -70,9 +109,10 @@ protected Builder self() {
         /**
          * Builds a {@link PutMappingResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public PutMappingResponse build() {
             _checkSingleUse();
 
@@ -91,8 +131,22 @@ public PutMappingResponse build() {
     );
 
     protected static void setupPutMappingResponseDeserializer(ObjectDeserializer<PutMappingResponse.Builder> op) {
-        IndicesResponseBase.setupIndicesResponseBaseDeserializer(op);
+        setupIndicesResponseBaseDeserializer(op);
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
similarity index 70%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
index 408cdd58bc..020823bc03 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.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 jakarta.json.stream.JsonGenerator;
 import java.util.HashMap;
 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,25 +59,33 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.put_template.Request
 
 /**
  * Creates or updates an index template.
- *
  */
 @JsonpDeserializable
-public class PutTemplateRequest extends RequestBase implements PlainJsonSerializable {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PutTemplateRequest extends RequestBase
+    implements
+        PlainJsonSerializable,
+        ToCopyableBuilder<PutTemplateRequest.Builder, PutTemplateRequest> {
+
+    @Nonnull
     private final Map<String, Alias> aliases;
 
     @Nullable
-    private final Boolean create;
+    private final Time clusterManagerTimeout;
 
     @Nullable
-    private final Boolean flatSettings;
+    private final Boolean create;
 
+    @Nonnull
     private final List<String> indexPatterns;
 
     @Nullable
@@ -80,42 +95,34 @@ public class PutTemplateRequest extends RequestBase implements PlainJsonSerializ
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
+    @Nonnull
     private final String name;
 
     @Nullable
     private final Integer order;
 
+    @Nonnull
     private final Map<String, JsonData> settings;
 
-    @Nullable
-    private final Time timeout;
-
     @Nullable
     private final Long version;
 
     // ---------------------------------------------------------------------------------------------
 
     private PutTemplateRequest(Builder builder) {
-
         this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.create = builder.create;
-        this.flatSettings = builder.flatSettings;
         this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
         this.mappings = builder.mappings;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
         this.order = builder.order;
         this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-        this.timeout = builder.timeout;
         this.version = builder.version;
-
     }
 
-    public static PutTemplateRequest of(Function<Builder, ObjectBuilder<PutTemplateRequest>> fn) {
+    public static PutTemplateRequest of(Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -123,42 +130,47 @@ public static PutTemplateRequest of(Function<Builder, ObjectBuilder<PutTemplateR
      * Aliases for the index.
      * <p>
      * API name: {@code aliases}
+     * </p>
      */
+    @Nonnull
     public final Map<String, Alias> aliases() {
         return this.aliases;
     }
 
     /**
-     * If true, this request cannot replace or update existing index templates.
+     * Operation timeout for connection to cluster-manager node.
      * <p>
-     * API name: {@code create}
+     * API name: {@code cluster_manager_timeout}
+     * </p>
      */
     @Nullable
-    public final Boolean create() {
-        return this.create;
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
     }
 
     /**
-     * API name: {@code flat_settings}
+     * If <code>true</code>, this request cannot replace or update existing index templates.
+     * <p>
+     * API name: {@code create}
+     * </p>
      */
     @Nullable
-    public final Boolean flatSettings() {
-        return this.flatSettings;
+    public final Boolean create() {
+        return this.create;
     }
 
     /**
-     * Array of wildcard expressions used to match the names of indices during
-     * creation.
+     * Array of wildcard expressions used to match the names of indexes during creation.
      * <p>
      * API name: {@code index_patterns}
+     * </p>
      */
+    @Nonnull
     public final List<String> indexPatterns() {
         return this.indexPatterns;
     }
 
     /**
-     * Mapping for fields in the index.
-     * <p>
      * API name: {@code mappings}
      */
     @Nullable
@@ -167,10 +179,11 @@ public final TypeMapping mappings() {
     }
 
     /**
-     * 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 cluster-manager 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
@@ -178,34 +191,28 @@ 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;
-    }
-
     /**
      * Required - The name of the template
      * <p>
      * API name: {@code name}
+     * </p>
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
 
     /**
-     * Order in which OpenSearch applies this template if index matches multiple
-     * templates.
      * <p>
-     * Templates with lower 'order' values are merged first. Templates with higher
-     * 'order' values are merged later, overriding templates with lower values.
+     * Order in which OpenSearch applies this template if index matches multiple templates.
+     * </p>
+     * <p>
+     * Templates with lower 'order' values are merged first. Templates with higher 'order' values are merged later, overriding templates
+     * with lower values.
+     * </p>
      * <p>
      * API name: {@code order}
+     * </p>
      */
     @Nullable
     public final Integer order() {
@@ -216,23 +223,14 @@ public final Integer order() {
      * Configuration options for the index.
      * <p>
      * API name: {@code settings}
+     * </p>
      */
+    @Nonnull
     public final Map<String, JsonData> settings() {
         return this.settings;
     }
 
     /**
-     * API name: {@code timeout}
-     */
-    @Nullable
-    public final Time timeout() {
-        return this.timeout;
-    }
-
-    /**
-     * Version number used to manage index templates externally. This number is not
-     * automatically generated by OpenSearch.
-     * <p>
      * API name: {@code version}
      */
     @Nullable
@@ -243,6 +241,7 @@ public final Long version() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -250,107 +249,132 @@ 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 (ApiTypeHelper.isDefined(this.indexPatterns)) {
             generator.writeKey("index_patterns");
             generator.writeStartArray();
             for (String item0 : this.indexPatterns) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.mappings != null) {
             generator.writeKey("mappings");
             this.mappings.serialize(generator, mapper);
-
         }
+
         if (this.order != null) {
             generator.writeKey("order");
             generator.write(this.order);
-
         }
+
         if (ApiTypeHelper.isDefined(this.settings)) {
             generator.writeKey("settings");
             generator.writeStartObject();
             for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.version != null) {
             generator.writeKey("version");
             generator.write(this.version);
-
         }
+    }
+    // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
     }
 
-    // ---------------------------------------------------------------------------------------------
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
 
     /**
      * Builder for {@link PutTemplateRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutTemplateRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, PutTemplateRequest> {
         @Nullable
         private Map<String, Alias> aliases;
-
         @Nullable
-        private Boolean create;
-
+        private Time clusterManagerTimeout;
         @Nullable
-        private Boolean flatSettings;
-
+        private Boolean create;
         @Nullable
         private List<String> indexPatterns;
-
         @Nullable
         private TypeMapping mappings;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
-
-        @Nullable
-        private Time clusterManagerTimeout;
-
         private String name;
-
         @Nullable
         private Integer order;
-
         @Nullable
         private Map<String, JsonData> settings;
-
-        @Nullable
-        private Time timeout;
-
         @Nullable
         private Long version;
 
+        public Builder() {}
+
+        private Builder(PutTemplateRequest o) {
+            this.aliases = _mapCopy(o.aliases);
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.create = o.create;
+            this.indexPatterns = _listCopy(o.indexPatterns);
+            this.mappings = o.mappings;
+            this.masterTimeout = o.masterTimeout;
+            this.name = o.name;
+            this.order = o.order;
+            this.settings = _mapCopy(o.settings);
+            this.version = o.version;
+        }
+
+        private Builder(Builder o) {
+            this.aliases = _mapCopy(o.aliases);
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.create = o.create;
+            this.indexPatterns = _listCopy(o.indexPatterns);
+            this.mappings = o.mappings;
+            this.masterTimeout = o.masterTimeout;
+            this.name = o.name;
+            this.order = o.order;
+            this.settings = _mapCopy(o.settings);
+            this.version = o.version;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         /**
          * Aliases for the index.
          * <p>
          * API name: {@code aliases}
+         * </p>
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         * Adds all elements of <code>map</code> to <code>aliases</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder aliases(Map<String, Alias> map) {
             this.aliases = _mapPutAll(this.aliases, map);
             return this;
@@ -360,9 +384,13 @@ public final Builder aliases(Map<String, Alias> map) {
          * Aliases for the index.
          * <p>
          * API name: {@code aliases}
+         * </p>
+         *
          * <p>
          * Adds an entry to <code>aliases</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder aliases(String key, Alias value) {
             this.aliases = _mapPut(this.aliases, key, value);
             return this;
@@ -372,139 +400,153 @@ public final Builder aliases(String key, Alias value) {
          * Aliases for the index.
          * <p>
          * API name: {@code aliases}
+         * </p>
+         *
          * <p>
-         * Adds an entry to <code>aliases</code> using a builder lambda.
+         * Adds a value to <code>aliases</code> using a builder lambda.
+         * </p>
          */
+        @Nonnull
         public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
             return aliases(key, fn.apply(new Alias.Builder()).build());
         }
 
         /**
-         * If true, this request cannot replace or update existing index templates.
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code create}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        public final Builder create(@Nullable Boolean value) {
-            this.create = value;
+        @Nonnull
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
             return this;
         }
 
         /**
-         * API name: {@code flat_settings}
+         * Operation timeout for connection to cluster-manager node.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        public final Builder flatSettings(@Nullable Boolean value) {
-            this.flatSettings = value;
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * If <code>true</code>, this request cannot replace or update existing index templates.
+         * <p>
+         * API name: {@code create}
+         * </p>
+         */
+        @Nonnull
+        public final Builder create(@Nullable Boolean value) {
+            this.create = value;
             return this;
         }
 
         /**
-         * Array of wildcard expressions used to match the names of indices during
-         * creation.
+         * Array of wildcard expressions used to match the names of indexes during creation.
          * <p>
          * API name: {@code index_patterns}
+         * </p>
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder indexPatterns(List<String> list) {
             this.indexPatterns = _listAddAll(this.indexPatterns, list);
             return this;
         }
 
         /**
-         * Array of wildcard expressions used to match the names of indices during
-         * creation.
+         * Array of wildcard expressions used to match the names of indexes during creation.
          * <p>
          * API name: {@code index_patterns}
+         * </p>
+         *
          * <p>
          * Adds one or more values to <code>indexPatterns</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder indexPatterns(String value, String... values) {
             this.indexPatterns = _listAdd(this.indexPatterns, value, values);
             return this;
         }
 
         /**
-         * Mapping for fields in the index.
-         * <p>
          * API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(@Nullable TypeMapping value) {
             this.mappings = value;
             return this;
         }
 
         /**
-         * Mapping for fields in the index.
-         * <p>
          * API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+            return mappings(fn.apply(new TypeMapping.Builder()).build());
         }
 
         /**
-         * 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 cluster-manager 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
+        @Nonnull
         public final Builder masterTimeout(@Nullable Time value) {
             this.masterTimeout = value;
             return this;
         }
 
         /**
-         * 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 cluster-manager 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
+        @Nonnull
         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());
         }
 
         /**
          * Required - The name of the template
          * <p>
          * API name: {@code name}
+         * </p>
          */
+        @Nonnull
         public final Builder name(String value) {
             this.name = value;
             return this;
         }
 
         /**
-         * Order in which OpenSearch applies this template if index matches multiple
-         * templates.
          * <p>
-         * Templates with lower 'order' values are merged first. Templates with higher
-         * 'order' values are merged later, overriding templates with lower values.
+         * Order in which OpenSearch applies this template if index matches multiple templates.
+         * </p>
+         * <p>
+         * Templates with lower 'order' values are merged first. Templates with higher 'order' values are merged later, overriding templates
+         * with lower values.
+         * </p>
          * <p>
          * API name: {@code order}
+         * </p>
          */
+        @Nonnull
         public final Builder order(@Nullable Integer value) {
             this.order = value;
             return this;
@@ -514,9 +556,13 @@ public final Builder order(@Nullable Integer value) {
          * Configuration options for the index.
          * <p>
          * API name: {@code settings}
+         * </p>
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>settings</code>.
+         * Adds all elements of <code>map</code> to <code>settings</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder settings(Map<String, JsonData> map) {
             this.settings = _mapPutAll(this.settings, map);
             return this;
@@ -526,35 +572,22 @@ public final Builder settings(Map<String, JsonData> map) {
          * Configuration options for the index.
          * <p>
          * API name: {@code settings}
+         * </p>
+         *
          * <p>
          * Adds an entry to <code>settings</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder settings(String key, JsonData value) {
             this.settings = _mapPut(this.settings, key, value);
             return this;
         }
 
         /**
-         * API name: {@code timeout}
-         */
-        public final Builder timeout(@Nullable Time value) {
-            this.timeout = value;
-            return this;
-        }
-
-        /**
-         * API name: {@code timeout}
-         */
-        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.timeout(fn.apply(new Time.Builder()).build());
-        }
-
-        /**
-         * Version number used to manage index templates externally. This number is not
-         * automatically generated by OpenSearch.
-         * <p>
          * API name: {@code version}
          */
+        @Nonnull
         public final Builder version(@Nullable Long value) {
             this.version = value;
             return this;
@@ -563,9 +596,10 @@ public final Builder version(@Nullable Long value) {
         /**
          * Builds a {@link PutTemplateRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public PutTemplateRequest build() {
             _checkSingleUse();
 
@@ -584,16 +618,13 @@ public PutTemplateRequest build() {
     );
 
     protected static void setupPutTemplateRequestDeserializer(ObjectDeserializer<PutTemplateRequest.Builder> op) {
-
         op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-        op.add(Builder::create, JsonpDeserializer.booleanDeserializer(), "create");
         op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
         op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
         op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
         op.add(Builder::order, JsonpDeserializer.integerDeserializer(), "order");
         op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
         op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -602,55 +633,64 @@ protected static void setupPutTemplateRequestDeserializer(ObjectDeserializer<Put
      * Endpoint "{@code indices.put_template}".
      */
     public static final Endpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "PUT";
-
-        },
-
+        request -> "PUT",
         // Request path
         request -> {
-            final int _name = 1 << 0;
-
-            int propsSet = 0;
-
-            propsSet |= _name;
-
-            if (propsSet == (_name)) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_template");
-                buf.append("/");
-                SimpleEndpoint.pathEncode(request.name, buf);
-                return buf.toString();
-            }
-            throw SimpleEndpoint.noPathTemplateFound("path");
-
+            StringBuilder buf = new StringBuilder();
+            buf.append("/_template/");
+            SimpleEndpoint.pathEncode(request.name, 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.clusterManagerTimeout != null) {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
             }
-            if (request.flatSettings != null) {
-                params.put("flat_settings", String.valueOf(request.flatSettings));
-            }
             if (request.create != null) {
                 params.put("create", String.valueOf(request.create));
             }
-            if (request.timeout != null) {
-                params.put("timeout", request.timeout._toJsonString());
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
             }
             return params;
-
         },
         SimpleEndpoint.emptyMap(),
         true,
         PutTemplateResponse._DESERIALIZER
     );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.aliases);
+        result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
+        result = 31 * result + Objects.hashCode(this.create);
+        result = 31 * result + Objects.hashCode(this.indexPatterns);
+        result = 31 * result + Objects.hashCode(this.mappings);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + this.name.hashCode();
+        result = 31 * result + Objects.hashCode(this.order);
+        result = 31 * result + Objects.hashCode(this.settings);
+        result = 31 * result + Objects.hashCode(this.version);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PutTemplateRequest other = (PutTemplateRequest) o;
+        return Objects.equals(this.aliases, other.aliases)
+            && Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.create, other.create)
+            && Objects.equals(this.indexPatterns, other.indexPatterns)
+            && Objects.equals(this.mappings, other.mappings)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && this.name.equals(other.name)
+            && Objects.equals(this.order, other.order)
+            && Objects.equals(this.settings, other.settings)
+            && Objects.equals(this.version, other.version);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
similarity index 62%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
index 0a278cc917..374a94d152 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
@@ -30,39 +30,80 @@
  * 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 javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.put_template.Response
 
 @JsonpDeserializable
-public class PutTemplateResponse extends AcknowledgedResponseBase {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PutTemplateResponse extends AcknowledgedResponseBase
+    implements
+        ToCopyableBuilder<PutTemplateResponse.Builder, PutTemplateResponse> {
+
     // ---------------------------------------------------------------------------------------------
 
     private PutTemplateResponse(Builder builder) {
         super(builder);
-
     }
 
-    public static PutTemplateResponse of(Function<Builder, ObjectBuilder<PutTemplateResponse>> fn) {
+    public static PutTemplateResponse of(Function<PutTemplateResponse.Builder, ObjectBuilder<PutTemplateResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link PutTemplateResponse}.
      */
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            CopyableBuilder<Builder, PutTemplateResponse> {
+
+        public Builder() {}
+
+        private Builder(PutTemplateResponse o) {
+            super(o);
+        }
+
+        private Builder(Builder o) {
+            super(o);
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
-    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutTemplateResponse> {
         @Override
+        @Nonnull
         protected Builder self() {
             return this;
         }
@@ -70,9 +111,10 @@ protected Builder self() {
         /**
          * Builds a {@link PutTemplateResponse}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public PutTemplateResponse build() {
             _checkSingleUse();
 
@@ -91,8 +133,22 @@ public PutTemplateResponse build() {
     );
 
     protected static void setupPutTemplateResponseDeserializer(ObjectDeserializer<PutTemplateResponse.Builder> op) {
-        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        setupAcknowledgedResponseBaseDeserializer(op);
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
similarity index 58%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
index 68e3b23fce..b54b27bcd8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
@@ -30,12 +30,19 @@
  * 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.HashMap;
 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,17 +54,29 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.simulate_template.Request
 
 /**
- * Simulate resolving the given template name or body
- *
+ * Simulate resolving the given template name or body.
  */
 @JsonpDeserializable
-public class SimulateTemplateRequest extends RequestBase implements PlainJsonSerializable {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class SimulateTemplateRequest extends RequestBase
+    implements
+        PlainJsonSerializable,
+        ToCopyableBuilder<SimulateTemplateRequest.Builder, SimulateTemplateRequest> {
+
+    @Nullable
+    private final String cause;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
     @Nullable
     private final Boolean create;
 
@@ -65,37 +84,56 @@ public class SimulateTemplateRequest extends RequestBase implements PlainJsonSer
     @Nullable
     private final Time masterTimeout;
 
-    @Nullable
-    private final Time clusterManagerTimeout;
-
     @Nullable
     private final String name;
 
+    @Nonnull
     private final IndexTemplate template;
 
     // ---------------------------------------------------------------------------------------------
 
     private SimulateTemplateRequest(Builder builder) {
-
+        this.cause = builder.cause;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.create = builder.create;
         this.masterTimeout = builder.masterTimeout;
-        this.clusterManagerTimeout = builder.clusterManagerTimeout;
         this.name = builder.name;
         this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
-
     }
 
-    public static SimulateTemplateRequest of(Function<Builder, ObjectBuilder<SimulateTemplateRequest>> fn) {
+    public static SimulateTemplateRequest of(Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * If true, the template passed in the body is only used if no existing
-     * templates match the same index patterns. If false, the simulation uses the
-     * template with the highest priority. Note that the template is not permanently
-     * added or updated in either case; it is only used for the simulation.
+     * User defined reason for dry-run creating the new template for simulation purposes.
+     * <p>
+     * API name: {@code cause}
+     * </p>
+     */
+    @Nullable
+    public final String cause() {
+        return this.cause;
+    }
+
+    /**
+     * Operation timeout for connection to cluster-manager node.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     * </p>
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * If <code>true</code>, the template passed in the body is only used if no existing templates match the same index patterns. If
+     * <code>false</code>, the simulation uses the template with the highest priority. Note that the template is not permanently added or
+     * updated in either case; it is only used for the simulation.
      * <p>
      * API name: {@code create}
+     * </p>
      */
     @Nullable
     public final Boolean create() {
@@ -103,10 +141,11 @@ public final Boolean create() {
     }
 
     /**
-     * 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 cluster-manager 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
@@ -115,22 +154,11 @@ public final Time 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;
-    }
-
-    /**
-     * Name of the index template to simulate. To test a template configuration
-     * before you add it to the cluster, omit this parameter and specify the
-     * template configuration in the request body.
+     * Name of the index template to simulate. To test a template configuration before you add it to the cluster, omit this parameter and
+     * specify the template configuration in the request body.
      * <p>
      * API name: {@code name}
+     * </p>
      */
     @Nullable
     public final String name() {
@@ -139,9 +167,8 @@ public final String name() {
 
     /**
      * Required - Request body.
-     * <p>
-     * API name: {@code _value_body}
      */
+    @Nonnull
     public final IndexTemplate template() {
         return this.template;
     }
@@ -149,97 +176,150 @@ public final IndexTemplate template() {
     /**
      * Serialize this value to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         this.template.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link SimulateTemplateRequest}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateTemplateRequest> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, SimulateTemplateRequest> {
+        @Nullable
+        private String cause;
+        @Nullable
+        private Time clusterManagerTimeout;
         @Nullable
         private Boolean create;
-
-        @Deprecated
         @Nullable
         private Time masterTimeout;
-
-        @Nullable
-        private Time clusterManagerTimeout;
-
         @Nullable
         private String name;
-
         private IndexTemplate template;
 
+        public Builder() {}
+
+        private Builder(SimulateTemplateRequest o) {
+            this.cause = o.cause;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.create = o.create;
+            this.masterTimeout = o.masterTimeout;
+            this.name = o.name;
+            this.template = o.template;
+        }
+
+        private Builder(Builder o) {
+            this.cause = o.cause;
+            this.clusterManagerTimeout = o.clusterManagerTimeout;
+            this.create = o.create;
+            this.masterTimeout = o.masterTimeout;
+            this.name = o.name;
+            this.template = o.template;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         /**
-         * If true, the template passed in the body is only used if no existing
-         * templates match the same index patterns. If false, the simulation uses the
-         * template with the highest priority. Note that the template is not permanently
-         * added or updated in either case; it is only used for the simulation.
+         * User defined reason for dry-run creating the new template for simulation purposes.
          * <p>
-         * API name: {@code create}
+         * API name: {@code cause}
+         * </p>
          */
-        public final Builder create(@Nullable Boolean value) {
-            this.create = value;
+        @Nonnull
+        public final Builder cause(@Nullable String value) {
+            this.cause = value;
             return this;
         }
 
         /**
-         * 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.
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code master_timeout}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        @Deprecated
-        public final Builder masterTimeout(@Nullable Time value) {
-            this.masterTimeout = value;
+        @Nonnull
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
             return this;
         }
 
         /**
-         * 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.
+         * Operation timeout for connection to cluster-manager node.
          * <p>
-         * API name: {@code master_timeout}
+         * API name: {@code cluster_manager_timeout}
+         * </p>
          */
-        @Deprecated
-        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        @Nonnull
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return clusterManagerTimeout(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.
+         * If <code>true</code>, the template passed in the body is only used if no existing templates match the same index patterns. If
+         * <code>false</code>, the simulation uses the template with the highest priority. Note that the template is not permanently added
+         * or updated in either case; it is only used for the simulation.
          * <p>
-         * API name: {@code cluster_manager_timeout}
+         * API name: {@code create}
+         * </p>
          */
-        public final Builder clusterManagerTimeout(@Nullable Time value) {
-            this.clusterManagerTimeout = value;
+        @Nonnull
+        public final Builder create(@Nullable Boolean value) {
+            this.create = 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.
+         * 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}
+         * API name: {@code master_timeout}
+         * </p>
          */
-        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        @Deprecated
+        @Nonnull
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = 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 master_timeout}
+         * </p>
+         */
+        @Deprecated
+        @Nonnull
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return masterTimeout(fn.apply(new Time.Builder()).build());
         }
 
         /**
-         * Name of the index template to simulate. To test a template configuration
-         * before you add it to the cluster, omit this parameter and specify the
-         * template configuration in the request body.
+         * Name of the index template to simulate. To test a template configuration before you add it to the cluster, omit this parameter
+         * and specify the template configuration in the request body.
          * <p>
          * API name: {@code name}
+         * </p>
          */
+        @Nonnull
         public final Builder name(@Nullable String value) {
             this.name = value;
             return this;
@@ -247,9 +327,8 @@ public final Builder name(@Nullable String value) {
 
         /**
          * Required - Request body.
-         * <p>
-         * API name: {@code _value_body}
          */
+        @Nonnull
         public final Builder template(IndexTemplate value) {
             this.template = value;
             return this;
@@ -257,19 +336,19 @@ public final Builder template(IndexTemplate value) {
 
         /**
          * Required - Request body.
-         * <p>
-         * API name: {@code _value_body}
          */
+        @Nonnull
         public final Builder template(Function<IndexTemplate.Builder, ObjectBuilder<IndexTemplate>> fn) {
-            return this.template(fn.apply(new IndexTemplate.Builder()).build());
+            return template(fn.apply(new IndexTemplate.Builder()).build());
         }
 
         /**
          * Builds a {@link SimulateTemplateRequest}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public SimulateTemplateRequest build() {
             _checkSingleUse();
 
@@ -277,12 +356,12 @@ public SimulateTemplateRequest build() {
         }
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     public static final JsonpDeserializer<SimulateTemplateRequest> _DESERIALIZER = createSimulateTemplateRequestDeserializer();
 
     protected static JsonpDeserializer<SimulateTemplateRequest> createSimulateTemplateRequestDeserializer() {
-
         JsonpDeserializer<IndexTemplate> valueDeserializer = IndexTemplate._DESERIALIZER;
-
         return JsonpDeserializer.of(
             valueDeserializer.acceptedEvents(),
             (parser, mapper) -> new Builder().template(valueDeserializer.deserialize(parser, mapper)).build()
@@ -295,13 +374,8 @@ protected static JsonpDeserializer<SimulateTemplateRequest> createSimulateTempla
      * Endpoint "{@code indices.simulate_template}".
      */
     public static final Endpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
         // Request method
-        request -> {
-            return "POST";
-
-        },
-
+        request -> "POST",
         // Request path
         request -> {
             final int _name = 1 << 0;
@@ -311,28 +385,22 @@ protected static JsonpDeserializer<SimulateTemplateRequest> createSimulateTempla
             if (request.name() != null) propsSet |= _name;
 
             if (propsSet == 0) {
-                StringBuilder buf = new StringBuilder();
-                buf.append("/_index_template");
-                buf.append("/_simulate");
-                return buf.toString();
+                return "/_index_template/_simulate";
             }
             if (propsSet == (_name)) {
                 StringBuilder buf = new StringBuilder();
-                buf.append("/_index_template");
-                buf.append("/_simulate");
-                buf.append("/");
+                buf.append("/_index_template/_simulate/");
                 SimpleEndpoint.pathEncode(request.name, buf);
                 return buf.toString();
             }
-            throw SimpleEndpoint.noPathTemplateFound("path");
 
+            throw SimpleEndpoint.noPathTemplateFound("path");
         },
-
         // Request parameters
         request -> {
             Map<String, String> params = new HashMap<>();
-            if (request.masterTimeout != null) {
-                params.put("master_timeout", request.masterTimeout._toJsonString());
+            if (request.cause != null) {
+                params.put("cause", request.cause);
             }
             if (request.clusterManagerTimeout != null) {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
@@ -340,11 +408,38 @@ protected static JsonpDeserializer<SimulateTemplateRequest> createSimulateTempla
             if (request.create != null) {
                 params.put("create", String.valueOf(request.create));
             }
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
             return params;
-
         },
         SimpleEndpoint.emptyMap(),
         true,
         SimulateTemplateResponse._DESERIALIZER
     );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.cause);
+        result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
+        result = 31 * result + Objects.hashCode(this.create);
+        result = 31 * result + Objects.hashCode(this.masterTimeout);
+        result = 31 * result + Objects.hashCode(this.name);
+        result = 31 * result + this.template.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SimulateTemplateRequest other = (SimulateTemplateRequest) o;
+        return Objects.equals(this.cause, other.cause)
+            && Objects.equals(this.clusterManagerTimeout, other.clusterManagerTimeout)
+            && Objects.equals(this.create, other.create)
+            && Objects.equals(this.masterTimeout, other.masterTimeout)
+            && Objects.equals(this.name, other.name)
+            && this.template.equals(other.template);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
new file mode 100644
index 0000000000..2960276088
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
@@ -0,0 +1,264 @@
+/*
+ * 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 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.indices.simulate_template.Overlapping;
+import org.opensearch.client.opensearch.indices.simulate_template.Template;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
+import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
+
+// typedef: indices.simulate_template.Response
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class SimulateTemplateResponse
+    implements
+        PlainJsonSerializable,
+        ToCopyableBuilder<SimulateTemplateResponse.Builder, SimulateTemplateResponse> {
+
+    @Nonnull
+    private final List<Overlapping> overlapping;
+
+    @Nonnull
+    private final Template template;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimulateTemplateResponse(Builder builder) {
+        this.overlapping = ApiTypeHelper.unmodifiable(builder.overlapping);
+        this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
+    }
+
+    public static SimulateTemplateResponse of(Function<SimulateTemplateResponse.Builder, ObjectBuilder<SimulateTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code overlapping}
+     */
+    @Nonnull
+    public final List<Overlapping> overlapping() {
+        return this.overlapping;
+    }
+
+    /**
+     * Required - API name: {@code template}
+     */
+    @Nonnull
+    public final Template template() {
+        return this.template;
+    }
+
+    /**
+     * 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.overlapping)) {
+            generator.writeKey("overlapping");
+            generator.writeStartArray();
+            for (Overlapping item0 : this.overlapping) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+        }
+
+        generator.writeKey("template");
+        this.template.serialize(generator, mapper);
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builder for {@link SimulateTemplateResponse}.
+     */
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, SimulateTemplateResponse> {
+        @Nullable
+        private List<Overlapping> overlapping;
+        private Template template;
+
+        public Builder() {}
+
+        private Builder(SimulateTemplateResponse o) {
+            this.overlapping = _listCopy(o.overlapping);
+            this.template = o.template;
+        }
+
+        private Builder(Builder o) {
+            this.overlapping = _listCopy(o.overlapping);
+            this.template = o.template;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
+        /**
+         * API name: {@code overlapping}
+         *
+         * <p>
+         * Adds all elements of <code>list</code> to <code>overlapping</code>.
+         * </p>
+         */
+        @Nonnull
+        public final Builder overlapping(List<Overlapping> list) {
+            this.overlapping = _listAddAll(this.overlapping, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code overlapping}
+         *
+         * <p>
+         * Adds one or more values to <code>overlapping</code>.
+         * </p>
+         */
+        @Nonnull
+        public final Builder overlapping(Overlapping value, Overlapping... values) {
+            this.overlapping = _listAdd(this.overlapping, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code overlapping}
+         *
+         * <p>
+         * Adds a value to <code>overlapping</code> using a builder lambda.
+         * </p>
+         */
+        @Nonnull
+        public final Builder overlapping(Function<Overlapping.Builder, ObjectBuilder<Overlapping>> fn) {
+            return overlapping(fn.apply(new Overlapping.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code template}
+         */
+        @Nonnull
+        public final Builder template(Template value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code template}
+         */
+        @Nonnull
+        public final Builder template(Function<Template.Builder, ObjectBuilder<Template>> fn) {
+            return template(fn.apply(new Template.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SimulateTemplateResponse}.
+         *
+         * @throws NullPointerException if some of the required fields are null.
+         */
+        @Override
+        @Nonnull
+        public SimulateTemplateResponse build() {
+            _checkSingleUse();
+
+            return new SimulateTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimulateTemplateResponse}
+     */
+    public static final JsonpDeserializer<SimulateTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimulateTemplateResponse::setupSimulateTemplateResponseDeserializer
+    );
+
+    protected static void setupSimulateTemplateResponseDeserializer(ObjectDeserializer<SimulateTemplateResponse.Builder> op) {
+        op.add(Builder::overlapping, JsonpDeserializer.arrayDeserializer(Overlapping._DESERIALIZER), "overlapping");
+        op.add(Builder::template, Template._DESERIALIZER, "template");
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.overlapping);
+        result = 31 * result + this.template.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SimulateTemplateResponse other = (SimulateTemplateResponse) o;
+        return Objects.equals(this.overlapping, other.overlapping) && this.template.equals(other.template);
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
similarity index 67%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
index ceb905e844..c0d6c616c4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
@@ -30,12 +30,19 @@
  * 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.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;
@@ -46,21 +53,29 @@
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
-// typedef: indices._types.TemplateMapping
+// typedef: indices.TemplateMapping
 
 @JsonpDeserializable
-public class TemplateMapping implements PlainJsonSerializable {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class TemplateMapping implements PlainJsonSerializable, ToCopyableBuilder<TemplateMapping.Builder, TemplateMapping> {
+
+    @Nonnull
     private final Map<String, Alias> aliases;
 
+    @Nonnull
     private final List<String> indexPatterns;
 
+    @Nonnull
     private final TypeMapping mappings;
 
     private final int order;
 
+    @Nonnull
     private final Map<String, JsonData> settings;
 
     @Nullable
@@ -69,23 +84,22 @@ public class TemplateMapping implements PlainJsonSerializable {
     // ---------------------------------------------------------------------------------------------
 
     private TemplateMapping(Builder builder) {
-
         this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
         this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
         this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
         this.order = ApiTypeHelper.requireNonNull(builder.order, this, "order");
         this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
         this.version = builder.version;
-
     }
 
-    public static TemplateMapping of(Function<Builder, ObjectBuilder<TemplateMapping>> fn) {
+    public static TemplateMapping of(Function<TemplateMapping.Builder, ObjectBuilder<TemplateMapping>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
      * Required - API name: {@code aliases}
      */
+    @Nonnull
     public final Map<String, Alias> aliases() {
         return this.aliases;
     }
@@ -93,6 +107,7 @@ public final Map<String, Alias> aliases() {
     /**
      * Required - API name: {@code index_patterns}
      */
+    @Nonnull
     public final List<String> indexPatterns() {
         return this.indexPatterns;
     }
@@ -100,6 +115,7 @@ public final List<String> indexPatterns() {
     /**
      * Required - API name: {@code mappings}
      */
+    @Nonnull
     public final TypeMapping mappings() {
         return this.mappings;
     }
@@ -114,6 +130,7 @@ public final int order() {
     /**
      * Required - API name: {@code settings}
      */
+    @Nonnull
     public final Map<String, JsonData> settings() {
         return this.settings;
     }
@@ -129,6 +146,7 @@ public final Long version() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -136,78 +154,100 @@ 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();
-
+        generator.writeKey("aliases");
+        generator.writeStartObject();
+        for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
         }
-        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-            generator.writeKey("index_patterns");
-            generator.writeStartArray();
-            for (String item0 : this.indexPatterns) {
-                generator.write(item0);
-
-            }
-            generator.writeEnd();
+        generator.writeEnd();
 
+        generator.writeKey("index_patterns");
+        generator.writeStartArray();
+        for (String item0 : this.indexPatterns) {
+            generator.write(item0);
         }
+        generator.writeEnd();
+
         generator.writeKey("mappings");
         this.mappings.serialize(generator, mapper);
 
         generator.writeKey("order");
         generator.write(this.order);
 
-        if (ApiTypeHelper.isDefined(this.settings)) {
-            generator.writeKey("settings");
-            generator.writeStartObject();
-            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-                generator.writeKey(item0.getKey());
-                item0.getValue().serialize(generator, mapper);
-
-            }
-            generator.writeEnd();
-
+        generator.writeKey("settings");
+        generator.writeStartObject();
+        for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
         }
+        generator.writeEnd();
+
         if (this.version != null) {
             generator.writeKey("version");
             generator.write(this.version);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link TemplateMapping}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplateMapping> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, TemplateMapping> {
         private Map<String, Alias> aliases;
-
         private List<String> indexPatterns;
-
         private TypeMapping mappings;
-
         private Integer order;
-
         private Map<String, JsonData> settings;
-
         @Nullable
         private Long version;
 
+        public Builder() {}
+
+        private Builder(TemplateMapping o) {
+            this.aliases = _mapCopy(o.aliases);
+            this.indexPatterns = _listCopy(o.indexPatterns);
+            this.mappings = o.mappings;
+            this.order = o.order;
+            this.settings = _mapCopy(o.settings);
+            this.version = o.version;
+        }
+
+        private Builder(Builder o) {
+            this.aliases = _mapCopy(o.aliases);
+            this.indexPatterns = _listCopy(o.indexPatterns);
+            this.mappings = o.mappings;
+            this.order = o.order;
+            this.settings = _mapCopy(o.settings);
+            this.version = o.version;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         /**
          * Required - 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>
          */
+        @Nonnull
         public final Builder aliases(Map<String, Alias> map) {
             this.aliases = _mapPutAll(this.aliases, map);
             return this;
@@ -215,9 +255,12 @@ public final Builder aliases(Map<String, Alias> map) {
 
         /**
          * Required - API name: {@code aliases}
+         *
          * <p>
          * Adds an entry to <code>aliases</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder aliases(String key, Alias value) {
             this.aliases = _mapPut(this.aliases, key, value);
             return this;
@@ -225,18 +268,24 @@ public final Builder aliases(String key, Alias value) {
 
         /**
          * Required - 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>
          */
+        @Nonnull
         public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
             return aliases(key, fn.apply(new Alias.Builder()).build());
         }
 
         /**
          * Required - API name: {@code index_patterns}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder indexPatterns(List<String> list) {
             this.indexPatterns = _listAddAll(this.indexPatterns, list);
             return this;
@@ -244,9 +293,12 @@ public final Builder indexPatterns(List<String> list) {
 
         /**
          * Required - API name: {@code index_patterns}
+         *
          * <p>
          * Adds one or more values to <code>indexPatterns</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder indexPatterns(String value, String... values) {
             this.indexPatterns = _listAdd(this.indexPatterns, value, values);
             return this;
@@ -255,6 +307,7 @@ public final Builder indexPatterns(String value, String... values) {
         /**
          * Required - API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(TypeMapping value) {
             this.mappings = value;
             return this;
@@ -263,13 +316,15 @@ public final Builder mappings(TypeMapping value) {
         /**
          * Required - API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+            return mappings(fn.apply(new TypeMapping.Builder()).build());
         }
 
         /**
          * Required - API name: {@code order}
          */
+        @Nonnull
         public final Builder order(int value) {
             this.order = value;
             return this;
@@ -277,9 +332,12 @@ public final Builder order(int value) {
 
         /**
          * Required - API name: {@code settings}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>settings</code>.
+         * Adds all elements of <code>map</code> to <code>settings</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder settings(Map<String, JsonData> map) {
             this.settings = _mapPutAll(this.settings, map);
             return this;
@@ -287,9 +345,12 @@ public final Builder settings(Map<String, JsonData> map) {
 
         /**
          * Required - API name: {@code settings}
+         *
          * <p>
          * Adds an entry to <code>settings</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder settings(String key, JsonData value) {
             this.settings = _mapPut(this.settings, key, value);
             return this;
@@ -298,6 +359,7 @@ public final Builder settings(String key, JsonData value) {
         /**
          * API name: {@code version}
          */
+        @Nonnull
         public final Builder version(@Nullable Long value) {
             this.version = value;
             return this;
@@ -306,9 +368,10 @@ public final Builder version(@Nullable Long value) {
         /**
          * Builds a {@link TemplateMapping}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public TemplateMapping build() {
             _checkSingleUse();
 
@@ -327,14 +390,36 @@ public TemplateMapping build() {
     );
 
     protected static void setupTemplateMappingDeserializer(ObjectDeserializer<TemplateMapping.Builder> op) {
-
         op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
         op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
         op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
         op.add(Builder::order, JsonpDeserializer.integerDeserializer(), "order");
         op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
         op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.aliases.hashCode();
+        result = 31 * result + this.indexPatterns.hashCode();
+        result = 31 * result + this.mappings.hashCode();
+        result = 31 * result + Integer.hashCode(this.order);
+        result = 31 * result + this.settings.hashCode();
+        result = 31 * result + Objects.hashCode(this.version);
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TemplateMapping other = (TemplateMapping) o;
+        return this.aliases.equals(other.aliases)
+            && this.indexPatterns.equals(other.indexPatterns)
+            && this.mappings.equals(other.mappings)
+            && this.order == other.order
+            && this.settings.equals(other.settings)
+            && Objects.equals(this.version, other.version);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
similarity index 70%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
index b7ccf034a9..2fb7e52511 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
@@ -30,10 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices.get_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;
@@ -43,28 +50,31 @@
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.get_mapping.IndexMappingRecord
 
 @JsonpDeserializable
-public class IndexMappingRecord implements PlainJsonSerializable {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class IndexMappingRecord implements PlainJsonSerializable, ToCopyableBuilder<IndexMappingRecord.Builder, IndexMappingRecord> {
+
     @Nullable
     private final TypeMapping item;
 
+    @Nonnull
     private final TypeMapping mappings;
 
     // ---------------------------------------------------------------------------------------------
 
     private IndexMappingRecord(Builder builder) {
-
         this.item = builder.item;
         this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
-
     }
 
-    public static IndexMappingRecord of(Function<Builder, ObjectBuilder<IndexMappingRecord>> fn) {
+    public static IndexMappingRecord of(Function<IndexMappingRecord.Builder, ObjectBuilder<IndexMappingRecord>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -79,6 +89,7 @@ public final TypeMapping item() {
     /**
      * Required - API name: {@code mappings}
      */
+    @Nonnull
     public final TypeMapping mappings() {
         return this.mappings;
     }
@@ -86,6 +97,7 @@ public final TypeMapping mappings() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -93,32 +105,58 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.item != null) {
             generator.writeKey("item");
             this.item.serialize(generator, mapper);
-
         }
+
         generator.writeKey("mappings");
         this.mappings.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
     /**
      * Builder for {@link IndexMappingRecord}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexMappingRecord> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, IndexMappingRecord> {
         @Nullable
         private TypeMapping item;
-
         private TypeMapping mappings;
 
+        public Builder() {}
+
+        private Builder(IndexMappingRecord o) {
+            this.item = o.item;
+            this.mappings = o.mappings;
+        }
+
+        private Builder(Builder o) {
+            this.item = o.item;
+            this.mappings = o.mappings;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
         /**
          * API name: {@code item}
          */
+        @Nonnull
         public final Builder item(@Nullable TypeMapping value) {
             this.item = value;
             return this;
@@ -127,13 +165,15 @@ public final Builder item(@Nullable TypeMapping value) {
         /**
          * API name: {@code item}
          */
+        @Nonnull
         public final Builder item(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-            return this.item(fn.apply(new TypeMapping.Builder()).build());
+            return item(fn.apply(new TypeMapping.Builder()).build());
         }
 
         /**
          * Required - API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(TypeMapping value) {
             this.mappings = value;
             return this;
@@ -142,16 +182,18 @@ public final Builder mappings(TypeMapping value) {
         /**
          * Required - API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+            return mappings(fn.apply(new TypeMapping.Builder()).build());
         }
 
         /**
          * Builds a {@link IndexMappingRecord}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public IndexMappingRecord build() {
             _checkSingleUse();
 
@@ -170,10 +212,23 @@ public IndexMappingRecord build() {
     );
 
     protected static void setupIndexMappingRecordDeserializer(ObjectDeserializer<IndexMappingRecord.Builder> op) {
-
         op.add(Builder::item, TypeMapping._DESERIALIZER, "item");
         op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.item);
+        result = 31 * result + this.mappings.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IndexMappingRecord other = (IndexMappingRecord) o;
+        return Objects.equals(this.item, other.item) && this.mappings.equals(other.mappings);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
similarity index 69%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
index e3261c3927..f17b3e5707 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
@@ -30,11 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices.simulate_template;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 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;
@@ -42,47 +48,54 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.simulate_template.Overlapping
 
 @JsonpDeserializable
-public class Overlapping implements PlainJsonSerializable {
-    private final String name;
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class Overlapping implements PlainJsonSerializable, ToCopyableBuilder<Overlapping.Builder, Overlapping> {
 
+    @Nonnull
     private final List<String> indexPatterns;
 
+    @Nonnull
+    private final String name;
+
     // ---------------------------------------------------------------------------------------------
 
     private Overlapping(Builder builder) {
-
-        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
         this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
-
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
     }
 
-    public static Overlapping of(Function<Builder, ObjectBuilder<Overlapping>> fn) {
+    public static Overlapping of(Function<Overlapping.Builder, ObjectBuilder<Overlapping>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * Required - API name: {@code name}
+     * Required - API name: {@code index_patterns}
      */
-    public final String name() {
-        return this.name;
+    @Nonnull
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
     }
 
     /**
-     * Required - API name: {@code index_patterns}
+     * Required - API name: {@code name}
      */
-    public final List<String> indexPatterns() {
-        return this.indexPatterns;
+    @Nonnull
+    public final String name() {
+        return this.name;
     }
 
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -90,47 +103,63 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey("index_patterns");
+        generator.writeStartArray();
+        for (String item0 : this.indexPatterns) {
+            generator.write(item0);
+        }
+        generator.writeEnd();
 
         generator.writeKey("name");
         generator.write(this.name);
+    }
 
-        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-            generator.writeKey("index_patterns");
-            generator.writeStartArray();
-            for (String item0 : this.indexPatterns) {
-                generator.write(item0);
-
-            }
-            generator.writeEnd();
-
-        }
+    // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
     }
 
-    // ---------------------------------------------------------------------------------------------
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
 
     /**
      * Builder for {@link Overlapping}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Overlapping> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, Overlapping> {
+        private List<String> indexPatterns;
         private String name;
 
-        private List<String> indexPatterns;
+        public Builder() {}
 
-        /**
-         * Required - API name: {@code name}
-         */
-        public final Builder name(String value) {
-            this.name = value;
-            return this;
+        private Builder(Overlapping o) {
+            this.indexPatterns = _listCopy(o.indexPatterns);
+            this.name = o.name;
+        }
+
+        private Builder(Builder o) {
+            this.indexPatterns = _listCopy(o.indexPatterns);
+            this.name = o.name;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
         }
 
         /**
          * Required - API name: {@code index_patterns}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder indexPatterns(List<String> list) {
             this.indexPatterns = _listAddAll(this.indexPatterns, list);
             return this;
@@ -138,20 +167,33 @@ public final Builder indexPatterns(List<String> list) {
 
         /**
          * Required - API name: {@code index_patterns}
+         *
          * <p>
          * Adds one or more values to <code>indexPatterns</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder indexPatterns(String value, String... values) {
             this.indexPatterns = _listAdd(this.indexPatterns, value, values);
             return this;
         }
 
+        /**
+         * Required - API name: {@code name}
+         */
+        @Nonnull
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
         /**
          * Builds a {@link Overlapping}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public Overlapping build() {
             _checkSingleUse();
 
@@ -170,10 +212,23 @@ public Overlapping build() {
     );
 
     protected static void setupOverlappingDeserializer(ObjectDeserializer<Overlapping.Builder> op) {
-
-        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
         op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.indexPatterns.hashCode();
+        result = 31 * result + this.name.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Overlapping other = (Overlapping) o;
+        return this.indexPatterns.equals(other.indexPatterns) && this.name.equals(other.name);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
similarity index 55%
rename from java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
index 73b0a66b65..a34435f317 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
@@ -30,13 +30,19 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch.indices.simulate_template;
 
 import jakarta.json.stream.JsonGenerator;
-import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
-import org.opensearch.client.json.JsonData;
+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;
@@ -45,47 +51,52 @@
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.opensearch.indices.Alias;
+import org.opensearch.client.opensearch.indices.IndexSettings;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.CopyableBuilder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
 
 // typedef: indices.simulate_template.Template
 
 @JsonpDeserializable
-public class Template implements PlainJsonSerializable {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class Template implements PlainJsonSerializable, ToCopyableBuilder<Template.Builder, Template> {
+
+    @Nonnull
     private final Map<String, Alias> aliases;
 
+    @Nullable
     private final TypeMapping mappings;
 
-    private final Map<String, JsonData> settings;
-
-    private final List<Overlapping> overlapping;
+    @Nonnull
+    private final IndexSettings settings;
 
     // ---------------------------------------------------------------------------------------------
 
     private Template(Builder builder) {
-
         this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
-        this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
-        this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
-        this.overlapping = ApiTypeHelper.unmodifiableRequired(builder.overlapping, this, "overlapping");
-
+        this.mappings = builder.mappings;
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
     }
 
-    public static Template of(Function<Builder, ObjectBuilder<Template>> fn) {
+    public static Template of(Function<Template.Builder, ObjectBuilder<Template>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
      * Required - API name: {@code aliases}
      */
+    @Nonnull
     public final Map<String, Alias> aliases() {
         return this.aliases;
     }
 
     /**
-     * Required - API name: {@code mappings}
+     * API name: {@code mappings}
      */
+    @Nullable
     public final TypeMapping mappings() {
         return this.mappings;
     }
@@ -93,20 +104,15 @@ public final TypeMapping mappings() {
     /**
      * Required - API name: {@code settings}
      */
-    public final Map<String, JsonData> settings() {
+    @Nonnull
+    public final IndexSettings settings() {
         return this.settings;
     }
 
-    /**
-     * Required - API name: {@code overlapping}
-     */
-    public final List<Overlapping> overlapping() {
-        return this.overlapping;
-    }
-
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -114,65 +120,73 @@ 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();
-
+        generator.writeKey("aliases");
+        generator.writeStartObject();
+        for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
         }
-        generator.writeKey("mappings");
-        this.mappings.serialize(generator, mapper);
-
-        if (ApiTypeHelper.isDefined(this.settings)) {
-            generator.writeKey("settings");
-            generator.writeStartObject();
-            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-                generator.writeKey(item0.getKey());
-                item0.getValue().serialize(generator, mapper);
-
-            }
-            generator.writeEnd();
+        generator.writeEnd();
 
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
         }
-        if (ApiTypeHelper.isDefined(this.overlapping)) {
-            generator.writeKey("overlapping");
-            generator.writeStartArray();
-            for (Overlapping item0 : this.overlapping) {
-                item0.serialize(generator, mapper);
 
-            }
-            generator.writeEnd();
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+    }
 
-        }
+    // ---------------------------------------------------------------------------------------------
 
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
     }
 
-    // ---------------------------------------------------------------------------------------------
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
 
     /**
      * Builder for {@link Template}.
      */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Template> {
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, Template> {
         private Map<String, Alias> aliases;
-
+        @Nullable
         private TypeMapping mappings;
+        private IndexSettings settings;
+
+        public Builder() {}
 
-        private Map<String, JsonData> settings;
+        private Builder(Template o) {
+            this.aliases = _mapCopy(o.aliases);
+            this.mappings = o.mappings;
+            this.settings = o.settings;
+        }
+
+        private Builder(Builder o) {
+            this.aliases = _mapCopy(o.aliases);
+            this.mappings = o.mappings;
+            this.settings = o.settings;
+        }
 
-        private List<Overlapping> overlapping;
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
 
         /**
          * Required - 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>
          */
+        @Nonnull
         public final Builder aliases(Map<String, Alias> map) {
             this.aliases = _mapPutAll(this.aliases, map);
             return this;
@@ -180,9 +194,12 @@ public final Builder aliases(Map<String, Alias> map) {
 
         /**
          * Required - API name: {@code aliases}
+         *
          * <p>
          * Adds an entry to <code>aliases</code>.
+         * </p>
          */
+        @Nonnull
         public final Builder aliases(String key, Alias value) {
             this.aliases = _mapPut(this.aliases, key, value);
             return this;
@@ -190,83 +207,57 @@ public final Builder aliases(String key, Alias value) {
 
         /**
          * Required - 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>
          */
+        @Nonnull
         public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
             return aliases(key, fn.apply(new Alias.Builder()).build());
         }
 
         /**
-         * Required - API name: {@code mappings}
+         * API name: {@code mappings}
          */
-        public final Builder mappings(TypeMapping value) {
+        @Nonnull
+        public final Builder mappings(@Nullable TypeMapping value) {
             this.mappings = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code mappings}
+         * API name: {@code mappings}
          */
+        @Nonnull
         public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+            return mappings(fn.apply(new TypeMapping.Builder()).build());
         }
 
         /**
          * Required - API name: {@code settings}
-         * <p>
-         * Adds all entries of <code>map</code> to <code>settings</code>.
          */
-        public final Builder settings(Map<String, JsonData> map) {
-            this.settings = _mapPutAll(this.settings, map);
+        @Nonnull
+        public final Builder settings(IndexSettings value) {
+            this.settings = value;
             return this;
         }
 
         /**
          * Required - API name: {@code settings}
-         * <p>
-         * Adds an entry to <code>settings</code>.
-         */
-        public final Builder settings(String key, JsonData value) {
-            this.settings = _mapPut(this.settings, key, value);
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code overlapping}
-         * <p>
-         * Adds all elements of <code>list</code> to <code>overlapping</code>.
          */
-        public final Builder overlapping(List<Overlapping> list) {
-            this.overlapping = _listAddAll(this.overlapping, list);
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code overlapping}
-         * <p>
-         * Adds one or more values to <code>overlapping</code>.
-         */
-        public final Builder overlapping(Overlapping value, Overlapping... values) {
-            this.overlapping = _listAdd(this.overlapping, value, values);
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code overlapping}
-         * <p>
-         * Adds a value to <code>overlapping</code> using a builder lambda.
-         */
-        public final Builder overlapping(Function<Overlapping.Builder, ObjectBuilder<Overlapping>> fn) {
-            return overlapping(fn.apply(new Overlapping.Builder()).build());
+        @Nonnull
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return settings(fn.apply(new IndexSettings.Builder()).build());
         }
 
         /**
          * Builds a {@link Template}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
+        @Override
+        @Nonnull
         public Template build() {
             _checkSingleUse();
 
@@ -285,12 +276,25 @@ public Template build() {
     );
 
     protected static void setupTemplateDeserializer(ObjectDeserializer<Template.Builder> op) {
-
         op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
         op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-        op.add(Builder::overlapping, JsonpDeserializer.arrayDeserializer(Overlapping._DESERIALIZER), "overlapping");
+        op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.aliases.hashCode();
+        result = 31 * result + Objects.hashCode(this.mappings);
+        result = 31 * result + this.settings.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Template other = (Template) o;
+        return this.aliases.equals(other.aliases) && Objects.equals(this.mappings, other.mappings) && this.settings.equals(other.settings);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java
deleted file mode 100644
index 0f850ff737..0000000000
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-
-package org.opensearch.client.opensearch.indices;
-
-import org.opensearch.client.json.JsonpDeserializer;
-
-// typedef: indices.exists_template.Response
-
-public class ExistsTemplateResponse {
-    public ExistsTemplateResponse() {}
-
-    /**
-     * Singleton instance for {@link ExistsTemplateResponse}.
-     */
-    public static final ExistsTemplateResponse _INSTANCE = new ExistsTemplateResponse();
-
-    public static final JsonpDeserializer<ExistsTemplateResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
-        ExistsTemplateResponse._INSTANCE
-    );
-
-}
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 a400064f26..3f4b646b5d 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
@@ -343,39 +343,6 @@ public final CompletableFuture<DeleteAliasResponse> deleteAlias(
         return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.delete_template
-
-    /**
-     * Deletes an index template.
-     *
-     *
-     */
-
-    public CompletableFuture<DeleteTemplateResponse> deleteTemplate(DeleteTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            DeleteTemplateRequest,
-            DeleteTemplateResponse,
-            ErrorResponse>) DeleteTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Deletes an index template.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link DeleteTemplateRequest}
-     *
-     */
-
-    public final CompletableFuture<DeleteTemplateResponse> deleteTemplate(
-        Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.disk_usage
 
     /**
@@ -440,39 +407,6 @@ public final CompletableFuture<BooleanResponse> existsAlias(Function<ExistsAlias
         return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.exists_template
-
-    /**
-     * Returns information about whether a particular index template exists.
-     *
-     *
-     */
-
-    public CompletableFuture<BooleanResponse> existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            ExistsTemplateRequest,
-            BooleanResponse,
-            ErrorResponse>) ExistsTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns information about whether a particular index template exists.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link ExistsTemplateRequest}
-     *
-     */
-
-    public final CompletableFuture<BooleanResponse> existsTemplate(
-        Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.flush
 
     /**
@@ -684,147 +618,6 @@ public final CompletableFuture<GetFieldMappingResponse> getFieldMapping(
         return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.get_mapping
-
-    /**
-     * Returns mappings for one or more indices.
-     *
-     *
-     */
-
-    public CompletableFuture<GetMappingResponse> getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetMappingRequest,
-            GetMappingResponse,
-            ErrorResponse>) GetMappingRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns mappings for one or more indices.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetMappingRequest}
-     *
-     */
-
-    public final CompletableFuture<GetMappingResponse> getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn)
-        throws IOException, OpenSearchException {
-        return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
-    }
-
-    /**
-     * Returns mappings for one or more indices.
-     *
-     *
-     */
-
-    public CompletableFuture<GetMappingResponse> getMapping() throws IOException, OpenSearchException {
-        return this.transport.performRequestAsync(
-            new GetMappingRequest.Builder().build(),
-            GetMappingRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
-    // ----- Endpoint: indices.get_settings
-
-    /**
-     * Returns settings for one or more indices.
-     *
-     *
-     */
-
-    public CompletableFuture<GetIndicesSettingsResponse> getSettings(GetIndicesSettingsRequest request) throws IOException,
-        OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetIndicesSettingsRequest,
-            GetIndicesSettingsResponse,
-            ErrorResponse>) GetIndicesSettingsRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns settings for one or more indices.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetIndicesSettingsRequest}
-     *
-     */
-
-    public final CompletableFuture<GetIndicesSettingsResponse> getSettings(
-        Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
-    }
-
-    /**
-     * Returns settings for one or more indices.
-     *
-     *
-     */
-
-    public CompletableFuture<GetIndicesSettingsResponse> getSettings() throws IOException, OpenSearchException {
-        return this.transport.performRequestAsync(
-            new GetIndicesSettingsRequest.Builder().build(),
-            GetIndicesSettingsRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
-    // ----- Endpoint: indices.get_template
-
-    /**
-     * Returns an index template.
-     *
-     *
-     */
-
-    public CompletableFuture<GetTemplateResponse> getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetTemplateRequest,
-            GetTemplateResponse,
-            ErrorResponse>) GetTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns an index template.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetTemplateRequest}
-     *
-     */
-
-    public final CompletableFuture<GetTemplateResponse> getTemplate(
-        Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
-    }
-
-    /**
-     * Returns an index template.
-     *
-     *
-     */
-
-    public CompletableFuture<GetTemplateResponse> getTemplate() throws IOException, OpenSearchException {
-        return this.transport.performRequestAsync(
-            new GetTemplateRequest.Builder().build(),
-            GetTemplateRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
     // ----- Endpoint: indices.get_upgrade
 
     /**
@@ -935,119 +728,6 @@ public final CompletableFuture<PutAliasResponse> putAlias(Function<PutAliasReque
         return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.put_mapping
-
-    /**
-     * Updates the index mappings.
-     *
-     *
-     */
-
-    public CompletableFuture<PutMappingResponse> putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            PutMappingRequest,
-            PutMappingResponse,
-            ErrorResponse>) PutMappingRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Updates the index mappings.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link PutMappingRequest}
-     *
-     */
-
-    public final CompletableFuture<PutMappingResponse> putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn)
-        throws IOException, OpenSearchException {
-        return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
-    }
-
-    // ----- Endpoint: indices.put_settings
-
-    /**
-     * Updates the index settings.
-     *
-     *
-     */
-
-    public CompletableFuture<PutIndicesSettingsResponse> putSettings(PutIndicesSettingsRequest request) throws IOException,
-        OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            PutIndicesSettingsRequest,
-            PutIndicesSettingsResponse,
-            ErrorResponse>) PutIndicesSettingsRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Updates the index settings.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link PutIndicesSettingsRequest}
-     *
-     */
-
-    public final CompletableFuture<PutIndicesSettingsResponse> putSettings(
-        Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
-    }
-
-    /**
-     * Updates the index settings.
-     *
-     *
-     */
-
-    public CompletableFuture<PutIndicesSettingsResponse> putSettings() throws IOException, OpenSearchException {
-        return this.transport.performRequestAsync(
-            new PutIndicesSettingsRequest.Builder().build(),
-            PutIndicesSettingsRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
-    // ----- Endpoint: indices.put_template
-
-    /**
-     * Creates or updates an index template.
-     *
-     *
-     */
-
-    public CompletableFuture<PutTemplateResponse> putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            PutTemplateRequest,
-            PutTemplateResponse,
-            ErrorResponse>) PutTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Creates or updates an index template.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link PutTemplateRequest}
-     *
-     */
-
-    public final CompletableFuture<PutTemplateResponse> putTemplate(
-        Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.recovery
 
     /**
@@ -1320,54 +1000,6 @@ public final CompletableFuture<ShrinkResponse> shrink(Function<ShrinkRequest.Bui
         return shrink(fn.apply(new ShrinkRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.simulate_template
-
-    /**
-     * Simulate resolving the given template name or body
-     *
-     *
-     */
-
-    public CompletableFuture<SimulateTemplateResponse> simulateTemplate(SimulateTemplateRequest request) throws IOException,
-        OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            SimulateTemplateRequest,
-            SimulateTemplateResponse,
-            ErrorResponse>) SimulateTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Simulate resolving the given template name or body
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link SimulateTemplateRequest}
-     *
-     */
-
-    public final CompletableFuture<SimulateTemplateResponse> simulateTemplate(
-        Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
-    }
-
-    /**
-     * Simulate resolving the given template name or body
-     *
-     *
-     */
-
-    public CompletableFuture<SimulateTemplateResponse> simulateTemplate() throws IOException, OpenSearchException {
-        return this.transport.performRequestAsync(
-            new SimulateTemplateRequest.Builder().build(),
-            SimulateTemplateRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
     // ----- Endpoint: indices.split
 
     /**
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 3c779e855c..8b566e65cc 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
@@ -327,38 +327,6 @@ public final DeleteAliasResponse deleteAlias(Function<DeleteAliasRequest.Builder
         return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.delete_template
-
-    /**
-     * Deletes an index template.
-     *
-     *
-     */
-
-    public DeleteTemplateResponse deleteTemplate(DeleteTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            DeleteTemplateRequest,
-            DeleteTemplateResponse,
-            ErrorResponse>) DeleteTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Deletes an index template.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link DeleteTemplateRequest}
-     *
-     */
-
-    public final DeleteTemplateResponse deleteTemplate(Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn)
-        throws IOException, OpenSearchException {
-        return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.disk_usage
 
     /**
@@ -423,38 +391,6 @@ public final BooleanResponse existsAlias(Function<ExistsAliasRequest.Builder, Ob
         return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.exists_template
-
-    /**
-     * Returns information about whether a particular index template exists.
-     *
-     *
-     */
-
-    public BooleanResponse existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            ExistsTemplateRequest,
-            BooleanResponse,
-            ErrorResponse>) ExistsTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns information about whether a particular index template exists.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link ExistsTemplateRequest}
-     *
-     */
-
-    public final BooleanResponse existsTemplate(Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn)
-        throws IOException, OpenSearchException {
-        return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.flush
 
     /**
@@ -659,137 +595,6 @@ public final GetFieldMappingResponse getFieldMapping(Function<GetFieldMappingReq
         return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.get_mapping
-
-    /**
-     * Returns mappings for one or more indices.
-     *
-     *
-     */
-
-    public GetMappingResponse getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetMappingRequest,
-            GetMappingResponse,
-            ErrorResponse>) GetMappingRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns mappings for one or more indices.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetMappingRequest}
-     *
-     */
-
-    public final GetMappingResponse getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn) throws IOException,
-        OpenSearchException {
-        return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
-    }
-
-    /**
-     * Returns mappings for one or more indices.
-     *
-     *
-     */
-
-    public GetMappingResponse getMapping() throws IOException, OpenSearchException {
-        return this.transport.performRequest(new GetMappingRequest.Builder().build(), GetMappingRequest._ENDPOINT, this.transportOptions);
-    }
-
-    // ----- Endpoint: indices.get_settings
-
-    /**
-     * Returns settings for one or more indices.
-     *
-     *
-     */
-
-    public GetIndicesSettingsResponse getSettings(GetIndicesSettingsRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetIndicesSettingsRequest,
-            GetIndicesSettingsResponse,
-            ErrorResponse>) GetIndicesSettingsRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns settings for one or more indices.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetIndicesSettingsRequest}
-     *
-     */
-
-    public final GetIndicesSettingsResponse getSettings(
-        Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
-    }
-
-    /**
-     * Returns settings for one or more indices.
-     *
-     *
-     */
-
-    public GetIndicesSettingsResponse getSettings() throws IOException, OpenSearchException {
-        return this.transport.performRequest(
-            new GetIndicesSettingsRequest.Builder().build(),
-            GetIndicesSettingsRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
-    // ----- Endpoint: indices.get_template
-
-    /**
-     * Returns an index template.
-     *
-     *
-     */
-
-    public GetTemplateResponse getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            GetTemplateRequest,
-            GetTemplateResponse,
-            ErrorResponse>) GetTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Returns an index template.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link GetTemplateRequest}
-     *
-     */
-
-    public final GetTemplateResponse getTemplate(Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn)
-        throws IOException, OpenSearchException {
-        return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
-    }
-
-    /**
-     * Returns an index template.
-     *
-     *
-     */
-
-    public GetTemplateResponse getTemplate() throws IOException, OpenSearchException {
-        return this.transport.performRequest(new GetTemplateRequest.Builder().build(), GetTemplateRequest._ENDPOINT, this.transportOptions);
-    }
-
     // ----- Endpoint: indices.get_upgrade
 
     /**
@@ -895,117 +700,6 @@ public final PutAliasResponse putAlias(Function<PutAliasRequest.Builder, ObjectB
         return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.put_mapping
-
-    /**
-     * Updates the index mappings.
-     *
-     *
-     */
-
-    public PutMappingResponse putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            PutMappingRequest,
-            PutMappingResponse,
-            ErrorResponse>) PutMappingRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Updates the index mappings.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link PutMappingRequest}
-     *
-     */
-
-    public final PutMappingResponse putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn) throws IOException,
-        OpenSearchException {
-        return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
-    }
-
-    // ----- Endpoint: indices.put_settings
-
-    /**
-     * Updates the index settings.
-     *
-     *
-     */
-
-    public PutIndicesSettingsResponse putSettings(PutIndicesSettingsRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            PutIndicesSettingsRequest,
-            PutIndicesSettingsResponse,
-            ErrorResponse>) PutIndicesSettingsRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Updates the index settings.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link PutIndicesSettingsRequest}
-     *
-     */
-
-    public final PutIndicesSettingsResponse putSettings(
-        Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
-    }
-
-    /**
-     * Updates the index settings.
-     *
-     *
-     */
-
-    public PutIndicesSettingsResponse putSettings() throws IOException, OpenSearchException {
-        return this.transport.performRequest(
-            new PutIndicesSettingsRequest.Builder().build(),
-            PutIndicesSettingsRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
-    // ----- Endpoint: indices.put_template
-
-    /**
-     * Creates or updates an index template.
-     *
-     *
-     */
-
-    public PutTemplateResponse putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            PutTemplateRequest,
-            PutTemplateResponse,
-            ErrorResponse>) PutTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Creates or updates an index template.
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link PutTemplateRequest}
-     *
-     */
-
-    public final PutTemplateResponse putTemplate(Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn)
-        throws IOException, OpenSearchException {
-        return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
-    }
-
     // ----- Endpoint: indices.recovery
 
     /**
@@ -1272,53 +966,6 @@ public final ShrinkResponse shrink(Function<ShrinkRequest.Builder, ObjectBuilder
         return shrink(fn.apply(new ShrinkRequest.Builder()).build());
     }
 
-    // ----- Endpoint: indices.simulate_template
-
-    /**
-     * Simulate resolving the given template name or body
-     *
-     *
-     */
-
-    public SimulateTemplateResponse simulateTemplate(SimulateTemplateRequest request) throws IOException, OpenSearchException {
-        @SuppressWarnings("unchecked")
-        JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
-            SimulateTemplateRequest,
-            SimulateTemplateResponse,
-            ErrorResponse>) SimulateTemplateRequest._ENDPOINT;
-
-        return this.transport.performRequest(request, endpoint, this.transportOptions);
-    }
-
-    /**
-     * Simulate resolving the given template name or body
-     *
-     * @param fn
-     *            a function that initializes a builder to create the
-     *            {@link SimulateTemplateRequest}
-     *
-     */
-
-    public final SimulateTemplateResponse simulateTemplate(
-        Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn
-    ) throws IOException, OpenSearchException {
-        return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
-    }
-
-    /**
-     * Simulate resolving the given template name or body
-     *
-     *
-     */
-
-    public SimulateTemplateResponse simulateTemplate() throws IOException, OpenSearchException {
-        return this.transport.performRequest(
-            new SimulateTemplateRequest.Builder().build(),
-            SimulateTemplateRequest._ENDPOINT,
-            this.transportOptions
-        );
-    }
-
     // ----- Endpoint: indices.split
 
     /**
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
deleted file mode 100644
index 1722c85c63..0000000000
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.
- */
-
-package org.opensearch.client.opensearch.indices;
-
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-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.indices.simulate_template.Template;
-import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
-import org.opensearch.client.util.ObjectBuilderBase;
-
-// typedef: indices.simulate_template.Response
-
-@JsonpDeserializable
-public class SimulateTemplateResponse implements PlainJsonSerializable {
-    private final Template template;
-
-    // ---------------------------------------------------------------------------------------------
-
-    private SimulateTemplateResponse(Builder builder) {
-
-        this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
-
-    }
-
-    public static SimulateTemplateResponse of(Function<Builder, ObjectBuilder<SimulateTemplateResponse>> fn) {
-        return fn.apply(new Builder()).build();
-    }
-
-    /**
-     * Required - API name: {@code template}
-     */
-    public final Template template() {
-        return this.template;
-    }
-
-    /**
-     * Serialize this object to JSON.
-     */
-    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-        generator.writeStartObject();
-        serializeInternal(generator, mapper);
-        generator.writeEnd();
-    }
-
-    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-        generator.writeKey("template");
-        this.template.serialize(generator, mapper);
-
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
-    /**
-     * Builder for {@link SimulateTemplateResponse}.
-     */
-
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateTemplateResponse> {
-        private Template template;
-
-        /**
-         * Required - API name: {@code template}
-         */
-        public final Builder template(Template value) {
-            this.template = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code template}
-         */
-        public final Builder template(Function<Template.Builder, ObjectBuilder<Template>> fn) {
-            return this.template(fn.apply(new Template.Builder()).build());
-        }
-
-        /**
-         * Builds a {@link SimulateTemplateResponse}.
-         *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
-         */
-        public SimulateTemplateResponse build() {
-            _checkSingleUse();
-
-            return new SimulateTemplateResponse(this);
-        }
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
-    /**
-     * Json deserializer for {@link SimulateTemplateResponse}
-     */
-    public static final JsonpDeserializer<SimulateTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
-        Builder::new,
-        SimulateTemplateResponse::setupSimulateTemplateResponseDeserializer
-    );
-
-    protected static void setupSimulateTemplateResponseDeserializer(ObjectDeserializer<SimulateTemplateResponse.Builder> op) {
-
-        op.add(Builder::template, Template._DESERIALIZER, "template");
-
-    }
-
-}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/core/PutTemplateRequestTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/core/PutTemplateRequestTest.java
index 0ca7c53594..ab34c97984 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/core/PutTemplateRequestTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/core/PutTemplateRequestTest.java
@@ -29,7 +29,6 @@ public void deserialize_validFieldsIncluded_RequestIsBuilt() throws JsonProcessi
         final Map<String, Object> indexTemplateMap = new HashMap<>();
         indexTemplateMap.put("name", "test");
         indexTemplateMap.put("index_patterns", "*");
-        indexTemplateMap.put("create", true);
         indexTemplateMap.put("order", 1);
 
         final String indexTemplate = new ObjectMapper().writeValueAsString(indexTemplateMap);
@@ -37,9 +36,8 @@ public void deserialize_validFieldsIncluded_RequestIsBuilt() throws JsonProcessi
 
         final PutTemplateRequest putTemplateRequest = PutTemplateRequest._DESERIALIZER.deserialize(parser, mapper);
 
-        assertEquals(putTemplateRequest.name(), "test");
-        assertEquals(putTemplateRequest.indexPatterns(), Collections.singletonList("*"));
-        assertEquals((int) putTemplateRequest.order(), 1);
-        assertEquals(putTemplateRequest.create(), true);
+        assertEquals("test", putTemplateRequest.name());
+        assertEquals(Collections.singletonList("*"), putTemplateRequest.indexPatterns());
+        assertEquals((Integer) 1, putTemplateRequest.order());
     }
 }
diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts
index 1fb5b501ed..1936c59448 100644
--- a/java-codegen/build.gradle.kts
+++ b/java-codegen/build.gradle.kts
@@ -172,7 +172,7 @@ dependencies {
     implementation("org.semver4j", "semver4j", "5.3.0")
 
     // BSD-2-Clause
-    implementation("org.commonmark", "commonmark", "0.23.0")
+    implementation("org.commonmark", "commonmark", "0.24.0")
 
     // EPL-2.0
     testImplementation(platform("org.junit:junit-bom:5.11.3"))
diff --git a/java-codegen/opensearch-openapi.yaml b/java-codegen/opensearch-openapi.yaml
index d27c490eb4..7e7f867ab4 100644
--- a/java-codegen/opensearch-openapi.yaml
+++ b/java-codegen/opensearch-openapi.yaml
@@ -1205,6 +1205,7 @@ paths:
         - $ref: '#/components/parameters/cat.snapshots___query.help'
         - $ref: '#/components/parameters/cat.snapshots___query.ignore_unavailable'
         - $ref: '#/components/parameters/cat.snapshots___query.master_timeout'
+        - $ref: '#/components/parameters/cat.snapshots___query.repository'
         - $ref: '#/components/parameters/cat.snapshots___query.s'
         - $ref: '#/components/parameters/cat.snapshots___query.time'
         - $ref: '#/components/parameters/cat.snapshots___query.v'
@@ -1232,6 +1233,7 @@ paths:
         - $ref: '#/components/parameters/cat.snapshots___query.help'
         - $ref: '#/components/parameters/cat.snapshots___query.ignore_unavailable'
         - $ref: '#/components/parameters/cat.snapshots___query.master_timeout'
+        - $ref: '#/components/parameters/cat.snapshots___query.repository'
         - $ref: '#/components/parameters/cat.snapshots___query.s'
         - $ref: '#/components/parameters/cat.snapshots___query.time'
         - $ref: '#/components/parameters/cat.snapshots___query.v'
@@ -9485,6 +9487,7 @@ paths:
       operationId: indices.get_upgrade.0
       x-operation-group: indices.get_upgrade
       x-version-added: '1.0'
+      x-version-deprecated: '1.0'
       description: The `_upgrade` API is no longer useful and will be removed.
       externalDocs:
         url: https://opensearch.org/docs/latest
@@ -9504,6 +9507,7 @@ paths:
       operationId: indices.upgrade.0
       x-operation-group: indices.upgrade
       x-version-added: '1.0'
+      x-version-deprecated: '1.0'
       description: The `_upgrade` API is no longer useful and will be removed.
       externalDocs:
         url: https://opensearch.org/docs/latest
@@ -9518,6 +9522,8 @@ paths:
         - $ref: '#/components/parameters/_global___query.error_trace'
         - $ref: '#/components/parameters/_global___query.source'
         - $ref: '#/components/parameters/_global___query.filter_path'
+      requestBody:
+        $ref: '#/components/requestBodies/indices.upgrade'
       responses:
         '200':
           $ref: '#/components/responses/indices.upgrade___200'
@@ -12215,6 +12221,7 @@ paths:
       operationId: indices.get_upgrade.1
       x-operation-group: indices.get_upgrade
       x-version-added: '1.0'
+      x-version-deprecated: '1.0'
       description: The `_upgrade` API is no longer useful and will be removed.
       externalDocs:
         url: https://opensearch.org/docs/latest
@@ -12235,6 +12242,7 @@ paths:
       operationId: indices.upgrade.1
       x-operation-group: indices.upgrade
       x-version-added: '1.0'
+      x-version-deprecated: '1.0'
       description: The `_upgrade` API is no longer useful and will be removed.
       externalDocs:
         url: https://opensearch.org/docs/latest
@@ -12250,6 +12258,8 @@ paths:
         - $ref: '#/components/parameters/_global___query.error_trace'
         - $ref: '#/components/parameters/_global___query.source'
         - $ref: '#/components/parameters/_global___query.filter_path'
+      requestBody:
+        $ref: '#/components/requestBodies/indices.upgrade'
       responses:
         '200':
           $ref: '#/components/responses/indices.upgrade___200'
@@ -16583,6 +16593,17 @@ components:
       x-version-deprecated: '2.0'
       x-deprecation-message: To promote inclusive language, use `cluster_manager_timeout` instead.
       deprecated: true
+    cat.snapshots___query.repository:
+      in: query
+      name: repository
+      description: |-
+        A comma-separated list of snapshot repositories used to limit the request.
+        Accepts wildcard expressions.
+        `_all` returns all repositories.
+        If any repository fails during the request, OpenSearch returns an error.
+      required: true
+      schema:
+        $ref: '#/components/schemas/_common___Names'
     cat.snapshots___query.s:
       name: s
       in: query
@@ -20834,7 +20855,8 @@ components:
         Templates with lower 'order' values are merged first. Templates with higher
         'order' values are merged later, overriding templates with lower values.
       schema:
-        type: number
+        type: integer
+        format: int32
       style: form
     indices.recovery___path.index:
       in: path
@@ -26503,6 +26525,7 @@ components:
       content:
         application/json:
           schema:
+            title: settings
             $ref: '#/components/schemas/indices._common___IndexSettings'
       required: true
     indices.put_template:
@@ -26534,12 +26557,12 @@ components:
 
                   Templates with lower 'order' values are merged first. Templates with higher
                   'order' values are merged later, overriding templates with lower values.
-                type: number
+                type: integer
+                format: int32
               settings:
                 description: Configuration options for the index.
                 type: object
-                additionalProperties:
-                  type: object
+                additionalProperties: true
               version:
                 $ref: '#/components/schemas/_common___VersionNumber'
             description: The template definition
@@ -26629,6 +26652,7 @@ components:
       content:
         application/json:
           schema:
+            title: template
             $ref: '#/components/schemas/indices._common___IndexTemplate'
     indices.split:
       content:
@@ -26659,6 +26683,11 @@ components:
                   $ref: '#/components/schemas/indices.update_aliases___Action'
             description: The definition of `actions` to perform
       required: true
+    indices.upgrade:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/indices._common___UpgradeRequest'
     indices.validate_query:
       content:
         application/json:
@@ -26795,12 +26824,61 @@ components:
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/ml._common___CreateConnectorRequest'
+            type: object
+            properties:
+              name:
+                type: string
+              description:
+                type: string
+              version:
+                type: integer
+              protocol:
+                type: string
+              credential:
+                $ref: '#/components/schemas/ml._common___Credential'
+              parameters:
+                $ref: '#/components/schemas/ml._common___Parameters'
+              client_config:
+                $ref: '#/components/schemas/ml._common___ClientConfig'
+              actions:
+                type: array
+                items:
+                  $ref: '#/components/schemas/ml._common___Action'
+            required:
+              - actions
+              - credential
+              - description
+              - name
+              - parameters
+              - protocol
+              - version
     ml.register_agents:
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/ml._common___RegisterAgentsRequest'
+            type: object
+            properties:
+              name:
+                type: string
+              type:
+                type: string
+              description:
+                type: string
+              tools:
+                type: array
+                items:
+                  $ref: '#/components/schemas/ml._common___ToolItems'
+              parameters:
+                $ref: '#/components/schemas/ml._common___Parameters'
+              app_type:
+                type: string
+              memory:
+                $ref: '#/components/schemas/ml._common___Memory'
+              llm:
+                $ref: '#/components/schemas/ml._common___LLM'
+            required:
+              - name
+              - type
     ml.register_model:
       content:
         application/json:
@@ -26862,7 +26940,17 @@ components:
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/ml._common___SearchModelsQuery'
+            type: object
+            properties:
+              query:
+                type: object
+                description: The query.
+              size:
+                type: integer
+                description: The number of models to return.
+            required:
+              - query
+              - size
     msearch:
       content:
         application/x-ndjson:
@@ -29178,6 +29266,10 @@ components:
               $ref: '#/components/schemas/indices._common___TemplateMapping'
       description: ''
     indices.get_upgrade___200:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/indices._common___IndexGetUpgradeStatus'
       description: ''
     indices.get___200:
       content:
@@ -29415,6 +29507,10 @@ components:
             $ref: '#/components/schemas/_common___AcknowledgedResponseBase'
       description: ''
     indices.upgrade___200:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/indices._common___IndexPostUpgradeStatus'
       description: ''
     indices.validate_query___200:
       content:
@@ -30444,6 +30540,8 @@ components:
                     $ref: '#/components/schemas/_core.search___Suggest'
               terminated_early:
                 type: boolean
+              status:
+                type: number
             required:
               - _shards
               - hits
@@ -32095,13 +32193,39 @@ components:
           $ref: '#/components/schemas/_common___ByteCount'
       required:
         - size_in_bytes
+    _common___FieldSort:
+      oneOf:
+        - title: order
+          $ref: '#/components/schemas/_common___SortOrder'
+        - type: object
+          properties:
+            missing:
+              $ref: '#/components/schemas/_common___FieldValue'
+            mode:
+              $ref: '#/components/schemas/_common___SortMode'
+            nested:
+              $ref: '#/components/schemas/_common___NestedSortValue'
+            order:
+              $ref: '#/components/schemas/_common___SortOrder'
+            unmapped_type:
+              $ref: '#/components/schemas/_common.mapping___FieldType'
+            numeric_type:
+              $ref: '#/components/schemas/_common___FieldSortNumericType'
+            format:
+              type: string
+    _common___FieldSortNumericType:
+      type: string
+      enum:
+        - date
+        - date_nanos
+        - double
+        - long
     _common___FieldValue:
       description: A field value.
       type:
         - boolean
         - 'null'
         - number
-        - object
         - string
     _common___FlushStats:
       type: object
@@ -33527,18 +33651,44 @@ components:
         - min
         - sum
     _common___SortOptions:
-      type: object
-      properties:
-        _score:
-          $ref: '#/components/schemas/_common___ScoreSort'
-        _doc:
-          $ref: '#/components/schemas/_common___ScoreSort'
-        _geo_distance:
-          $ref: '#/components/schemas/_common___GeoDistanceSort'
-        _script:
-          $ref: '#/components/schemas/_common___ScriptSort'
-      minProperties: 1
-      maxProperties: 1
+      oneOf:
+        - type: string
+          const: _score
+        - type: string
+          const: _doc
+        - type: string
+          not:
+            type: string
+            enum:
+              - _doc
+              - _score
+        - type: object
+          properties:
+            _score:
+              $ref: '#/components/schemas/_common___ScoreSort'
+            _doc:
+              $ref: '#/components/schemas/_common___ScoreSort'
+            _geo_distance:
+              $ref: '#/components/schemas/_common___GeoDistanceSort'
+            _script:
+              $ref: '#/components/schemas/_common___ScriptSort'
+          minProperties: 1
+          maxProperties: 1
+        - type: object
+          propertyNames:
+            allOf:
+              - $ref: '#/components/schemas/_common___Field'
+              - not:
+                  type: string
+                  enum:
+                    - _score
+                    - _doc
+                    - _geo_distance
+                    - _script
+          additionalProperties:
+            $ref: '#/components/schemas/_common___FieldSort'
+          minProperties: 1
+          maxProperties: 1
     _common___SortOrder:
       type: string
       enum:
@@ -39646,6 +39796,55 @@ components:
           type: boolean
       required:
         - enabled
+    _common.mapping___FieldType:
+      type: string
+      enum:
+        - aggregate_metric_double
+        - alias
+        - binary
+        - boolean
+        - byte
+        - completion
+        - constant_keyword
+        - date
+        - date_nanos
+        - date_range
+        - double
+        - double_range
+        - flat_object
+        - float
+        - float_range
+        - geo_point
+        - geo_shape
+        - half_float
+        - histogram
+        - icu_collation_keyword
+        - integer
+        - integer_range
+        - ip
+        - ip_range
+        - join
+        - keyword
+        - knn_vector
+        - long
+        - long_range
+        - match_only_text
+        - murmur3
+        - nested
+        - object
+        - percolator
+        - rank_feature
+        - rank_features
+        - scaled_float
+        - search_as_you_type
+        - short
+        - text
+        - token_count
+        - unsigned_long
+        - version
+        - wildcard
+        - xy_point
+        - xy_shape
     _common.mapping___FlatObjectProperty:
       allOf:
         - $ref: '#/components/schemas/_common.mapping___PropertyBase'
@@ -42525,8 +42724,12 @@ components:
       allOf:
         - $ref: '#/components/schemas/_common.query_dsl___QueryBase'
         - type: object
+          properties:
+            _name: {}
+            boost: {}
           additionalProperties:
             $ref: '#/components/schemas/_common.query_dsl___TermsQueryField'
+          minProperties: 1
     _common.query_dsl___TermsQueryField:
       oneOf:
         - title: value
@@ -42559,18 +42762,6 @@ components:
         - most_fields
         - phrase
         - phrase_prefix
-    _common.query_dsl___TokenPruningConfig:
-      type: object
-      properties:
-        tokens_freq_ratio_threshold:
-          description: Tokens whose frequency is more than this threshold times the average frequency of all tokens in the specified field are considered outliers and pruned.
-          type: number
-        tokens_weight_threshold:
-          description: Tokens whose weight is less than this threshold are considered nonsignificant and pruned.
-          type: number
-        only_score_pruned_tokens:
-          description: Whether to only score pruned tokens, vs only scoring kept tokens.
-          type: boolean
     _common.query_dsl___TypeQuery:
       allOf:
         - $ref: '#/components/schemas/_common.query_dsl___QueryBase'
@@ -43296,6 +43487,8 @@ components:
           $ref: '#/components/schemas/_common___IndexName'
         _score:
           type: number
+        _type:
+          $ref: '#/components/schemas/_common___Type'
       required:
         - _id
         - _index
@@ -43353,7 +43546,7 @@ components:
           additionalProperties:
             type: object
             additionalProperties:
-              type: object
+              type: number
       required:
         - hits
         - metric_details
@@ -49101,6 +49294,19 @@ components:
       additionalProperties:
         title: metadata
         description: Additional details about the error.
+    indices._common___IndexGetUpgradeStatus:
+      type: object
+      properties:
+        size_in_bytes:
+          $ref: '#/components/schemas/_common___ByteCount'
+        size_to_upgrade_in_bytes:
+          $ref: '#/components/schemas/_common___ByteCount'
+        size_to_upgrade_ancient_in_bytes:
+          $ref: '#/components/schemas/_common___ByteCount'
+        indices:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/indices._common___UpgradeStatus'
     indices._common___IndexingPressure:
       type: object
       properties:
@@ -49136,6 +49342,15 @@ components:
       properties:
         index:
           $ref: '#/components/schemas/indices._common___SlowlogThresholdLevels'
+    indices._common___IndexPostUpgradeStatus:
+      type: object
+      properties:
+        _shards:
+          $ref: '#/components/schemas/_common___ShardStatistics'
+        upgraded_indices:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/indices._common___UpgradeVersionStatus'
     indices._common___IndexRouting:
       type: object
       properties:
@@ -50060,11 +50275,11 @@ components:
         mappings:
           $ref: '#/components/schemas/_common.mapping___TypeMapping'
         order:
-          type: number
+          type: integer
+          format: int32
         settings:
           type: object
-          additionalProperties:
-            type: object
+          additionalProperties: true
         version:
           $ref: '#/components/schemas/_common___VersionNumber'
       required:
@@ -50100,6 +50315,38 @@ components:
           $ref: '#/components/schemas/_common___HumanReadableByteCount'
         age:
           $ref: '#/components/schemas/_common___Duration'
+    indices._common___UpgradeRequest:
+      type: object
+      properties:
+        allow_no_indices:
+          type: boolean
+        expand_wildcards:
+          type: string
+          enum:
+            - all
+            - closed
+            - none
+            - open
+        ignore_unavailable:
+          type: boolean
+        wait_for_completion:
+          type: boolean
+    indices._common___UpgradeStatus:
+      type: object
+      properties:
+        size_in_bytes:
+          $ref: '#/components/schemas/_common___ByteCount'
+        size_to_upgrade_in_bytes:
+          $ref: '#/components/schemas/_common___ByteCount'
+        size_to_upgrade_ancient_in_bytes:
+          $ref: '#/components/schemas/_common___ByteCount'
+    indices._common___UpgradeVersionStatus:
+      type: object
+      properties:
+        upgrade_version:
+          $ref: '#/components/schemas/_common___VersionString'
+        oldest_lucene_segment_version:
+          $ref: '#/components/schemas/_common___VersionString'
     indices.add_block___IndicesBlockOptions:
       type: string
       enum:
@@ -52730,35 +52977,6 @@ components:
           type: integer
         retry_timeout_seconds:
           type: integer
-    ml._common___CreateConnectorRequest:
-      type: object
-      properties:
-        name:
-          type: string
-        description:
-          type: string
-        version:
-          type: integer
-        protocol:
-          type: string
-        credential:
-          $ref: '#/components/schemas/ml._common___Credential'
-        parameters:
-          $ref: '#/components/schemas/ml._common___Parameters'
-        client_config:
-          $ref: '#/components/schemas/ml._common___ClientConfig'
-        actions:
-          type: array
-          items:
-            $ref: '#/components/schemas/ml._common___Action'
-      required:
-        - actions
-        - credential
-        - description
-        - name
-        - parameters
-        - protocol
-        - version
     ml._common___Credential:
       type: object
       properties:
@@ -52857,30 +53075,6 @@ components:
     ml._common___Parameters:
       type: object
       additionalProperties: true
-    ml._common___RegisterAgentsRequest:
-      type: object
-      properties:
-        name:
-          type: string
-        type:
-          type: string
-        description:
-          type: string
-        tools:
-          type: array
-          items:
-            $ref: '#/components/schemas/ml._common___ToolItems'
-        parameters:
-          $ref: '#/components/schemas/ml._common___Parameters'
-        app_type:
-          type: string
-        memory:
-          $ref: '#/components/schemas/ml._common___Memory'
-        llm:
-          $ref: '#/components/schemas/ml._common___LLM'
-      required:
-        - name
-        - type
     ml._common___SearchModelsHits:
       type: object
       properties:
@@ -52921,18 +53115,6 @@ components:
           $ref: '#/components/schemas/_common___Name'
       required:
         - _score
-    ml._common___SearchModelsQuery:
-      type: object
-      properties:
-        query:
-          type: object
-          description: The query.
-        size:
-          type: integer
-          description: The number of models to return.
-      required:
-        - query
-        - size
     ml._common___SearchModelsResponse:
       type: object
       properties:
@@ -54959,8 +55141,7 @@ components:
         - name
     nodes.info___NodeInfoSettingsPlugins:
       type: object
-      additionalProperties:
-        $ref: '#/components/schemas/_common___FieldValue'
+      additionalProperties: true
     nodes.info___NodeInfoSettingsTransport:
       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 d1c171e4c6..9cea817077 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
@@ -8,11 +8,15 @@
 
 package org.opensearch.client.codegen;
 
-import static org.opensearch.client.codegen.model.OperationGroupMatcher.and;
-import static org.opensearch.client.codegen.model.OperationGroupMatcher.named;
+import static org.opensearch.client.codegen.model.OperationGroupMatcher.name;
 import static org.opensearch.client.codegen.model.OperationGroupMatcher.namespace;
-import static org.opensearch.client.codegen.model.OperationGroupMatcher.not;
-import static org.opensearch.client.codegen.model.OperationGroupMatcher.or;
+import static org.opensearch.client.codegen.utils.matcher.Matcher.and;
+import static org.opensearch.client.codegen.utils.matcher.Matcher.is;
+import static org.opensearch.client.codegen.utils.matcher.Matcher.isNot;
+import static org.opensearch.client.codegen.utils.matcher.Matcher.isNull;
+import static org.opensearch.client.codegen.utils.matcher.Matcher.isOneOf;
+import static org.opensearch.client.codegen.utils.matcher.Matcher.or;
+import static org.opensearch.client.codegen.utils.matcher.StringMatcher.endsWith;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,34 +36,38 @@
 import org.opensearch.client.codegen.exceptions.ApiSpecificationParseException;
 import org.opensearch.client.codegen.exceptions.RenderException;
 import org.opensearch.client.codegen.model.Namespace;
-import org.opensearch.client.codegen.model.OperationGroupMatcher;
+import org.opensearch.client.codegen.model.OperationGroup;
 import org.opensearch.client.codegen.model.ShapeRenderingContext;
 import org.opensearch.client.codegen.model.SpecTransformer;
 import org.opensearch.client.codegen.model.overrides.Overrides;
 import org.opensearch.client.codegen.openapi.OpenApiSpecification;
+import org.opensearch.client.codegen.utils.matcher.Matcher;
 
 public class CodeGenerator {
     private static final Logger LOGGER = LogManager.getLogger();
-    private static final OperationGroupMatcher OPERATION_MATCHER = or(
-        and(namespace(""), named("info")),
-        namespace("dangling_indices"),
+    private static final Matcher<OperationGroup> OPERATION_MATCHER = or(
+        and(namespace(isNull()), name(is("info"))),
+        namespace(is("dangling_indices")),
         and(
-            namespace("indices"),
-            named(
-                "create",
-                "delete",
-                "delete_index_template",
-                "exists",
-                "exists_index_template",
-                "get",
-                "get_index_template",
-                "put_index_template",
-                "simulate_index_template"
+            namespace(is("indices")),
+            name(
+                or(
+                    and(endsWith("mapping"), isNot("get_field_mapping")),
+                    endsWith("settings"),
+                    endsWith("template"),
+                    isOneOf("create", "delete", "exists", "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", "create", "get", "verify_repository")),
-        and(namespace("tasks"))
+        and(
+            namespace(is("ml")),
+            name(
+                // TODO: search_models is complex and ideally should re-use the search structures
+                isNot("search_models")
+            )
+        ),
+        and(namespace(is("snapshot")), name(isOneOf("cleanup_repository", "clone", "create", "get", "verify_repository"))),
+        and(namespace(is("tasks")))
     );
 
     public static void main(String[] args) {
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Field.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Field.java
index 41c72ed35e..e7c4f2e06e 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Field.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Field.java
@@ -50,7 +50,7 @@ private Field(@Nonnull Builder builder) {
         }
         this.type = Objects.requireNonNull(builder.type, "type must not be null");
         this.required = builder.required;
-        this.description = builder.description != null ? Markdown.toJavaDocHtml(builder.description) : null;
+        this.description = builder.description;
         this.deprecation = builder.deprecation;
         this.aliases = builder.aliases;
     }
@@ -156,7 +156,7 @@ public Builder withRequired(boolean required) {
 
         @Nonnull
         public Builder withDescription(@Nullable String description) {
-            this.description = description;
+            this.description = description != null ? Markdown.toJavaDocHtml(description) : null;
             return this;
         }
 
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/OperationGroupMatcher.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/OperationGroupMatcher.java
index 6a33bf3f81..03a9e27eca 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/OperationGroupMatcher.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/OperationGroupMatcher.java
@@ -8,54 +8,16 @@
 
 package org.opensearch.client.codegen.model;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import javax.annotation.Nonnull;
+import org.opensearch.client.codegen.utils.matcher.Matcher;
 
-@FunctionalInterface
-public interface OperationGroupMatcher {
-    boolean matches(OperationGroup group);
+public final class OperationGroupMatcher {
+    private OperationGroupMatcher() {}
 
-    static OperationGroupMatcher all() {
-        return group -> true;
+    public static Matcher<OperationGroup> name(Matcher<String> nameMatcher) {
+        return group -> nameMatcher.matches(group.getName());
     }
 
-    static OperationGroupMatcher none() {
-        return group -> false;
-    }
-
-    static OperationGroupMatcher not(OperationGroupMatcher matcher) {
-        return group -> !matcher.matches(group);
-    }
-
-    static OperationGroupMatcher or(OperationGroupMatcher... matchers) {
-        return group -> {
-            for (OperationGroupMatcher matcher : matchers) {
-                if (matcher.matches(group)) {
-                    return true;
-                }
-            }
-            return false;
-        };
-    }
-
-    static OperationGroupMatcher and(OperationGroupMatcher... matchers) {
-        return group -> {
-            for (OperationGroupMatcher matcher : matchers) {
-                if (!matcher.matches(group)) {
-                    return false;
-                }
-            }
-            return true;
-        };
-    }
-
-    static OperationGroupMatcher named(String... names) {
-        var set = new HashSet<>(Arrays.asList(names));
-        return group -> set.contains(group.getName());
-    }
-
-    static OperationGroupMatcher namespace(@Nonnull String namespace) {
-        return group -> namespace.equals(group.getNamespace().orElse(""));
+    public static Matcher<OperationGroup> namespace(Matcher<String> namespaceMatcher) {
+        return group -> namespaceMatcher.matches(group.getNamespace().orElse(null));
     }
 }
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/RequestShape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/RequestShape.java
index 254b33a272..c806b31fee 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/RequestShape.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/RequestShape.java
@@ -37,6 +37,8 @@ public class RequestShape extends ObjectShape {
     @Nonnull
     private final Map<String, Field> fields = new TreeMap<>();
     private boolean isBooleanRequest;
+    @Nullable
+    private Field delegatedBodyField;
 
     public RequestShape(
         @Nonnull Namespace parent,
@@ -105,8 +107,13 @@ public Collection<Field> getFieldsToDeserialize() {
         return fields.values();
     }
 
+    @Override
+    public boolean hasFieldsToSerialize() {
+        return hasRequestBody();
+    }
+
     public boolean hasRequestBody() {
-        return !getBodyFields().isEmpty();
+        return hasDelegatedBodyField() || !getBodyFields().isEmpty();
     }
 
     public void addQueryParam(Field field) {
@@ -162,6 +169,19 @@ public void addBodyField(Field field) {
         addField(field);
     }
 
+    public void setDelegatedBodyField(String name, Type type) {
+        this.delegatedBodyField = Field.builder().withName(name).withType(type).withRequired(true).withDescription("Request body.").build();
+        addField(this.delegatedBodyField);
+    }
+
+    public boolean hasDelegatedBodyField() {
+        return delegatedBodyField != null;
+    }
+
+    public Field getDelegatedBodyField() {
+        return delegatedBodyField;
+    }
+
     private void addField(Field field) {
         fields.put(field.getName(), field);
         tryAddReference(ReferenceKind.Field, field.getType());
@@ -205,6 +225,10 @@ private static String classBaseName(@Nonnull OperationGroup operationGroup) {
                 return "DeleteIndex";
             case "indices.get":
                 return "GetIndex";
+            case "indices.get_settings":
+                return "GetIndicesSettings";
+            case "indices.put_settings":
+                return "PutIndicesSettings";
             case "snapshot.clone":
                 return "CloneSnapshot";
             case "snapshot.create":
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Shape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Shape.java
index 548358a0cc..9ea6af1ea2 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Shape.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Shape.java
@@ -104,7 +104,7 @@ public boolean extendedByOtherShape() {
     }
 
     public Collection<ReferencingDiscriminatedUnion> getReferencingDiscriminatedUnions() {
-        return getIncomingReference(ReferenceKind.UnionVariant).stream()
+        var unions = getIncomingReference(ReferenceKind.UnionVariant).stream()
             .map(s -> (TaggedUnionShape) s)
             .distinct()
             .filter(TaggedUnionShape::isDiscriminated)
@@ -120,6 +120,15 @@ public Collection<ReferencingDiscriminatedUnion> getReferencingDiscriminatedUnio
                 return new ReferencingDiscriminatedUnion(u, discriminatorValue);
             })
             .collect(Collectors.toList());
+
+        // Temporary hack until SortOptions is properly generated
+        if (parent.getName().equals("_types") && className.equals("ScriptSort")) {
+            unions.add(
+                new ReferencingDiscriminatedUnion(new TaggedUnionShape(parent, "SortOptions", null, null, ShouldGenerate.Never), "script")
+            );
+        }
+
+        return unions;
     }
 
     public Collection<Type> getImplementsTypes() {
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 a9fcbf4f6a..66804fe4ae 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
@@ -20,6 +20,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import org.apache.commons.lang3.NotImplementedException;
@@ -46,11 +47,12 @@
 import org.opensearch.client.codegen.utils.Maps;
 import org.opensearch.client.codegen.utils.NameSanitizer;
 import org.opensearch.client.codegen.utils.Versions;
+import org.opensearch.client.codegen.utils.matcher.Matcher;
 
 public class SpecTransformer {
     private static final Logger LOGGER = LogManager.getLogger();
     @Nonnull
-    private final OperationGroupMatcher matcher;
+    private final Matcher<OperationGroup> matcher;
     @Nonnull
     private final Overrides overrides;
     @Nonnull
@@ -60,7 +62,7 @@ public class SpecTransformer {
     @Nonnull
     private final Map<OpenApiSchema, Type> schemaToType = new ConcurrentHashMap<>();
 
-    public SpecTransformer(@Nonnull OperationGroupMatcher matcher, @Nonnull Overrides overrides) {
+    public SpecTransformer(@Nonnull Matcher<OperationGroup> matcher, @Nonnull Overrides overrides) {
         this.matcher = Objects.requireNonNull(matcher, "matcher must not be null");
         this.overrides = Objects.requireNonNull(overrides, "overrides must not be null");
     }
@@ -213,12 +215,6 @@ private RequestShape visit(@Nonnull Namespace parent, @Nonnull OperationGroup gr
             shape.addPathParam(entry.getValue().toBuilder().withRequired(requiredPathParams.contains(entry.getKey())).build());
         }
 
-        variants.stream()
-            .flatMap(v -> v.getAllRelevantParameters(In.Query).stream())
-            .filter(p -> !p.isGlobal())
-            .map(this::visit)
-            .forEachOrdered(shape::addQueryParam);
-
         variants.stream()
             .map(OpenApiOperation::getRequestBody)
             .flatMap(Optional::stream)
@@ -227,8 +223,24 @@ private RequestShape visit(@Nonnull Namespace parent, @Nonnull OperationGroup gr
             .flatMap(OpenApiRequestBody::getContent)
             .flatMap(c -> c.get(MimeType.Json))
             .flatMap(OpenApiMediaType::getSchema)
-            .map(OpenApiSchema::resolve)
-            .ifPresent(s -> visitInto(s, shape));
+            .ifPresent(s -> {
+                if (s.has$ref()) {
+                    var name = s.getTitle().or(() -> s.resolve().getName()).orElseThrow();
+                    shape.setDelegatedBodyField(name, mapType(s));
+                } else {
+                    visitInto(s.resolve(), shape);
+                }
+            });
+
+        var bodyFieldNames = (shape.hasDelegatedBodyField()
+            ? (ObjectShapeBase) shape.getDelegatedBodyField().getType().getTargetShape().orElseThrow()
+            : shape).getBodyFields().stream().map(Field::getWireName).collect(Collectors.toSet());
+
+        variants.stream()
+            .flatMap(v -> v.getAllRelevantParameters(In.Query).stream())
+            .filter(p -> !p.isGlobal() && !bodyFieldNames.contains(p.getName().orElseThrow()))
+            .map(this::visit)
+            .forEachOrdered(shape::addQueryParam);
 
         if (shape.getExtendsType() == null) {
             shape.setExtendsType(Types.Client.OpenSearch._Types.RequestBase);
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 23bb821bff..99f90a1b82 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
@@ -42,7 +42,10 @@ private static JsonPointer schema(String namespace, String name) {
             .with(schema("_common", "GeoShapeRelation"), so -> so.withShouldGenerate(ShouldGenerate.Always))
 
             .with(schema("_common", "ScriptSort"), so -> so.withShouldGenerate(ShouldGenerate.Always))
-            .with(schema("_common", "SortOptions"), so -> so.withShouldGenerate(ShouldGenerate.Never))
+            .with(
+                schema("_common", "SortOptions"),
+                so -> so.withMappedType(t -> t.withPackage(Types.Client.OpenSearch._Types.PACKAGE).withName("SortOptions"))
+            )
 
             .with(
                 schema("_common.aggregations", "AggregationContainer"),
@@ -67,7 +70,7 @@ private static JsonPointer schema(String namespace, String name) {
             .with(schema("_common.query_dsl", "RankFeatureFunctionSigmoid"), so -> so.withShouldGenerate(ShouldGenerate.Never))
             .with(
                 schema("_common.query_dsl", "SpanGapQuery"),
-                so -> so.withMappedType(t -> t.withPackage("org.opensearch.client.opensearch._types.query_dsl").withName("SpanGapQuery"))
+                so -> so.withMappedType(t -> t.withPackage(Types.Client.OpenSearch._Types.PACKAGE + ".query_dsl").withName("SpanGapQuery"))
             )
             .with(schema("_common.query_dsl", "TermsQuery"), so -> so.withShouldGenerate(ShouldGenerate.Never))
             .with(schema("_common.query_dsl", "TermsQueryField"), so -> so.withShouldGenerate(ShouldGenerate.Always))
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/utils/matcher/Matcher.java b/java-codegen/src/main/java/org/opensearch/client/codegen/utils/matcher/Matcher.java
new file mode 100644
index 0000000000..350a7092f6
--- /dev/null
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/utils/matcher/Matcher.java
@@ -0,0 +1,71 @@
+/*
+ * 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.utils.matcher;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Objects;
+
+public interface Matcher<T> {
+    boolean matches(T t);
+
+    static <T> Matcher<T> all() {
+        return t -> true;
+    }
+
+    static <T> Matcher<T> none() {
+        return t -> false;
+    }
+
+    static <T> Matcher<T> not(Matcher<T> matcher) {
+        return t -> !matcher.matches(t);
+    }
+
+    @SafeVarargs
+    static <T> Matcher<T> or(Matcher<T>... matchers) {
+        return t -> {
+            for (Matcher<T> matcher : matchers) {
+                if (matcher.matches(t)) {
+                    return true;
+                }
+            }
+            return false;
+        };
+    }
+
+    @SafeVarargs
+    static <T> Matcher<T> and(Matcher<T>... matchers) {
+        return t -> {
+            for (Matcher<T> matcher : matchers) {
+                if (!matcher.matches(t)) {
+                    return false;
+                }
+            }
+            return true;
+        };
+    }
+
+    static <T> Matcher<T> isNull() {
+        return Objects::isNull;
+    }
+
+    static <T> Matcher<T> is(T value) {
+        return v -> Objects.equals(v, value);
+    }
+
+    static <T> Matcher<T> isNot(T value) {
+        return not(is(value));
+    }
+
+    @SafeVarargs
+    static <T> Matcher<T> isOneOf(T... values) {
+        var set = new HashSet<>(Arrays.asList(values));
+        return set::contains;
+    }
+}
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/utils/matcher/StringMatcher.java b/java-codegen/src/main/java/org/opensearch/client/codegen/utils/matcher/StringMatcher.java
new file mode 100644
index 0000000000..445f09fdbf
--- /dev/null
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/utils/matcher/StringMatcher.java
@@ -0,0 +1,17 @@
+/*
+ * 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.utils.matcher;
+
+public final class StringMatcher {
+    private StringMatcher() {}
+
+    public static Matcher<String> endsWith(String suffix) {
+        return s -> s.endsWith(suffix);
+    }
+}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape.mustache
index 149bb52a96..4a1fb00565 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape.mustache
@@ -17,7 +17,7 @@
     {{>ObjectShape/Getters}}
 
 {{#hasRequestBody}}
-    {{>ObjectShape/Serialize}}
+    {{>RequestShape/Serialize}}
 {{/hasRequestBody}}
 
     // ---------------------------------------------------------------------------------------------
@@ -29,7 +29,7 @@
 
     // ---------------------------------------------------------------------------------------------
 
-    {{>ObjectShape/Deserialize}}
+    {{>RequestShape/Deserialize}}
 
 {{/hasRequestBody}}
 {{/canBeSingleton}}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape/Deserialize.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape/Deserialize.mustache
new file mode 100644
index 0000000000..1462874853
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape/Deserialize.mustache
@@ -0,0 +1,14 @@
+{{#hasDelegatedBodyField}}
+    public static final {{TYPES.Client.Json.JsonpDeserializer}}<{{className}}> _DESERIALIZER = create{{className}}Deserializer();
+
+    protected static {{TYPES.Client.Json.JsonpDeserializer}}<{{className}}> create{{className}}Deserializer() {
+        {{TYPES.Client.Json.JsonpDeserializer}}<{{delegatedBodyField.type}}> valueDeserializer = {{delegatedBodyField.type}}._DESERIALIZER;
+        return {{TYPES.Client.Json.JsonpDeserializer}}.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().{{delegatedBodyField.name}}(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
+{{/hasDelegatedBodyField}}
+{{^hasDelegatedBodyField}}
+    {{>ObjectShape/Deserialize}}
+{{/hasDelegatedBodyField}}
\ No newline at end of file
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape/Serialize.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape/Serialize.mustache
new file mode 100644
index 0000000000..a635e0ec13
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape/Serialize.mustache
@@ -0,0 +1,12 @@
+{{#hasDelegatedBodyField}}
+    /**
+    * Serialize this value to JSON.
+    */
+    @Override
+    public void serialize({{TYPES.Jakarta.Json.Stream.JsonGenerator}} generator, {{TYPES.Client.Json.JsonpMapper}} mapper) {
+        {{#delegatedBodyField.type.directSerializer}}this.{{delegatedBodyField.name}}{{/delegatedBodyField.type.directSerializer}}
+    }
+{{/hasDelegatedBodyField}}
+{{^hasDelegatedBodyField}}
+    {{>ObjectShape/Serialize}}
+{{/hasDelegatedBodyField}}
\ No newline at end of file
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/queryParamify.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/queryParamify.mustache
index ebdacdc7ae..9219fc912f 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/queryParamify.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/queryParamify.mustache
@@ -1,7 +1,15 @@
-{{#type.isString}}
-    {{value}}
-{{/type.isString}}
-{{^type.isString}}
+{{#type.isList}}
+    {{#type.listValueType.isString}}
+        String.join(",", {{value}})
+    {{/type.listValueType.isString}}
+    {{^type.listValueType.isString}}
+        {{value}}
+        .stream()
+        .map(v -> {{#type.listValueType.queryParamify}}v{{/type.listValueType.queryParamify}})
+        .collect({{TYPES.Java.Util.Stream.Collectors}}.joining(","))
+    {{/type.listValueType.isString}}
+{{/type.isList}}
+{{^type.isList}}
     {{#type.isEnum}}
         {{value}}.jsonValue()
     {{/type.isEnum}}
@@ -10,20 +18,17 @@
             String.valueOf({{value}})
         {{/type.isPotentiallyBoxedPrimitive}}
         {{^type.isPotentiallyBoxedPrimitive}}
-            {{#type.isList}}
-                {{#type.listValueType.isString}}
-                    String.join(",", {{value}})
-                {{/type.listValueType.isString}}
-                {{^type.listValueType.isString}}
+            {{#type.isNumber}}
+                String.valueOf({{value}})
+            {{/type.isNumber}}
+            {{^type.isNumber}}
+                {{#type.isString}}
                     {{value}}
-                        .stream()
-                        .map(v -> {{#type.listValueType.queryParamify}}v{{/type.listValueType.queryParamify}})
-                        .collect({{TYPES.Java.Util.Stream.Collectors}}.joining(","))
-                {{/type.listValueType.isString}}
-            {{/type.isList}}
-            {{^type.isList}}
-                {{value}}._toJsonString()
-            {{/type.isList}}
+                {{/type.isString}}
+                {{^type.isString}}
+                    {{value}}._toJsonString()
+                {{/type.isString}}
+            {{/type.isNumber}}
         {{/type.isPotentiallyBoxedPrimitive}}
     {{/type.isEnum}}
-{{/type.isString}}
+{{/type.isList}}
\ No newline at end of file