diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d3fd71b5..4687e56ca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased 2.x]
 ### Added
+- Add `hashCode` and `equals` implementations ([#312](https://github.com/opensearch-project/opensearch-java/pull/312)).
 
 ### Dependencies
 - Bumps `org.junit:junit-bom` from 5.10.3 to 5.11.1
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ErrorCause.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ErrorCause.java
index c029456c39..36a0c74b71 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ErrorCause.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ErrorCause.java
@@ -40,8 +40,10 @@
 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;
@@ -66,15 +68,19 @@ public class ErrorCause implements PlainJsonSerializable {
     @Nullable
     private final String reason;
 
+    @Nonnull
     private final List<ErrorCause> rootCause;
 
     @Nullable
     private final String stackTrace;
 
+    @Nonnull
     private final List<ErrorCause> suppressed;
 
+    @Nonnull
     private final String type;
 
+    @Nonnull
     private final Map<String, JsonData> metadata;
 
     // ---------------------------------------------------------------------------------------------
@@ -115,6 +121,7 @@ public final String reason() {
     /**
      * API name: {@code root_cause}
      */
+    @Nonnull
     public final List<ErrorCause> rootCause() {
         return this.rootCause;
     }
@@ -133,6 +140,7 @@ public final String stackTrace() {
     /**
      * API name: {@code suppressed}
      */
+    @Nonnull
     public final List<ErrorCause> suppressed() {
         return this.suppressed;
     }
@@ -143,6 +151,7 @@ public final List<ErrorCause> suppressed() {
      * API name: {@code type}
      * </p>
      */
+    @Nonnull
     public final String type() {
         return this.type;
     }
@@ -150,6 +159,7 @@ public final String type() {
     /**
      * Additional details about the error.
      */
+    @Nonnull
     public final Map<String, JsonData> metadata() {
         return this.metadata;
     }
@@ -404,4 +414,29 @@ protected static void setupErrorCauseDeserializer(ObjectDeserializer<ErrorCause.
             builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
         });
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.causedBy);
+        result = 31 * result + Objects.hashCode(this.reason);
+        result = 31 * result + Objects.hashCode(this.rootCause);
+        result = 31 * result + Objects.hashCode(this.stackTrace);
+        result = 31 * result + Objects.hashCode(this.suppressed);
+        result = 31 * result + this.type.hashCode();
+        result = 31 * result + Objects.hashCode(this.metadata);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ErrorCause other = (ErrorCause) o;
+        return Objects.equals(this.causedBy, other.causedBy)
+            && Objects.equals(this.reason, other.reason)
+            && Objects.equals(this.rootCause, other.rootCause)
+            && Objects.equals(this.stackTrace, other.stackTrace)
+            && Objects.equals(this.suppressed, other.suppressed)
+            && this.type.equals(other.type)
+            && Objects.equals(this.metadata, other.metadata);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardFailure.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardFailure.java
index 2d45c839e0..36812d4783 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardFailure.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardFailure.java
@@ -37,8 +37,10 @@
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -62,6 +64,7 @@ public class ShardFailure implements PlainJsonSerializable {
     @Nullable
     private final String node;
 
+    @Nonnull
     private final ErrorCause reason;
 
     private final int shard;
@@ -102,6 +105,7 @@ public final String node() {
     /**
      * Required - API name: {@code reason}
      */
+    @Nonnull
     public final ErrorCause reason() {
         return this.reason;
     }
@@ -245,4 +249,25 @@ protected static void setupShardFailureDeserializer(ObjectDeserializer<ShardFail
         op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
         op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.index);
+        result = 31 * result + Objects.hashCode(this.node);
+        result = 31 * result + this.reason.hashCode();
+        result = 31 * result + Integer.hashCode(this.shard);
+        result = 31 * result + Objects.hashCode(this.status);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ShardFailure other = (ShardFailure) o;
+        return Objects.equals(this.index, other.index)
+            && Objects.equals(this.node, other.node)
+            && this.reason.equals(other.reason)
+            && this.shard == other.shard
+            && Objects.equals(this.status, other.status);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardStatistics.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardStatistics.java
index 5f4edc4aef..53d36332e7 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardStatistics.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardStatistics.java
@@ -38,8 +38,10 @@
 
 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;
@@ -57,15 +59,19 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ShardStatistics implements PlainJsonSerializable {
 
+    @Nonnull
     private final Number failed;
 
+    @Nonnull
     private final List<ShardFailure> failures;
 
     @Nullable
     private final Number skipped;
 
+    @Nonnull
     private final Number successful;
 
+    @Nonnull
     private final Number total;
 
     // ---------------------------------------------------------------------------------------------
@@ -85,6 +91,7 @@ public static ShardStatistics of(Function<ShardStatistics.Builder, ObjectBuilder
     /**
      * Required - API name: {@code failed}
      */
+    @Nonnull
     public final Number failed() {
         return this.failed;
     }
@@ -92,6 +99,7 @@ public final Number failed() {
     /**
      * API name: {@code failures}
      */
+    @Nonnull
     public final List<ShardFailure> failures() {
         return this.failures;
     }
@@ -107,6 +115,7 @@ public final Number skipped() {
     /**
      * Required - API name: {@code successful}
      */
+    @Nonnull
     public final Number successful() {
         return this.successful;
     }
@@ -114,6 +123,7 @@ public final Number successful() {
     /**
      * Required - API name: {@code total}
      */
+    @Nonnull
     public final Number total() {
         return this.total;
     }
@@ -263,4 +273,25 @@ protected static void setupShardStatisticsDeserializer(ObjectDeserializer<ShardS
         op.add(Builder::successful, JsonpDeserializer.numberDeserializer(), "successful");
         op.add(Builder::total, JsonpDeserializer.numberDeserializer(), "total");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.failed.hashCode();
+        result = 31 * result + Objects.hashCode(this.failures);
+        result = 31 * result + Objects.hashCode(this.skipped);
+        result = 31 * result + this.successful.hashCode();
+        result = 31 * result + this.total.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ShardStatistics other = (ShardStatistics) o;
+        return this.failed.equals(other.failed)
+            && Objects.equals(this.failures, other.failures)
+            && Objects.equals(this.skipped, other.skipped)
+            && this.successful.equals(other.successful)
+            && this.total.equals(other.total);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
index 10fc56bb6b..851f7c50dd 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
@@ -37,8 +37,10 @@
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -56,16 +58,20 @@ public abstract class WriteResponseBase implements PlainJsonSerializable {
     @Nullable
     private final Boolean forcedRefresh;
 
+    @Nonnull
     private final String id;
 
+    @Nonnull
     private final String index;
 
     private final long primaryTerm;
 
+    @Nonnull
     private final Result result;
 
     private final long seqNo;
 
+    @Nonnull
     private final ShardStatistics shards;
 
     private final long version;
@@ -94,6 +100,7 @@ public final Boolean forcedRefresh() {
     /**
      * Required - API name: {@code _id}
      */
+    @Nonnull
     public final String id() {
         return this.id;
     }
@@ -101,6 +108,7 @@ public final String id() {
     /**
      * Required - API name: {@code _index}
      */
+    @Nonnull
     public final String index() {
         return this.index;
     }
@@ -115,6 +123,7 @@ public final long primaryTerm() {
     /**
      * Required - API name: {@code result}
      */
+    @Nonnull
     public final Result result() {
         return this.result;
     }
@@ -129,6 +138,7 @@ public final long seqNo() {
     /**
      * Required - API name: {@code _shards}
      */
+    @Nonnull
     public final ShardStatistics shards() {
         return this.shards;
     }
@@ -277,4 +287,31 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteRes
         op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
         op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.forcedRefresh);
+        result = 31 * result + this.id.hashCode();
+        result = 31 * result + this.index.hashCode();
+        result = 31 * result + Long.hashCode(this.primaryTerm);
+        result = 31 * result + this.result.hashCode();
+        result = 31 * result + Long.hashCode(this.seqNo);
+        result = 31 * result + this.shards.hashCode();
+        result = 31 * result + Long.hashCode(this.version);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        WriteResponseBase other = (WriteResponseBase) o;
+        return Objects.equals(this.forcedRefresh, other.forcedRefresh)
+            && this.id.equals(other.id)
+            && this.index.equals(other.index)
+            && this.primaryTerm == other.primaryTerm
+            && this.result.equals(other.result)
+            && this.seqNo == other.seqNo
+            && this.shards.equals(other.shards)
+            && this.version == other.version;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Action.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Action.java
index e9912634cc..38e6fa54af 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Action.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Action.java
@@ -13,6 +13,7 @@
 package org.opensearch.client.opensearch.ml;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nullable;
@@ -286,4 +287,29 @@ protected static void setupActionDeserializer(ObjectDeserializer<Action.Builder>
         op.add(Builder::requestBody, JsonpDeserializer.stringDeserializer(), "request_body");
         op.add(Builder::url, JsonpDeserializer.stringDeserializer(), "url");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.actionType);
+        result = 31 * result + Objects.hashCode(this.headers);
+        result = 31 * result + Objects.hashCode(this.method);
+        result = 31 * result + Objects.hashCode(this.postProcessFunction);
+        result = 31 * result + Objects.hashCode(this.preProcessFunction);
+        result = 31 * result + Objects.hashCode(this.requestBody);
+        result = 31 * result + Objects.hashCode(this.url);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Action other = (Action) o;
+        return Objects.equals(this.actionType, other.actionType)
+            && Objects.equals(this.headers, other.headers)
+            && Objects.equals(this.method, other.method)
+            && Objects.equals(this.postProcessFunction, other.postProcessFunction)
+            && Objects.equals(this.preProcessFunction, other.preProcessFunction)
+            && Objects.equals(this.requestBody, other.requestBody)
+            && Objects.equals(this.url, other.url);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ClientConfig.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ClientConfig.java
index e3907e7f59..bd03b5ec22 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ClientConfig.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ClientConfig.java
@@ -13,6 +13,7 @@
 package org.opensearch.client.opensearch.ml;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nullable;
@@ -279,4 +280,29 @@ protected static void setupClientConfigDeserializer(ObjectDeserializer<ClientCon
         op.add(Builder::retryBackoffPolicy, JsonpDeserializer.stringDeserializer(), "retry_backoff_policy");
         op.add(Builder::retryTimeoutSeconds, JsonpDeserializer.integerDeserializer(), "retry_timeout_seconds");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.connectionTimeout);
+        result = 31 * result + Objects.hashCode(this.maxConnection);
+        result = 31 * result + Objects.hashCode(this.maxRetryTimes);
+        result = 31 * result + Objects.hashCode(this.readTimeout);
+        result = 31 * result + Objects.hashCode(this.retryBackoffMillis);
+        result = 31 * result + Objects.hashCode(this.retryBackoffPolicy);
+        result = 31 * result + Objects.hashCode(this.retryTimeoutSeconds);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ClientConfig other = (ClientConfig) o;
+        return Objects.equals(this.connectionTimeout, other.connectionTimeout)
+            && Objects.equals(this.maxConnection, other.maxConnection)
+            && Objects.equals(this.maxRetryTimes, other.maxRetryTimes)
+            && Objects.equals(this.readTimeout, other.readTimeout)
+            && Objects.equals(this.retryBackoffMillis, other.retryBackoffMillis)
+            && Objects.equals(this.retryBackoffPolicy, other.retryBackoffPolicy)
+            && Objects.equals(this.retryTimeoutSeconds, other.retryTimeoutSeconds);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorRequest.java
index f9233dd6a9..569519e0a2 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorRequest.java
@@ -15,8 +15,10 @@
 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;
@@ -42,19 +44,25 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class CreateConnectorRequest extends RequestBase implements PlainJsonSerializable {
 
+    @Nonnull
     private final List<Action> actions;
 
     @Nullable
     private final ClientConfig clientConfig;
 
+    @Nonnull
     private final Credential credential;
 
+    @Nonnull
     private final String description;
 
+    @Nonnull
     private final String name;
 
+    @Nonnull
     private final Map<String, JsonData> parameters;
 
+    @Nonnull
     private final String protocol;
 
     private final int version;
@@ -79,6 +87,7 @@ public static CreateConnectorRequest of(Function<CreateConnectorRequest.Builder,
     /**
      * Required - API name: {@code actions}
      */
+    @Nonnull
     public final List<Action> actions() {
         return this.actions;
     }
@@ -94,6 +103,7 @@ public final ClientConfig clientConfig() {
     /**
      * Required - API name: {@code credential}
      */
+    @Nonnull
     public final Credential credential() {
         return this.credential;
     }
@@ -101,6 +111,7 @@ public final Credential credential() {
     /**
      * Required - API name: {@code description}
      */
+    @Nonnull
     public final String description() {
         return this.description;
     }
@@ -108,6 +119,7 @@ public final String description() {
     /**
      * Required - API name: {@code name}
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
@@ -115,6 +127,7 @@ public final String name() {
     /**
      * Required - API name: {@code parameters}
      */
+    @Nonnull
     public final Map<String, JsonData> parameters() {
         return this.parameters;
     }
@@ -122,6 +135,7 @@ public final Map<String, JsonData> parameters() {
     /**
      * Required - API name: {@code protocol}
      */
+    @Nonnull
     public final String protocol() {
         return this.protocol;
     }
@@ -365,4 +379,31 @@ protected static void setupCreateConnectorRequestDeserializer(ObjectDeserializer
         true,
         CreateConnectorResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.actions.hashCode();
+        result = 31 * result + Objects.hashCode(this.clientConfig);
+        result = 31 * result + this.credential.hashCode();
+        result = 31 * result + this.description.hashCode();
+        result = 31 * result + this.name.hashCode();
+        result = 31 * result + this.parameters.hashCode();
+        result = 31 * result + this.protocol.hashCode();
+        result = 31 * result + Integer.hashCode(this.version);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        CreateConnectorRequest other = (CreateConnectorRequest) o;
+        return this.actions.equals(other.actions)
+            && Objects.equals(this.clientConfig, other.clientConfig)
+            && this.credential.equals(other.credential)
+            && this.description.equals(other.description)
+            && this.name.equals(other.name)
+            && this.parameters.equals(other.parameters)
+            && this.protocol.equals(other.protocol)
+            && this.version == other.version;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorResponse.java
index 5bed16c40a..bed71edbbc 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateConnectorResponse.java
@@ -13,6 +13,7 @@
 package org.opensearch.client.opensearch.ml;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nullable;
@@ -111,4 +112,17 @@ public CreateConnectorResponse build() {
     protected static void setupCreateConnectorResponseDeserializer(ObjectDeserializer<CreateConnectorResponse.Builder> op) {
         op.add(Builder::connectorId, JsonpDeserializer.stringDeserializer(), "connector_id");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.connectorId);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        CreateConnectorResponse other = (CreateConnectorResponse) o;
+        return Objects.equals(this.connectorId, other.connectorId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Credential.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Credential.java
index 8e32830e5e..ef7dfb84ad 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Credential.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Credential.java
@@ -15,8 +15,10 @@
 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.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -44,6 +46,7 @@ public class Credential implements PlainJsonSerializable {
     @Nullable
     private final String sessionToken;
 
+    @Nonnull
     private final Map<String, JsonData> metadata;
 
     // ---------------------------------------------------------------------------------------------
@@ -85,6 +88,7 @@ public final String sessionToken() {
 
     /**
                                     */
+    @Nonnull
     public final Map<String, JsonData> metadata() {
         return this.metadata;
     }
@@ -214,4 +218,23 @@ protected static void setupCredentialDeserializer(ObjectDeserializer<Credential.
             builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
         });
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.accessKey);
+        result = 31 * result + Objects.hashCode(this.secretKey);
+        result = 31 * result + Objects.hashCode(this.sessionToken);
+        result = 31 * result + Objects.hashCode(this.metadata);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Credential other = (Credential) o;
+        return Objects.equals(this.accessKey, other.accessKey)
+            && Objects.equals(this.secretKey, other.secretKey)
+            && Objects.equals(this.sessionToken, other.sessionToken)
+            && Objects.equals(this.metadata, other.metadata);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentRequest.java
index 74f9771997..da99ed04fa 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeleteAgentRequest extends RequestBase {
 
+    @Nonnull
     private final String agentId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static DeleteAgentRequest of(Function<DeleteAgentRequest.Builder, ObjectB
     /**
      * Required - API name: {@code agent_id}
      */
+    @Nonnull
     public final String agentId() {
         return this.agentId;
     }
@@ -98,4 +101,17 @@ public DeleteAgentRequest build() {
         false,
         DeleteAgentResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.agentId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeleteAgentRequest other = (DeleteAgentRequest) o;
+        return this.agentId.equals(other.agentId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentResponse.java
index 8624845cc7..ed8723369c 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteAgentResponse.java
@@ -73,4 +73,18 @@ public DeleteAgentResponse build() {
     protected static void setupDeleteAgentResponseDeserializer(ObjectDeserializer<DeleteAgentResponse.Builder> op) {
         WriteResponseBase.setupWriteResponseBaseDeserializer(op);
     }
+
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorRequest.java
index 30e0f7d202..eba26ddd93 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeleteConnectorRequest extends RequestBase {
 
+    @Nonnull
     private final String connectorId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static DeleteConnectorRequest of(Function<DeleteConnectorRequest.Builder,
     /**
      * Required - API name: {@code connector_id}
      */
+    @Nonnull
     public final String connectorId() {
         return this.connectorId;
     }
@@ -98,4 +101,17 @@ public DeleteConnectorRequest build() {
         false,
         DeleteConnectorResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.connectorId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeleteConnectorRequest other = (DeleteConnectorRequest) o;
+        return this.connectorId.equals(other.connectorId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorResponse.java
index 1ba0900cc8..8191f76081 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteConnectorResponse.java
@@ -73,4 +73,18 @@ public DeleteConnectorResponse build() {
     protected static void setupDeleteConnectorResponseDeserializer(ObjectDeserializer<DeleteConnectorResponse.Builder> op) {
         WriteResponseBase.setupWriteResponseBaseDeserializer(op);
     }
+
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupRequest.java
index 181a605275..e62ba1c38a 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeleteModelGroupRequest extends RequestBase {
 
+    @Nonnull
     private final String modelGroupId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static DeleteModelGroupRequest of(Function<DeleteModelGroupRequest.Builde
     /**
      * Required - API name: {@code model_group_id}
      */
+    @Nonnull
     public final String modelGroupId() {
         return this.modelGroupId;
     }
@@ -98,4 +101,17 @@ public DeleteModelGroupRequest build() {
         false,
         DeleteModelGroupResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.modelGroupId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeleteModelGroupRequest other = (DeleteModelGroupRequest) o;
+        return this.modelGroupId.equals(other.modelGroupId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupResponse.java
index 742257bf99..77595ef8a3 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelGroupResponse.java
@@ -73,4 +73,18 @@ public DeleteModelGroupResponse build() {
     protected static void setupDeleteModelGroupResponseDeserializer(ObjectDeserializer<DeleteModelGroupResponse.Builder> op) {
         WriteResponseBase.setupWriteResponseBaseDeserializer(op);
     }
+
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelRequest.java
index f9be99c118..70bbbde1ea 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeleteModelRequest extends RequestBase {
 
+    @Nonnull
     private final String modelId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static DeleteModelRequest of(Function<DeleteModelRequest.Builder, ObjectB
     /**
      * Required - API name: {@code model_id}
      */
+    @Nonnull
     public final String modelId() {
         return this.modelId;
     }
@@ -98,4 +101,17 @@ public DeleteModelRequest build() {
         false,
         DeleteModelResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.modelId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeleteModelRequest other = (DeleteModelRequest) o;
+        return this.modelId.equals(other.modelId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelResponse.java
index 1395e93e08..45e9cf97ef 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteModelResponse.java
@@ -73,4 +73,18 @@ public DeleteModelResponse build() {
     protected static void setupDeleteModelResponseDeserializer(ObjectDeserializer<DeleteModelResponse.Builder> op) {
         WriteResponseBase.setupWriteResponseBaseDeserializer(op);
     }
+
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskRequest.java
index a378f83fde..24cc8996a9 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeleteTaskRequest extends RequestBase {
 
+    @Nonnull
     private final String taskId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static DeleteTaskRequest of(Function<DeleteTaskRequest.Builder, ObjectBui
     /**
      * Required - API name: {@code task_id}
      */
+    @Nonnull
     public final String taskId() {
         return this.taskId;
     }
@@ -98,4 +101,17 @@ public DeleteTaskRequest build() {
         false,
         DeleteTaskResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.taskId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeleteTaskRequest other = (DeleteTaskRequest) o;
+        return this.taskId.equals(other.taskId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskResponse.java
index 93e33ffd2c..21d872184a 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeleteTaskResponse.java
@@ -73,4 +73,18 @@ public DeleteTaskResponse build() {
     protected static void setupDeleteTaskResponseDeserializer(ObjectDeserializer<DeleteTaskResponse.Builder> op) {
         WriteResponseBase.setupWriteResponseBaseDeserializer(op);
     }
+
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelRequest.java
index 2230cb1d82..bf5ec056be 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeployModelRequest extends RequestBase {
 
+    @Nonnull
     private final String modelId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static DeployModelRequest of(Function<DeployModelRequest.Builder, ObjectB
     /**
      * Required - API name: {@code model_id}
      */
+    @Nonnull
     public final String modelId() {
         return this.modelId;
     }
@@ -99,4 +102,17 @@ public DeployModelRequest build() {
         false,
         DeployModelResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.modelId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeployModelRequest other = (DeployModelRequest) o;
+        return this.modelId.equals(other.modelId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelResponse.java
index 23b01f8025..65469f5a2d 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/DeployModelResponse.java
@@ -13,8 +13,10 @@
 package org.opensearch.client.opensearch.ml;
 
 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;
@@ -32,8 +34,10 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DeployModelResponse implements PlainJsonSerializable {
 
+    @Nonnull
     private final String status;
 
+    @Nonnull
     private final String taskId;
 
     @Nullable
@@ -54,6 +58,7 @@ public static DeployModelResponse of(Function<DeployModelResponse.Builder, Objec
     /**
      * Required - API name: {@code status}
      */
+    @Nonnull
     public final String status() {
         return this.status;
     }
@@ -61,6 +66,7 @@ public final String status() {
     /**
      * Required - API name: {@code task_id}
      */
+    @Nonnull
     public final String taskId() {
         return this.taskId;
     }
@@ -158,4 +164,19 @@ protected static void setupDeployModelResponseDeserializer(ObjectDeserializer<De
         op.add(Builder::taskId, JsonpDeserializer.stringDeserializer(), "task_id");
         op.add(Builder::taskType, JsonpDeserializer.stringDeserializer(), "task_type");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.status.hashCode();
+        result = 31 * result + this.taskId.hashCode();
+        result = 31 * result + Objects.hashCode(this.taskType);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DeployModelResponse other = (DeployModelResponse) o;
+        return this.status.equals(other.status) && this.taskId.equals(other.taskId) && Objects.equals(this.taskType, other.taskType);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupRequest.java
index 92c6537dc9..df4497fc77 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetModelGroupRequest extends RequestBase {
 
+    @Nonnull
     private final String modelGroupId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static GetModelGroupRequest of(Function<GetModelGroupRequest.Builder, Obj
     /**
      * Required - API name: {@code model_group_id}
      */
+    @Nonnull
     public final String modelGroupId() {
         return this.modelGroupId;
     }
@@ -98,4 +101,17 @@ public GetModelGroupRequest build() {
         false,
         GetModelGroupResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.modelGroupId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetModelGroupRequest other = (GetModelGroupRequest) o;
+        return this.modelGroupId.equals(other.modelGroupId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupResponse.java
index 9ca56a1e29..de94269d41 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetModelGroupResponse.java
@@ -13,8 +13,10 @@
 package org.opensearch.client.opensearch.ml;
 
 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;
@@ -32,11 +34,13 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetModelGroupResponse implements PlainJsonSerializable {
 
+    @Nonnull
     private final String access;
 
     @Nullable
     private final Long createdTime;
 
+    @Nonnull
     private final String description;
 
     @Nullable
@@ -44,6 +48,7 @@ public class GetModelGroupResponse implements PlainJsonSerializable {
 
     private final int latestVersion;
 
+    @Nonnull
     private final String name;
 
     // ---------------------------------------------------------------------------------------------
@@ -67,6 +72,7 @@ public static GetModelGroupResponse of(Function<GetModelGroupResponse.Builder, O
      * API name: {@code access}
      * </p>
      */
+    @Nonnull
     public final String access() {
         return this.access;
     }
@@ -85,6 +91,7 @@ public final Long createdTime() {
      * API name: {@code description}
      * </p>
      */
+    @Nonnull
     public final String description() {
         return this.description;
     }
@@ -113,6 +120,7 @@ public final int latestVersion() {
      * API name: {@code name}
      * </p>
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
@@ -256,4 +264,27 @@ protected static void setupGetModelGroupResponseDeserializer(ObjectDeserializer<
         op.add(Builder::latestVersion, JsonpDeserializer.integerDeserializer(), "latest_version");
         op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.access.hashCode();
+        result = 31 * result + Objects.hashCode(this.createdTime);
+        result = 31 * result + this.description.hashCode();
+        result = 31 * result + Objects.hashCode(this.lastUpdatedTime);
+        result = 31 * result + Integer.hashCode(this.latestVersion);
+        result = 31 * result + this.name.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetModelGroupResponse other = (GetModelGroupResponse) o;
+        return this.access.equals(other.access)
+            && Objects.equals(this.createdTime, other.createdTime)
+            && this.description.equals(other.description)
+            && Objects.equals(this.lastUpdatedTime, other.lastUpdatedTime)
+            && this.latestVersion == other.latestVersion
+            && this.name.equals(other.name);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskRequest.java
index 55f09a5df6..664c9b3d31 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class GetTaskRequest extends RequestBase {
 
+    @Nonnull
     private final String taskId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static GetTaskRequest of(Function<GetTaskRequest.Builder, ObjectBuilder<G
     /**
      * Required - API name: {@code task_id}
      */
+    @Nonnull
     public final String taskId() {
         return this.taskId;
     }
@@ -98,4 +101,17 @@ public GetTaskRequest build() {
         false,
         GetTaskResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.taskId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetTaskRequest other = (GetTaskRequest) o;
+        return this.taskId.equals(other.taskId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskResponse.java
index 6e0f7522e2..6f5ca7465d 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/GetTaskResponse.java
@@ -14,8 +14,10 @@
 
 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;
@@ -51,6 +53,7 @@ public class GetTaskResponse implements PlainJsonSerializable {
     @Nullable
     private final String modelId;
 
+    @Nonnull
     private final String state;
 
     @Nullable
@@ -59,6 +62,7 @@ public class GetTaskResponse implements PlainJsonSerializable {
     @Nullable
     private final String taskType;
 
+    @Nonnull
     private final List<List<String>> workerNode;
 
     // ---------------------------------------------------------------------------------------------
@@ -131,6 +135,7 @@ public final String modelId() {
     /**
      * Required - API name: {@code state}
      */
+    @Nonnull
     public final String state() {
         return this.state;
     }
@@ -157,6 +162,7 @@ public final String taskType() {
     /**
      * API name: {@code worker_node}
      */
+    @Nonnull
     public final List<List<String>> workerNode() {
         return this.workerNode;
     }
@@ -392,4 +398,35 @@ protected static void setupGetTaskResponseDeserializer(ObjectDeserializer<GetTas
             "worker_node"
         );
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.createTime);
+        result = 31 * result + Objects.hashCode(this.error);
+        result = 31 * result + Objects.hashCode(this.functionName);
+        result = 31 * result + Objects.hashCode(this.isAsync);
+        result = 31 * result + Objects.hashCode(this.lastUpdateTime);
+        result = 31 * result + Objects.hashCode(this.modelId);
+        result = 31 * result + this.state.hashCode();
+        result = 31 * result + Objects.hashCode(this.taskId);
+        result = 31 * result + Objects.hashCode(this.taskType);
+        result = 31 * result + Objects.hashCode(this.workerNode);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        GetTaskResponse other = (GetTaskResponse) o;
+        return Objects.equals(this.createTime, other.createTime)
+            && Objects.equals(this.error, other.error)
+            && Objects.equals(this.functionName, other.functionName)
+            && Objects.equals(this.isAsync, other.isAsync)
+            && Objects.equals(this.lastUpdateTime, other.lastUpdateTime)
+            && Objects.equals(this.modelId, other.modelId)
+            && this.state.equals(other.state)
+            && Objects.equals(this.taskId, other.taskId)
+            && Objects.equals(this.taskType, other.taskType)
+            && Objects.equals(this.workerNode, other.workerNode);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Headers.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Headers.java
index 837e3b4332..74f8e5ddd3 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Headers.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Headers.java
@@ -15,8 +15,10 @@
 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.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -38,6 +40,7 @@ public class Headers implements PlainJsonSerializable {
     @Nullable
     private final String contentType;
 
+    @Nonnull
     private final Map<String, JsonData> metadata;
 
     // ---------------------------------------------------------------------------------------------
@@ -61,6 +64,7 @@ public final String contentType() {
 
     /**
                                     */
+    @Nonnull
     public final Map<String, JsonData> metadata() {
         return this.metadata;
     }
@@ -158,4 +162,18 @@ protected static void setupHeadersDeserializer(ObjectDeserializer<Headers.Builde
             builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
         });
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.contentType);
+        result = 31 * result + Objects.hashCode(this.metadata);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Headers other = (Headers) o;
+        return Objects.equals(this.contentType, other.contentType) && Objects.equals(this.metadata, other.metadata);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/LLM.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/LLM.java
index 77a786f256..2f0613294a 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/LLM.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/LLM.java
@@ -14,8 +14,10 @@
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -37,6 +39,7 @@ public class LLM implements PlainJsonSerializable {
     @Nullable
     private final String modelId;
 
+    @Nonnull
     private final Map<String, JsonData> parameters;
 
     // ---------------------------------------------------------------------------------------------
@@ -61,6 +64,7 @@ public final String modelId() {
     /**
      * API name: {@code parameters}
      */
+    @Nonnull
     public final Map<String, JsonData> parameters() {
         return this.parameters;
     }
@@ -158,4 +162,18 @@ protected static void setupLLMDeserializer(ObjectDeserializer<LLM.Builder> op) {
         op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
         op.add(Builder::parameters, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "parameters");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.modelId);
+        result = 31 * result + Objects.hashCode(this.parameters);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        LLM other = (LLM) o;
+        return Objects.equals(this.modelId, other.modelId) && Objects.equals(this.parameters, other.parameters);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Memory.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Memory.java
index dfc0a9083c..0660178e13 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Memory.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/Memory.java
@@ -13,6 +13,7 @@
 package org.opensearch.client.opensearch.ml;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nullable;
@@ -111,4 +112,17 @@ public Memory build() {
     protected static void setupMemoryDeserializer(ObjectDeserializer<Memory.Builder> op) {
         op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.type);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Memory other = (Memory) o;
+        return Objects.equals(this.type, other.type);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsRequest.java
index 155e0de881..2c2e560a6d 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsRequest.java
@@ -15,8 +15,10 @@
 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;
@@ -54,12 +56,16 @@ public class RegisterAgentsRequest extends RequestBase implements PlainJsonSeria
     @Nullable
     private final Memory memory;
 
+    @Nonnull
     private final String name;
 
+    @Nonnull
     private final Map<String, JsonData> parameters;
 
+    @Nonnull
     private final List<ToolItems> tools;
 
+    @Nonnull
     private final String type;
 
     // ---------------------------------------------------------------------------------------------
@@ -114,6 +120,7 @@ public final Memory memory() {
     /**
      * Required - API name: {@code name}
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
@@ -121,6 +128,7 @@ public final String name() {
     /**
      * API name: {@code parameters}
      */
+    @Nonnull
     public final Map<String, JsonData> parameters() {
         return this.parameters;
     }
@@ -128,6 +136,7 @@ public final Map<String, JsonData> parameters() {
     /**
      * API name: {@code tools}
      */
+    @Nonnull
     public final List<ToolItems> tools() {
         return this.tools;
     }
@@ -135,6 +144,7 @@ public final List<ToolItems> tools() {
     /**
      * Required - API name: {@code type}
      */
+    @Nonnull
     public final String type() {
         return this.type;
     }
@@ -386,4 +396,31 @@ protected static void setupRegisterAgentsRequestDeserializer(ObjectDeserializer<
         true,
         RegisterAgentsResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.appType);
+        result = 31 * result + Objects.hashCode(this.description);
+        result = 31 * result + Objects.hashCode(this.llm);
+        result = 31 * result + Objects.hashCode(this.memory);
+        result = 31 * result + this.name.hashCode();
+        result = 31 * result + Objects.hashCode(this.parameters);
+        result = 31 * result + Objects.hashCode(this.tools);
+        result = 31 * result + this.type.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RegisterAgentsRequest other = (RegisterAgentsRequest) o;
+        return Objects.equals(this.appType, other.appType)
+            && Objects.equals(this.description, other.description)
+            && Objects.equals(this.llm, other.llm)
+            && Objects.equals(this.memory, other.memory)
+            && this.name.equals(other.name)
+            && Objects.equals(this.parameters, other.parameters)
+            && Objects.equals(this.tools, other.tools)
+            && this.type.equals(other.type);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsResponse.java
index e69ff9e0de..b15475a2aa 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterAgentsResponse.java
@@ -13,6 +13,7 @@
 package org.opensearch.client.opensearch.ml;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nullable;
@@ -111,4 +112,17 @@ public RegisterAgentsResponse build() {
     protected static void setupRegisterAgentsResponseDeserializer(ObjectDeserializer<RegisterAgentsResponse.Builder> op) {
         op.add(Builder::agentId, JsonpDeserializer.stringDeserializer(), "agent_id");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.agentId);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RegisterAgentsResponse other = (RegisterAgentsResponse) o;
+        return Objects.equals(this.agentId, other.agentId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupRequest.java
index 2cf102fca7..e7bc41bb13 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupRequest.java
@@ -14,8 +14,10 @@
 
 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;
@@ -46,11 +48,13 @@ public class RegisterModelGroupRequest extends RequestBase implements PlainJsonS
     @Nullable
     private final Boolean addAllBackendRoles;
 
+    @Nonnull
     private final List<String> backendRoles;
 
     @Nullable
     private final String description;
 
+    @Nonnull
     private final String name;
 
     // ---------------------------------------------------------------------------------------------
@@ -95,6 +99,7 @@ public final Boolean addAllBackendRoles() {
      * API name: {@code backend_roles}
      * </p>
      */
+    @Nonnull
     public final List<String> backendRoles() {
         return this.backendRoles;
     }
@@ -116,6 +121,7 @@ public final String description() {
      * API name: {@code name}
      * </p>
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
@@ -294,4 +300,25 @@ protected static void setupRegisterModelGroupRequestDeserializer(ObjectDeseriali
         true,
         RegisterModelGroupResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.accessMode);
+        result = 31 * result + Objects.hashCode(this.addAllBackendRoles);
+        result = 31 * result + Objects.hashCode(this.backendRoles);
+        result = 31 * result + Objects.hashCode(this.description);
+        result = 31 * result + this.name.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RegisterModelGroupRequest other = (RegisterModelGroupRequest) o;
+        return Objects.equals(this.accessMode, other.accessMode)
+            && Objects.equals(this.addAllBackendRoles, other.addAllBackendRoles)
+            && Objects.equals(this.backendRoles, other.backendRoles)
+            && Objects.equals(this.description, other.description)
+            && this.name.equals(other.name);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupResponse.java
index 240993a8c8..ac99154507 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelGroupResponse.java
@@ -15,6 +15,7 @@
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -31,8 +32,10 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class RegisterModelGroupResponse implements PlainJsonSerializable {
 
+    @Nonnull
     private final String modelGroupId;
 
+    @Nonnull
     private final String status;
 
     // ---------------------------------------------------------------------------------------------
@@ -54,6 +57,7 @@ public static RegisterModelGroupResponse of(
      * API name: {@code model_group_id}
      * </p>
      */
+    @Nonnull
     public final String modelGroupId() {
         return this.modelGroupId;
     }
@@ -64,6 +68,7 @@ public final String modelGroupId() {
      * API name: {@code status}
      * </p>
      */
+    @Nonnull
     public final String status() {
         return this.status;
     }
@@ -143,4 +148,18 @@ protected static void setupRegisterModelGroupResponseDeserializer(ObjectDeserial
         op.add(Builder::modelGroupId, JsonpDeserializer.stringDeserializer(), "model_group_id");
         op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.modelGroupId.hashCode();
+        result = 31 * result + this.status.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RegisterModelGroupResponse other = (RegisterModelGroupResponse) o;
+        return this.modelGroupId.equals(other.modelGroupId) && this.status.equals(other.status);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelRequest.java
index 98fb7909fd..5261601622 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelRequest.java
@@ -13,8 +13,10 @@
 package org.opensearch.client.opensearch.ml;
 
 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;
@@ -42,13 +44,16 @@ public class RegisterModelRequest extends RequestBase implements PlainJsonSerial
     @Nullable
     private final String description;
 
+    @Nonnull
     private final String modelFormat;
 
     @Nullable
     private final String modelGroupId;
 
+    @Nonnull
     private final String name;
 
+    @Nonnull
     private final String version;
 
     // ---------------------------------------------------------------------------------------------
@@ -82,6 +87,7 @@ public final String description() {
      * API name: {@code model_format}
      * </p>
      */
+    @Nonnull
     public final String modelFormat() {
         return this.modelFormat;
     }
@@ -103,6 +109,7 @@ public final String modelGroupId() {
      * API name: {@code name}
      * </p>
      */
+    @Nonnull
     public final String name() {
         return this.name;
     }
@@ -113,6 +120,7 @@ public final String name() {
      * API name: {@code version}
      * </p>
      */
+    @Nonnull
     public final String version() {
         return this.version;
     }
@@ -262,4 +270,25 @@ protected static void setupRegisterModelRequestDeserializer(ObjectDeserializer<R
         true,
         RegisterModelResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.description);
+        result = 31 * result + this.modelFormat.hashCode();
+        result = 31 * result + Objects.hashCode(this.modelGroupId);
+        result = 31 * result + this.name.hashCode();
+        result = 31 * result + this.version.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RegisterModelRequest other = (RegisterModelRequest) o;
+        return Objects.equals(this.description, other.description)
+            && this.modelFormat.equals(other.modelFormat)
+            && Objects.equals(this.modelGroupId, other.modelGroupId)
+            && this.name.equals(other.name)
+            && this.version.equals(other.version);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelResponse.java
index af781c3769..d565876256 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/RegisterModelResponse.java
@@ -15,6 +15,7 @@
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -31,8 +32,10 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class RegisterModelResponse implements PlainJsonSerializable {
 
+    @Nonnull
     private final String status;
 
+    @Nonnull
     private final String taskId;
 
     // ---------------------------------------------------------------------------------------------
@@ -49,6 +52,7 @@ public static RegisterModelResponse of(Function<RegisterModelResponse.Builder, O
     /**
      * Required - API name: {@code status}
      */
+    @Nonnull
     public final String status() {
         return this.status;
     }
@@ -56,6 +60,7 @@ public final String status() {
     /**
      * Required - API name: {@code task_id}
      */
+    @Nonnull
     public final String taskId() {
         return this.taskId;
     }
@@ -129,4 +134,18 @@ protected static void setupRegisterModelResponseDeserializer(ObjectDeserializer<
         op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
         op.add(Builder::taskId, JsonpDeserializer.stringDeserializer(), "task_id");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.status.hashCode();
+        result = 31 * result + this.taskId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RegisterModelResponse other = (RegisterModelResponse) o;
+        return this.status.equals(other.status) && this.taskId.equals(other.taskId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ToolItems.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ToolItems.java
index b52d7fae3a..ee6622ca1c 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ToolItems.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/ToolItems.java
@@ -15,8 +15,10 @@
 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.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -38,11 +40,13 @@ public class ToolItems implements PlainJsonSerializable {
     @Nullable
     private final String name;
 
+    @Nonnull
     private final Map<String, JsonData> parameters;
 
     @Nullable
     private final String type;
 
+    @Nonnull
     private final Map<String, JsonData> metadata;
 
     // ---------------------------------------------------------------------------------------------
@@ -69,6 +73,7 @@ public final String name() {
     /**
      * API name: {@code parameters}
      */
+    @Nonnull
     public final Map<String, JsonData> parameters() {
         return this.parameters;
     }
@@ -83,6 +88,7 @@ public final String type() {
 
     /**
                                     */
+    @Nonnull
     public final Map<String, JsonData> metadata() {
         return this.metadata;
     }
@@ -233,4 +239,23 @@ protected static void setupToolItemsDeserializer(ObjectDeserializer<ToolItems.Bu
             builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
         });
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.name);
+        result = 31 * result + Objects.hashCode(this.parameters);
+        result = 31 * result + Objects.hashCode(this.type);
+        result = 31 * result + Objects.hashCode(this.metadata);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ToolItems other = (ToolItems) o;
+        return Objects.equals(this.name, other.name)
+            && Objects.equals(this.parameters, other.parameters)
+            && Objects.equals(this.type, other.type)
+            && Objects.equals(this.metadata, other.metadata);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelNode.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelNode.java
index 18b66b4dc3..9b9afcbc98 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelNode.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelNode.java
@@ -14,8 +14,10 @@
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -34,6 +36,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class UndeployModelNode implements PlainJsonSerializable {
 
+    @Nonnull
     private final Map<String, JsonData> stats;
 
     // ---------------------------------------------------------------------------------------------
@@ -49,6 +52,7 @@ public static UndeployModelNode of(Function<UndeployModelNode.Builder, ObjectBui
     /**
      * API name: {@code stats}
      */
+    @Nonnull
     public final Map<String, JsonData> stats() {
         return this.stats;
     }
@@ -133,4 +137,17 @@ public UndeployModelNode build() {
     protected static void setupUndeployModelNodeDeserializer(ObjectDeserializer<UndeployModelNode.Builder> op) {
         op.add(Builder::stats, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "stats");
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.stats);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        UndeployModelNode other = (UndeployModelNode) o;
+        return Objects.equals(this.stats, other.stats);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelRequest.java
index 4ae83cb5b5..5c5a4a4eed 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelRequest.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -30,6 +31,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class UndeployModelRequest extends RequestBase {
 
+    @Nonnull
     private final String modelId;
 
     // ---------------------------------------------------------------------------------------------
@@ -45,6 +47,7 @@ public static UndeployModelRequest of(Function<UndeployModelRequest.Builder, Obj
     /**
      * Required - API name: {@code model_id}
      */
+    @Nonnull
     public final String modelId() {
         return this.modelId;
     }
@@ -99,4 +102,17 @@ public UndeployModelRequest build() {
         false,
         UndeployModelResponse._DESERIALIZER
     );
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + this.modelId.hashCode();
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        UndeployModelRequest other = (UndeployModelRequest) o;
+        return this.modelId.equals(other.modelId);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java
index 83128a460a..f16439314e 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java
@@ -15,8 +15,10 @@
 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;
@@ -34,6 +36,7 @@
 @Generated("org.opensearch.client.codegen.CodeGenerator")
 public class UndeployModelResponse implements PlainJsonSerializable {
 
+    @Nonnull
     private final Map<String, UndeployModelNode> nodes;
 
     // ---------------------------------------------------------------------------------------------
@@ -48,6 +51,7 @@ public static UndeployModelResponse of(Function<UndeployModelResponse.Builder, O
 
     /**
                                     */
+    @Nonnull
     public final Map<String, UndeployModelNode> nodes() {
         return this.nodes;
     }
@@ -140,4 +144,17 @@ protected static void setupUndeployModelResponseDeserializer(ObjectDeserializer<
             builder.nodes.put(name, UndeployModelNode._DESERIALIZER.deserialize(parser, mapper));
         });
     }
+
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.nodes);
+        return result;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        UndeployModelResponse other = (UndeployModelResponse) o;
+        return Objects.equals(this.nodes, other.nodes);
+    }
 }
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java
index 75b82438f1..32ba374de0 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/ObjectShape.java
@@ -55,6 +55,10 @@ public boolean hasFieldsToSerialize() {
         return !bodyFields.isEmpty() || additionalPropertiesField != null;
     }
 
+    public boolean hasFields() {
+        return !bodyFields.isEmpty() || additionalPropertiesField != null;
+    }
+
     public Collection<Type> getImplementsTypes() {
         return hasFieldsToSerialize() && !extendsOtherShape() ? List.of(Types.Client.Json.PlainJsonSerializable) : 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 18facfd53e..d76a67d2fe 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
@@ -151,6 +151,10 @@ public boolean hasAnyRequiredFields() {
         return fields.values().stream().anyMatch(Field::isRequired);
     }
 
+    public boolean hasFields() {
+        return !fields.isEmpty();
+    }
+
     public Type getJsonEndpointType() {
         return Types.Client.Transport.JsonEndpoint(getType(), getResponseType(), Types.Client.OpenSearch._Types.ErrorResponse);
     }
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Type.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Type.java
index 2e4391b787..f46c3f0306 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Type.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Type.java
@@ -23,25 +23,16 @@
 import org.opensearch.client.codegen.utils.Strings;
 
 public class Type {
-    private static final Set<String> PRIMITIVES = Set.of(
-        "String",
-        "boolean",
+    private static final Set<String> PRIMITIVES = Set.of("boolean", "char", "byte", "short", "int", "long", "float", "double");
+    private static final Set<String> BOXED_PRIMITIVES = Set.of(
         "Boolean",
-        "char",
         "Character",
-        "byte",
         "Byte",
-        "short",
         "Short",
-        "int",
         "Integer",
-        "long",
         "Long",
-        "float",
         "Float",
-        "double",
-        "Double",
-        "Number"
+        "Double"
     );
 
     @Nonnull
@@ -157,6 +148,14 @@ public boolean isPrimitive() {
         return PRIMITIVES.contains(name);
     }
 
+    public boolean isBoxedPrimitive() {
+        return BOXED_PRIMITIVES.contains(name);
+    }
+
+    public boolean isPotentiallyBoxedPrimitive() {
+        return isPrimitive() || isBoxedPrimitive();
+    }
+
     public boolean isNumber() {
         return "Number".equals(name);
     }
@@ -170,7 +169,7 @@ public boolean isTime() {
     }
 
     public boolean isBuiltIn() {
-        return isListOrMap() || isPrimitive() || "JsonData".equals(name);
+        return isPrimitive() || (packageName != null && packageName.startsWith("java.")) || "JsonData".equals(name);
     }
 
     public boolean hasBuilder() {
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
index 8d522a11f1..aff4712672 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
@@ -72,6 +72,7 @@ public static final class Lang {
 
         public static final class Util {
             public static final String PACKAGE = Java.PACKAGE + ".util";
+            public static final Type Objects = Type.builder().withPackage(PACKAGE).withName("Objects").build();
             public static final Type HashMap = Type.builder().withPackage(PACKAGE).withName("HashMap").build();
 
             public static Type Map(Type keyType, Type valueType) {
@@ -122,6 +123,7 @@ public static final class Javax {
         public static final class Annotation {
             public static final String PACKAGE = Javax.PACKAGE + ".annotation";
             public static final Type Generated = Type.builder().withPackage(PACKAGE).withName("Generated").build();
+            public static final Type Nonnull = Type.builder().withPackage(PACKAGE).withName("Nonnull").build();
             public static final Type Nullable = Type.builder().withPackage(PACKAGE).withName("Nullable").build();
         }
     }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape.mustache
index 627af1db03..0cd936e3b4 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape.mustache
@@ -19,4 +19,8 @@
     // ---------------------------------------------------------------------------------------------
 
     {{>ObjectShape/Deserialize}}
-}
\ No newline at end of file
+
+    {{>ObjectShape/HashCode}}
+
+    {{>ObjectShape/Equals}}
+}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Equals.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Equals.mustache
new file mode 100644
index 0000000000..1670834380
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Equals.mustache
@@ -0,0 +1,32 @@
+    public boolean equals(Object o) {
+        {{#extendsOtherShape}}
+            if(!super.equals(o)) {
+                return false;
+            }
+        {{/extendsOtherShape}}
+        if(this == o) return true;
+        if(o == null || this.getClass() != o.getClass()) return false;
+        {{^hasFields}}
+        return true;
+        {{/hasFields}}
+        {{#hasFields}}
+            {{className}} other = ({{className}})o;
+            return
+            {{#fields}}
+                {{#required}}
+                    {{#type.isPrimitive}}
+                        this.{{name}} == other.{{name}}
+                    {{/type.isPrimitive}}
+                    {{^type.isPrimitive}}
+                        this.{{name}}.equals(other.{{name}})
+                    {{/type.isPrimitive}}
+                {{/required}}
+                {{^required}}
+                    {{TYPES.Java.Util.Objects}}.equals(this.{{name}}, other.{{name}})
+                {{/required}}
+                {{^-last}}
+                && 
+                {{/-last}}
+            {{/fields}};
+        {{/hasFields}}
+    }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldNullability.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldNullability.mustache
new file mode 100644
index 0000000000..f9739563bb
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldNullability.mustache
@@ -0,0 +1,13 @@
+{{#type.isListOrMap}}
+    @{{TYPES.Javax.Annotation.Nonnull}}
+{{/type.isListOrMap}}
+{{^type.isListOrMap}}
+    {{#required}}
+        {{^type.isPrimitive}}
+            @{{TYPES.Javax.Annotation.Nonnull}}
+        {{/type.isPrimitive}}
+    {{/required}}
+    {{^required}}
+        @{{TYPES.Javax.Annotation.Nullable}}
+    {{/required}}
+{{/type.isListOrMap}}
\ No newline at end of file
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Fields.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Fields.mustache
index bd320a391b..7e3bea7471 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Fields.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Fields.mustache
@@ -3,10 +3,6 @@
 
 {{/-first}}
     {{#deprecation}}@Deprecated{{/deprecation}}
-{{^required}}
-{{^type.isListOrMap}}
-    @{{TYPES.Javax.Annotation.Nullable}}
-{{/type.isListOrMap}}
-{{/required}}
+    {{>ObjectShape/FieldNullability}}
     private final {{type}} {{name}};
 {{/fields}}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Getters.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Getters.mustache
index 61fea36e57..b9742a7b13 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Getters.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Getters.mustache
@@ -2,11 +2,7 @@
 
     {{>ObjectShape/FieldDoc/Basic}}
     {{#deprecation}}@Deprecated{{/deprecation}}
-    {{^required}}
-    {{^type.isListOrMap}}
-    @{{TYPES.Javax.Annotation.Nullable}}
-    {{/type.isListOrMap}}
-    {{/required}}
+    {{>ObjectShape/FieldNullability}}
     public final {{type}} {{name}}() {
         return this.{{name}};
     }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/HashCode.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/HashCode.mustache
new file mode 100644
index 0000000000..d14479eb81
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/HashCode.mustache
@@ -0,0 +1,23 @@
+    public int hashCode() {
+        {{#extendsOtherShape}}
+        int result = super.hashCode();
+        {{/extendsOtherShape}}
+        {{^extendsOtherShape}}
+        int result = 17;
+        {{/extendsOtherShape}}
+        {{#fields}}
+            result = 31 * result +
+            {{#required}}
+                {{#type.isPrimitive}}
+                    {{type.boxed}}.hashCode(this.{{name}});
+                {{/type.isPrimitive}}
+                {{^type.isPrimitive}}
+                    this.{{name}}.hashCode();
+                {{/type.isPrimitive}}
+            {{/required}}
+            {{^required}}
+                {{TYPES.Java.Util.Objects}}.hashCode(this.{{name}});
+            {{/required}}
+        {{/fields}}
+        return result;
+    }
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 73c0960fea..f73f6dd4a2 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
@@ -96,4 +96,8 @@
             {{hasRequestBody}},
             {{responseType}}._DESERIALIZER
     );
-}
\ No newline at end of file
+
+    {{>ObjectShape/HashCode}}
+
+    {{>ObjectShape/Equals}}
+}
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape.mustache
index 236daf9abb..8a584d6812 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape.mustache
@@ -111,4 +111,8 @@
     }
 
     public static final {{TYPES.Client.Json.JsonpDeserializer}}<{{className}}> _DESERIALIZER = {{TYPES.Client.Json.JsonpDeserializer}}.lazy({{className}}::build{{className}}Deserializer);
+
+    {{>TaggedUnionShape/HashCode}}
+
+    {{>TaggedUnionShape/Equals}}
 }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape/Equals.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape/Equals.mustache
new file mode 100644
index 0000000000..ece94de59b
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape/Equals.mustache
@@ -0,0 +1,6 @@
+    public boolean equals(Object o) {
+        if(this == o) return true;
+        if(o == null || this.getClass() != o.getClass()) return false;
+        {{className}} other = ({{className}})o;
+        return {{TYPES.Java.Util.Objects}}.equals(this._kind, other._kind) && {{TYPES.Java.Util.Objects}}.equals(this._value, other._value);
+    }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape/HashCode.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape/HashCode.mustache
new file mode 100644
index 0000000000..eb7a1d39a1
--- /dev/null
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/TaggedUnionShape/HashCode.mustache
@@ -0,0 +1,6 @@
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + {{TYPES.Java.Util.Objects}}.hashCode(this._kind);
+        result = 31 * result + {{TYPES.Java.Util.Objects}}.hashCode(this._value);
+        return result;
+    }
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/deserializer.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/deserializer.mustache
index 61fb38b72b..25d0754571 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/deserializer.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/deserializer.mustache
@@ -1,7 +1,7 @@
-{{#isPrimitive}}
+{{#isPotentiallyBoxedPrimitive}}
     {{TYPES.Client.Json.JsonpDeserializer}}.{{#toLower}}{{boxed.name}}{{/toLower}}Deserializer()
-{{/isPrimitive}}
-{{^isPrimitive}}
+{{/isPotentiallyBoxedPrimitive}}
+{{^isPotentiallyBoxedPrimitive}}
     {{#isList}}
         {{TYPES.Client.Json.JsonpDeserializer}}.arrayDeserializer({{#listValueType}}{{>Type/deserializer}}{{/listValueType}})
     {{/isList}}
@@ -9,6 +9,16 @@
         {{TYPES.Client.Json.JsonpDeserializer}}.stringMapDeserializer({{#mapValueType}}{{>Type/deserializer}}{{/mapValueType}})
     {{/isMap}}
     {{^isListOrMap}}
-        {{name}}._DESERIALIZER
+        {{#isNumber}}
+            {{TYPES.Client.Json.JsonpDeserializer}}.numberDeserializer()
+        {{/isNumber}}
+        {{^isNumber}}
+            {{#isString}}
+                {{TYPES.Client.Json.JsonpDeserializer}}.stringDeserializer()
+            {{/isString}}
+            {{^isString}}
+                {{name}}._DESERIALIZER
+            {{/isString}}
+        {{/isNumber}}
     {{/isListOrMap}}
-{{/isPrimitive}}
\ No newline at end of file
+{{/isPotentiallyBoxedPrimitive}}
\ No newline at end of file
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache
index f8c2fb10cd..34f4345fca 100644
--- a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache
+++ b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/Type/directSerializer.mustache
@@ -10,15 +10,20 @@
     }
 {{/type.isList}}
 {{^type.isListOrMap}}
-    {{#type.isPrimitive}}
+    {{#type.isPotentiallyBoxedPrimitive}}
+        generator.write({{value}});
+    {{/type.isPotentiallyBoxedPrimitive}}
+    {{^type.isPotentiallyBoxedPrimitive}}
         {{#type.isNumber}}
             generator.write({{value}}.doubleValue());
         {{/type.isNumber}}
         {{^type.isNumber}}
-            generator.write({{value}});
+            {{#type.isString}}
+                generator.write({{value}});
+            {{/type.isString}}
+            {{^type.isString}}
+                {{value}}.serialize(generator, mapper);
+            {{/type.isString}}
         {{/type.isNumber}}
-    {{/type.isPrimitive}}
-    {{^type.isPrimitive}}
-        {{value}}.serialize(generator, mapper);
-    {{/type.isPrimitive}}
+    {{/type.isPotentiallyBoxedPrimitive}}
 {{/type.isListOrMap}}
\ 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 1abc099c55..ebdacdc7ae 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
@@ -6,10 +6,10 @@
         {{value}}.jsonValue()
     {{/type.isEnum}}
     {{^type.isEnum}}
-        {{#type.isPrimitive}}
+        {{#type.isPotentiallyBoxedPrimitive}}
             String.valueOf({{value}})
-        {{/type.isPrimitive}}
-        {{^type.isPrimitive}}
+        {{/type.isPotentiallyBoxedPrimitive}}
+        {{^type.isPotentiallyBoxedPrimitive}}
             {{#type.isList}}
                 {{#type.listValueType.isString}}
                     String.join(",", {{value}})
@@ -24,6 +24,6 @@
             {{^type.isList}}
                 {{value}}._toJsonString()
             {{/type.isList}}
-        {{/type.isPrimitive}}
+        {{/type.isPotentiallyBoxedPrimitive}}
     {{/type.isEnum}}
 {{/type.isString}}