From 282f415304b6434565eab424ef5c17ec785615a6 Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Thu, 24 Oct 2024 09:39:19 +1300
Subject: [PATCH] Add `@Override` to equals & hashCode (#1249)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 .../_types/AcknowledgedResponseBase.java      |   2 +
 .../client/opensearch/_types/BaseNode.java    |   2 +
 .../_types/BulkByScrollFailure.java           |   2 +
 .../_types/BulkByScrollTaskStatus.java        |   2 +
 .../BulkByScrollTaskStatusOrException.java    |   2 +
 .../client/opensearch/_types/ErrorCause.java  |   2 +
 .../opensearch/_types/NodeStatistics.java     |   2 +
 .../_types/OpenSearchVersionInfo.java         |   2 +
 .../client/opensearch/_types/Retries.java     |   2 +
 .../opensearch/_types/ShardFailure.java       |   2 +
 .../opensearch/_types/ShardStatistics.java    |   2 +
 .../client/opensearch/_types/TaskFailure.java |   2 +
 .../opensearch/_types/WriteResponseBase.java  |   2 +
 .../client/opensearch/core/InfoRequest.java   |   2 +
 .../client/opensearch/core/InfoResponse.java  |   2 +
 .../DeleteDanglingIndexRequest.java           |   2 +
 .../DeleteDanglingIndexResponse.java          |   2 +
 .../ImportDanglingIndexRequest.java           |   2 +
 .../ImportDanglingIndexResponse.java          |   2 +
 .../ListDanglingIndicesRequest.java           |   2 +
 .../ListDanglingIndicesResponse.java          |   2 +
 .../list_dangling_indices/DanglingIndex.java  |   2 +
 .../client/opensearch/ml/Action.java          |   2 +
 .../client/opensearch/ml/ClientConfig.java    |   2 +
 .../opensearch/ml/CreateConnectorRequest.java |   2 +
 .../ml/CreateConnectorResponse.java           |   2 +
 .../client/opensearch/ml/Credential.java      |   2 +
 .../opensearch/ml/DeleteAgentRequest.java     |   2 +
 .../opensearch/ml/DeleteAgentResponse.java    |   2 +
 .../opensearch/ml/DeleteConnectorRequest.java |   2 +
 .../ml/DeleteConnectorResponse.java           |   2 +
 .../ml/DeleteModelGroupRequest.java           |   2 +
 .../ml/DeleteModelGroupResponse.java          |   2 +
 .../opensearch/ml/DeleteModelRequest.java     |   2 +
 .../opensearch/ml/DeleteModelResponse.java    |   2 +
 .../opensearch/ml/DeleteTaskRequest.java      |   2 +
 .../opensearch/ml/DeleteTaskResponse.java     |   2 +
 .../opensearch/ml/DeployModelRequest.java     |   2 +
 .../opensearch/ml/DeployModelResponse.java    |   2 +
 .../opensearch/ml/GetModelGroupRequest.java   |   2 +
 .../opensearch/ml/GetModelGroupResponse.java  |   2 +
 .../client/opensearch/ml/GetTaskRequest.java  |   2 +
 .../client/opensearch/ml/GetTaskResponse.java |   2 +
 .../client/opensearch/ml/Headers.java         |   2 +
 .../opensearch/client/opensearch/ml/LLM.java  |   2 +
 .../client/opensearch/ml/Memory.java          |   2 +
 .../opensearch/ml/RegisterAgentsRequest.java  |   2 +
 .../opensearch/ml/RegisterAgentsResponse.java |   2 +
 .../ml/RegisterModelGroupRequest.java         |   2 +
 .../ml/RegisterModelGroupResponse.java        |   2 +
 .../opensearch/ml/RegisterModelRequest.java   |   2 +
 .../opensearch/ml/RegisterModelResponse.java  |   2 +
 .../client/opensearch/ml/ToolItems.java       |   2 +
 .../opensearch/ml/UndeployModelNode.java      |   2 +
 .../opensearch/ml/UndeployModelRequest.java   |   2 +
 .../snapshot/CleanupRepositoryRequest.java    |   2 +
 .../snapshot/CleanupRepositoryResponse.java   |   2 +
 .../snapshot/CloneSnapshotRequest.java        |   2 +
 .../snapshot/CloneSnapshotResponse.java       |   2 +
 .../snapshot/VerifyRepositoryRequest.java     |   2 +
 .../snapshot/VerifyRepositoryResponse.java    |   2 +
 .../CleanupRepositoryResults.java             |   2 +
 .../verify_repository/CompactNodeInfo.java    |   2 +
 .../opensearch/tasks/CancelRequest.java       |   2 +
 .../opensearch/tasks/CancelResponse.java      |   2 +
 .../opensearch/tasks/GetTasksRequest.java     |   2 +
 .../opensearch/tasks/GetTasksResponse.java    |   2 +
 .../client/opensearch/tasks/ListRequest.java  |   2 +
 .../client/opensearch/tasks/ListResponse.java |   2 +
 .../client/opensearch/tasks/Status.java       |   2 +
 .../opensearch/tasks/TaskExecutingNode.java   |   2 +
 .../client/opensearch/tasks/TaskGroup.java    |   2 +
 .../client/opensearch/tasks/TaskInfo.java     |   2 +
 .../client/opensearch/tasks/TaskInfos.java    |   2 +
 .../tasks/TaskListResponseBase.java           |   2 +
 .../client/opensearch/tasks/TaskResponse.java |   2 +
 java-codegen/opensearch-openapi.yaml          | 609 +++++++++---------
 .../templates/ObjectShape/Equals.mustache     |   1 +
 .../templates/ObjectShape/HashCode.mustache   |   1 +
 .../TaggedUnionShape/Equals.mustache          |   1 +
 .../TaggedUnionShape/HashCode.mustache        |   1 +
 81 files changed, 474 insertions(+), 291 deletions(-)

diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
index 13e2183302..ceb941a151 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
@@ -110,12 +110,14 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAcknowle
         op.add(AbstractBuilder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Boolean.hashCode(this.acknowledged);
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BaseNode.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BaseNode.java
index bcc2b4cf99..ef07e83910 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BaseNode.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BaseNode.java
@@ -290,6 +290,7 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBaseNode
         op.add(AbstractBuilder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.attributes);
@@ -301,6 +302,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollFailure.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollFailure.java
index 861e1f9a1e..66578fe695 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollFailure.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollFailure.java
@@ -315,6 +315,7 @@ protected static void setupBulkByScrollFailureDeserializer(ObjectDeserializer<Bu
         op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.cause);
@@ -327,6 +328,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatus.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatus.java
index e8d722fb91..d8937337a8 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatus.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatus.java
@@ -619,6 +619,7 @@ protected static void setupBulkByScrollTaskStatusDeserializer(ObjectDeserializer
         op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.batches);
@@ -640,6 +641,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatusOrException.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatusOrException.java
index 89b1f274bf..c4a0e8fdf3 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatusOrException.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BulkByScrollTaskStatusOrException.java
@@ -180,6 +180,7 @@ private static JsonpDeserializer<BulkByScrollTaskStatusOrException> buildBulkByS
         BulkByScrollTaskStatusOrException::buildBulkByScrollTaskStatusOrExceptionDeserializer
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this._kind);
@@ -187,6 +188,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 97f899eb8c..912a69c5c9 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
@@ -415,6 +415,7 @@ protected static void setupErrorCauseDeserializer(ObjectDeserializer<ErrorCause.
         });
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.causedBy);
@@ -427,6 +428,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/NodeStatistics.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/NodeStatistics.java
index 7be661d197..ae9635e172 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/NodeStatistics.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/NodeStatistics.java
@@ -260,6 +260,7 @@ protected static void setupNodeStatisticsDeserializer(ObjectDeserializer<NodeSta
         op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.failed);
@@ -269,6 +270,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
index a1654453c6..b6fcfb9eab 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
@@ -370,6 +370,7 @@ protected static void setupOpenSearchVersionInfoDeserializer(ObjectDeserializer<
         op.add(Builder::number, JsonpDeserializer.stringDeserializer(), "number");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.buildDate.hashCode();
@@ -385,6 +386,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Retries.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Retries.java
index 9b096663dc..688ee56c5c 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Retries.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Retries.java
@@ -154,6 +154,7 @@ protected static void setupRetriesDeserializer(ObjectDeserializer<Retries.Builde
         op.add(Builder::search, JsonpDeserializer.longDeserializer(), "search");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Long.hashCode(this.bulk);
@@ -161,6 +162,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 36812d4783..eecec2fe8c 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
@@ -250,6 +250,7 @@ protected static void setupShardFailureDeserializer(ObjectDeserializer<ShardFail
         op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.index);
@@ -260,6 +261,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 94b2bc73bc..b7a136a2d2 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
@@ -268,6 +268,7 @@ protected static void setupShardStatisticsDeserializer(ObjectDeserializer<ShardS
         op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.failed);
@@ -278,6 +279,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/TaskFailure.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/TaskFailure.java
index b2f8a7fcd5..73be11b4d2 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/TaskFailure.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/TaskFailure.java
@@ -214,6 +214,7 @@ protected static void setupTaskFailureDeserializer(ObjectDeserializer<TaskFailur
         op.add(Builder::taskId, JsonpDeserializer.integerDeserializer(), "task_id");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.nodeId.hashCode();
@@ -223,6 +224,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 851f7c50dd..b42fdbdd8b 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
@@ -288,6 +288,7 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteRes
         op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.forcedRefresh);
@@ -301,6 +302,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoRequest.java
index 63f0b50600..f2753f32fa 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoRequest.java
@@ -73,11 +73,13 @@ public InfoRequest() {}
         InfoResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java
index 36fec1ee30..d340007675 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java
@@ -242,6 +242,7 @@ protected static void setupInfoResponseDeserializer(ObjectDeserializer<InfoRespo
         op.add(Builder::version, OpenSearchVersionInfo._DESERIALIZER, "version");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.clusterName.hashCode();
@@ -252,6 +253,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java
index 6e1a50d002..45bc6eee00 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java
@@ -295,6 +295,7 @@ public DeleteDanglingIndexRequest build() {
         DeleteDanglingIndexResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Boolean.hashCode(this.acceptDataLoss);
@@ -305,6 +306,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java
index ba577d0d13..3a946805d7 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java
@@ -103,11 +103,13 @@ protected static void setupDeleteDanglingIndexResponseDeserializer(ObjectDeseria
         setupAcknowledgedResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java
index 466ae7c14d..bcdcf7e720 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java
@@ -295,6 +295,7 @@ public ImportDanglingIndexRequest build() {
         ImportDanglingIndexResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Boolean.hashCode(this.acceptDataLoss);
@@ -305,6 +306,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java
index bff172b8b6..d974191cda 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java
@@ -103,11 +103,13 @@ protected static void setupImportDanglingIndexResponseDeserializer(ObjectDeseria
         setupAcknowledgedResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java
index 15ca0305fe..e6de6258c7 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java
@@ -73,11 +73,13 @@ public ListDanglingIndicesRequest() {}
         ListDanglingIndicesResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java
index ca742edffb..f3d6b0e9a2 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java
@@ -235,6 +235,7 @@ protected static void setupListDanglingIndicesResponseDeserializer(ObjectDeseria
         op.add(Builder::nodes, NodeStatistics._DESERIALIZER, "_nodes");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.clusterName);
@@ -243,6 +244,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java
index 8217d16f83..e756b5d4f8 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java
@@ -258,6 +258,7 @@ protected static void setupDanglingIndexDeserializer(ObjectDeserializer<Dangling
         op.add(Builder::nodeIds, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "node_ids");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.creationDate);
@@ -268,6 +269,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 38e6fa54af..36c3693a44 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
@@ -288,6 +288,7 @@ protected static void setupActionDeserializer(ObjectDeserializer<Action.Builder>
         op.add(Builder::url, JsonpDeserializer.stringDeserializer(), "url");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.actionType);
@@ -300,6 +301,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 bd03b5ec22..9e1be3d3c8 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
@@ -281,6 +281,7 @@ protected static void setupClientConfigDeserializer(ObjectDeserializer<ClientCon
         op.add(Builder::retryTimeoutSeconds, JsonpDeserializer.integerDeserializer(), "retry_timeout_seconds");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.connectionTimeout);
@@ -293,6 +294,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 569519e0a2..a68658cdc0 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
@@ -380,6 +380,7 @@ protected static void setupCreateConnectorRequestDeserializer(ObjectDeserializer
         CreateConnectorResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.actions.hashCode();
@@ -393,6 +394,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 bed71edbbc..80f3a28064 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
@@ -113,12 +113,14 @@ protected static void setupCreateConnectorResponseDeserializer(ObjectDeserialize
         op.add(Builder::connectorId, JsonpDeserializer.stringDeserializer(), "connector_id");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.connectorId);
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 ef7dfb84ad..4a6ed07f78 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
@@ -219,6 +219,7 @@ protected static void setupCredentialDeserializer(ObjectDeserializer<Credential.
         });
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.accessKey);
@@ -228,6 +229,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 da99ed04fa..4d155c9252 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
@@ -102,12 +102,14 @@ public DeleteAgentRequest build() {
         DeleteAgentResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.agentId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 7b0c19eda5..9d28e7ac7c 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
@@ -75,11 +75,13 @@ protected static void setupDeleteAgentResponseDeserializer(ObjectDeserializer<De
         setupWriteResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
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 eba26ddd93..67dc24abbf 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
@@ -102,12 +102,14 @@ public DeleteConnectorRequest build() {
         DeleteConnectorResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.connectorId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 dfc3f5a666..6b5b4505c1 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
@@ -75,11 +75,13 @@ protected static void setupDeleteConnectorResponseDeserializer(ObjectDeserialize
         setupWriteResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
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 e62ba1c38a..4d4bf9975e 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
@@ -102,12 +102,14 @@ public DeleteModelGroupRequest build() {
         DeleteModelGroupResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.modelGroupId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 2b2f0365ff..668e866e41 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
@@ -75,11 +75,13 @@ protected static void setupDeleteModelGroupResponseDeserializer(ObjectDeserializ
         setupWriteResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
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 70bbbde1ea..21c8977ae0 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
@@ -102,12 +102,14 @@ public DeleteModelRequest build() {
         DeleteModelResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.modelId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 a3082f0ea6..b287fe2481 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
@@ -75,11 +75,13 @@ protected static void setupDeleteModelResponseDeserializer(ObjectDeserializer<De
         setupWriteResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
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 24cc8996a9..7ff50996a8 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
@@ -102,12 +102,14 @@ public DeleteTaskRequest build() {
         DeleteTaskResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.taskId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 c901124710..36cd9a2740 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
@@ -75,11 +75,13 @@ protected static void setupDeleteTaskResponseDeserializer(ObjectDeserializer<Del
         setupWriteResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
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 bf5ec056be..0b41a42145 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
@@ -103,12 +103,14 @@ public DeployModelRequest build() {
         DeployModelResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.modelId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 65469f5a2d..b9d2053907 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
@@ -165,6 +165,7 @@ protected static void setupDeployModelResponseDeserializer(ObjectDeserializer<De
         op.add(Builder::taskType, JsonpDeserializer.stringDeserializer(), "task_type");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.status.hashCode();
@@ -173,6 +174,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 df4497fc77..77c4664e4d 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
@@ -102,12 +102,14 @@ public GetModelGroupRequest build() {
         GetModelGroupResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.modelGroupId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 de94269d41..500f9ea5a2 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
@@ -265,6 +265,7 @@ protected static void setupGetModelGroupResponseDeserializer(ObjectDeserializer<
         op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.access.hashCode();
@@ -276,6 +277,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 664c9b3d31..00f6cfa67e 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
@@ -102,12 +102,14 @@ public GetTaskRequest build() {
         GetTaskResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.taskId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 6f5ca7465d..bc7cb0c1c5 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
@@ -399,6 +399,7 @@ protected static void setupGetTaskResponseDeserializer(ObjectDeserializer<GetTas
         );
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.createTime);
@@ -414,6 +415,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 74f8e5ddd3..fb81c44c4d 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
@@ -163,6 +163,7 @@ protected static void setupHeadersDeserializer(ObjectDeserializer<Headers.Builde
         });
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.contentType);
@@ -170,6 +171,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 2f0613294a..1032514032 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
@@ -163,6 +163,7 @@ protected static void setupLLMDeserializer(ObjectDeserializer<LLM.Builder> op) {
         op.add(Builder::parameters, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "parameters");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.modelId);
@@ -170,6 +171,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 0660178e13..83bda00de2 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
@@ -113,12 +113,14 @@ protected static void setupMemoryDeserializer(ObjectDeserializer<Memory.Builder>
         op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.type);
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 2c2e560a6d..4e5c31c555 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
@@ -397,6 +397,7 @@ protected static void setupRegisterAgentsRequestDeserializer(ObjectDeserializer<
         RegisterAgentsResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.appType);
@@ -410,6 +411,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 b15475a2aa..816fe2cf91 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
@@ -113,12 +113,14 @@ protected static void setupRegisterAgentsResponseDeserializer(ObjectDeserializer
         op.add(Builder::agentId, JsonpDeserializer.stringDeserializer(), "agent_id");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.agentId);
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 e7bc41bb13..fc1b736361 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
@@ -301,6 +301,7 @@ protected static void setupRegisterModelGroupRequestDeserializer(ObjectDeseriali
         RegisterModelGroupResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.accessMode);
@@ -311,6 +312,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 ac99154507..3b0faba22c 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
@@ -149,6 +149,7 @@ protected static void setupRegisterModelGroupResponseDeserializer(ObjectDeserial
         op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.modelGroupId.hashCode();
@@ -156,6 +157,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 5261601622..ac004ddd21 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
@@ -271,6 +271,7 @@ protected static void setupRegisterModelRequestDeserializer(ObjectDeserializer<R
         RegisterModelResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.description);
@@ -281,6 +282,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 d565876256..5528867fa2 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
@@ -135,6 +135,7 @@ protected static void setupRegisterModelResponseDeserializer(ObjectDeserializer<
         op.add(Builder::taskId, JsonpDeserializer.stringDeserializer(), "task_id");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.status.hashCode();
@@ -142,6 +143,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 ee6622ca1c..c44de71fbd 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
@@ -240,6 +240,7 @@ protected static void setupToolItemsDeserializer(ObjectDeserializer<ToolItems.Bu
         });
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.name);
@@ -249,6 +250,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 9b9afcbc98..af4161d44b 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
@@ -138,12 +138,14 @@ protected static void setupUndeployModelNodeDeserializer(ObjectDeserializer<Unde
         op.add(Builder::stats, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "stats");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.stats);
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
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 5c5a4a4eed..f8b8538fcb 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
@@ -103,12 +103,14 @@ public UndeployModelRequest build() {
         UndeployModelResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.modelId.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java
index 6f8185a3f0..743999ab03 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java
@@ -268,6 +268,7 @@ public CleanupRepositoryRequest build() {
         CleanupRepositoryResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
@@ -277,6 +278,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java
index a04547aa7f..5f82b2882a 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java
@@ -142,12 +142,14 @@ protected static void setupCleanupRepositoryResponseDeserializer(ObjectDeseriali
         op.add(Builder::results, CleanupRepositoryResults._DESERIALIZER, "results");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.results.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java
index 39be1d2b3e..e4ffc8d46a 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java
@@ -341,6 +341,7 @@ protected static void setupCloneSnapshotRequestDeserializer(ObjectDeserializer<C
         CloneSnapshotResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
@@ -352,6 +353,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java
index d66f0d22bc..ad74900da4 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java
@@ -99,11 +99,13 @@ protected static void setupCloneSnapshotResponseDeserializer(ObjectDeserializer<
         setupAcknowledgedResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java
index c774629456..627b7ea5ca 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java
@@ -268,6 +268,7 @@ public VerifyRepositoryRequest build() {
         VerifyRepositoryResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.clusterManagerTimeout);
@@ -277,6 +278,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java
index 6d743ef812..1db36a6507 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java
@@ -168,12 +168,14 @@ protected static void setupVerifyRepositoryResponseDeserializer(ObjectDeserializ
         op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(CompactNodeInfo._DESERIALIZER), "nodes");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.nodes.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java
index e765baf51b..e25302382c 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java
@@ -166,6 +166,7 @@ protected static void setupCleanupRepositoryResultsDeserializer(ObjectDeserializ
         op.add(Builder::deletedBytes, JsonpDeserializer.longDeserializer(), "deleted_bytes");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Long.hashCode(this.deletedBlobs);
@@ -173,6 +174,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java
index 3032f27855..b492890a10 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java
@@ -134,12 +134,14 @@ protected static void setupCompactNodeInfoDeserializer(ObjectDeserializer<Compac
         op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.name.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelRequest.java
index d2b51396cf..edfe92929d 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelRequest.java
@@ -317,6 +317,7 @@ public CancelRequest build() {
         CancelResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.actions);
@@ -327,6 +328,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelResponse.java
index 402e678c20..0b276ca9cd 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/CancelResponse.java
@@ -98,11 +98,13 @@ protected static void setupCancelResponseDeserializer(ObjectDeserializer<CancelR
         setupTaskListResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java
index 92abd2bf54..750b3bc244 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java
@@ -212,6 +212,7 @@ public GetTasksRequest build() {
         GetTasksResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.taskId.hashCode();
@@ -220,6 +221,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java
index 36f073d57a..e51ed5d5d0 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java
@@ -237,6 +237,7 @@ protected static void setupGetTasksResponseDeserializer(ObjectDeserializer<GetTa
         op.add(Builder::task, TaskInfo._DESERIALIZER, "task");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Boolean.hashCode(this.completed);
@@ -246,6 +247,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListRequest.java
index 9688566d8c..8128298f25 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListRequest.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListRequest.java
@@ -377,6 +377,7 @@ public ListRequest build() {
         ListResponse._DESERIALIZER
     );
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.actions);
@@ -389,6 +390,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListResponse.java
index aa7f84d722..4b0ee56d6e 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/ListResponse.java
@@ -98,11 +98,13 @@ protected static void setupListResponseDeserializer(ObjectDeserializer<ListRespo
         setupTaskListResponseBaseDeserializer(op);
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/Status.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/Status.java
index 85dcadbc6b..f6f6aa46e2 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/Status.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/Status.java
@@ -772,6 +772,7 @@ protected static void setupStatusDeserializer(ObjectDeserializer<Status.Builder>
         });
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.batches);
@@ -796,6 +797,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java
index 563a74ea7a..9a8ed67e25 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java
@@ -164,12 +164,14 @@ protected static void setupTaskExecutingNodeDeserializer(ObjectDeserializer<Task
         op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(TaskInfo._DESERIALIZER), "tasks");
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         result = 31 * result + this.tasks.hashCode();
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskGroup.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskGroup.java
index 41978b24b8..823cb1598f 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskGroup.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskGroup.java
@@ -167,12 +167,14 @@ protected static void setupTaskGroupDeserializer(ObjectDeserializer<TaskGroup.Bu
         op.add(Builder::children, JsonpDeserializer.arrayDeserializer(TaskGroup._DESERIALIZER), "children");
     }
 
+    @Override
     public int hashCode() {
         int result = super.hashCode();
         result = 31 * result + Objects.hashCode(this.children);
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!super.equals(o)) {
             return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfo.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfo.java
index 48c88c1f53..83a6fb707c 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfo.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfo.java
@@ -489,6 +489,7 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTaskInfo
         op.add(AbstractBuilder::type, JsonpDeserializer.stringDeserializer(), "type");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.action.hashCode();
@@ -507,6 +508,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfos.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfos.java
index 4bf5585791..e451ade16d 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfos.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskInfos.java
@@ -183,6 +183,7 @@ private static JsonpDeserializer<TaskInfos> buildTaskInfosDeserializer() {
 
     public static final JsonpDeserializer<TaskInfos> _DESERIALIZER = JsonpDeserializer.lazy(TaskInfos::buildTaskInfosDeserializer);
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this._kind);
@@ -190,6 +191,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskListResponseBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskListResponseBase.java
index fee4a80485..aab6b1618f 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskListResponseBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskListResponseBase.java
@@ -315,6 +315,7 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTaskList
         op.add(AbstractBuilder::tasks, TaskInfos._DESERIALIZER, "tasks");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.nodeFailures);
@@ -324,6 +325,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskResponse.java
index 6b75a33c7d..fecdd4e742 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/tasks/TaskResponse.java
@@ -725,6 +725,7 @@ protected static void setupTaskResponseDeserializer(ObjectDeserializer<TaskRespo
         op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
     }
 
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.batches);
@@ -749,6 +750,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
diff --git a/java-codegen/opensearch-openapi.yaml b/java-codegen/opensearch-openapi.yaml
index 9751c0af9a..3f17f3482f 100644
--- a/java-codegen/opensearch-openapi.yaml
+++ b/java-codegen/opensearch-openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.1.0
 info:
   title: OpenSearch API Specification
-  version: 1.0.0
+  version: 0.1.0
   x-api-version: 2.16.0
 paths:
   /:
@@ -14421,7 +14421,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     bulk_stream::query.timeout:
       in: query
@@ -14508,7 +14508,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     bulk::query.timeout:
       in: query
@@ -17131,7 +17131,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     count::query.terminate_after:
       in: query
@@ -17187,7 +17187,7 @@ components:
       description: Comma-separated list of specific routing values.
       style: form
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       explode: true
     create::path.id:
       in: path
@@ -17232,7 +17232,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     create::query.timeout:
       in: query
@@ -17543,7 +17543,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     delete_by_query::query.scroll:
       in: query
@@ -17742,7 +17742,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     delete::query.timeout:
       in: query
@@ -17845,7 +17845,7 @@ components:
       name: routing
       description: Target the specified primary shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     exists_source::query.version:
       in: query
@@ -17931,7 +17931,7 @@ components:
       name: routing
       description: Target the specified primary shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     exists::query.stored_fields:
       in: query
@@ -18059,7 +18059,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     explain::query.stored_fields:
       in: query
@@ -18323,7 +18323,7 @@ components:
       name: routing
       description: Target the specified primary shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     get_source::query.version:
       in: query
@@ -18403,7 +18403,7 @@ components:
       name: routing
       description: Target the specified primary shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     get::query.stored_fields:
       in: query
@@ -18505,7 +18505,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     index::query.timeout:
       in: query
@@ -21568,7 +21568,7 @@ components:
       description: Comma-separated list of specific routing values.
       style: form
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       explode: true
     knn.search_models::query.scroll:
       name: scroll
@@ -21842,7 +21842,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     mget::query.stored_fields:
       in: query
@@ -22102,7 +22102,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     mtermvectors::query.term_statistics:
       in: query
@@ -23125,7 +23125,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     search_template::path.index:
       in: path
@@ -23217,7 +23217,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     search_template::query.scroll:
       in: query
@@ -23518,7 +23518,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     search::query.scroll:
       in: query
@@ -24666,7 +24666,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     termvectors::query.term_statistics:
       in: query
@@ -24999,7 +24999,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     update_by_query::query.scroll:
       in: query
@@ -25207,7 +25207,7 @@ components:
       name: routing
       description: Custom value used to route operations to a specific shard.
       schema:
-        $ref: '#/components/schemas/_common:Routing'
+        $ref: '#/components/schemas/_common:RoutingInQueryString'
       style: form
     update::query.timeout:
       in: query
@@ -25422,8 +25422,6 @@ components:
                 $ref: '#/components/schemas/_common:Fields'
               index_filter:
                 $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
-              runtime_mappings:
-                $ref: '#/components/schemas/_common.mapping:RuntimeFields'
             description: An index filter specified with the Query DSL
     flow_framework.create:
       content:
@@ -25652,8 +25650,6 @@ components:
                 $ref: '#/components/schemas/_common.mapping:RoutingField'
               _source:
                 $ref: '#/components/schemas/_common.mapping:SourceField'
-              runtime:
-                $ref: '#/components/schemas/_common.mapping:RuntimeFields'
             description: The mapping definition
       required: true
     indices.put_settings:
@@ -26397,8 +26393,6 @@ components:
                 $ref: '#/components/schemas/_common:Fields'
               pit:
                 $ref: '#/components/schemas/_core.search:PointInTimeReference'
-              runtime_mappings:
-                $ref: '#/components/schemas/_common.mapping:RuntimeFields'
               stats:
                 description: |-
                   Stats groups to associate with the search.
@@ -29708,7 +29702,7 @@ components:
             type: object
             properties:
               accepted:
-                description: Equals `true` if the snapshot was accepted. Present when the request had `wait_for_completion` set to `false`
+                description: Returns `true` if the snapshot was accepted. Present when the request had `wait_for_completion` set to `false`.
                 type: boolean
               snapshot:
                 $ref: '#/components/schemas/snapshot._common:SnapshotInfo'
@@ -29747,10 +29741,11 @@ components:
           schema:
             type: object
             properties:
+              accepted:
+                description: Returns `true` if the restore was accepted. Present when the request had `wait_for_completion` set to `false`.
+                type: boolean
               snapshot:
                 $ref: '#/components/schemas/snapshot.restore:SnapshotRestore'
-            required:
-              - snapshot
     snapshot.status@200:
       content:
         application/json:
@@ -30131,17 +30126,23 @@ components:
       type: object
       properties:
         skipped:
-          type: number
+          type: integer
+          format: int32
         successful:
-          type: number
+          type: integer
+          format: int32
         total:
-          type: number
+          type: integer
+          format: int32
         running:
-          type: number
+          type: integer
+          format: int32
         partial:
-          type: number
+          type: integer
+          format: int32
         failed:
-          type: number
+          type: integer
+          format: int32
         details:
           type: object
           additionalProperties:
@@ -30269,15 +30270,20 @@ components:
       type: object
       properties:
         1xx:
-          type: number
+          type: integer
+          format: int32
         2xx:
-          type: number
+          type: integer
+          format: int32
         3xx:
-          type: number
+          type: integer
+          format: int32
         4xx:
-          type: number
+          type: integer
+          format: int32
         5xx:
-          type: number
+          type: integer
+          format: int32
     _common:Duration:
       description: |-
         A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and
@@ -30433,7 +30439,8 @@ components:
     _common:Fuzziness:
       oneOf:
         - type: string
-        - type: number
+        - type: integer
+          format: int32
     _common:GeoBounds:
       description: |-
         A geo-bounding box. It can be represented in the following ways:
@@ -30480,7 +30487,8 @@ components:
     _common:GeoHashPrecision:
       description: The level of geohash precision, which can be expressed as a geohash length between 1 and 12 or as a distance measure, such as "1km" or "10m".
       oneOf:
-        - type: number
+        - type: integer
+          format: int32
         - type: string
     _common:GeoHexCell:
       description: A map hex cell (H3) reference.
@@ -30498,6 +30506,7 @@ components:
             type: array
             items:
               type: number
+              format: double
       required:
         - coordinates
         - type
@@ -30715,7 +30724,8 @@ components:
         _seq_no:
           $ref: '#/components/schemas/_common:SequenceNumber'
         _primary_term:
-          type: number
+          type: integer
+          format: int32
         _routing:
           $ref: '#/components/schemas/_common:Routing'
         _source:
@@ -30751,14 +30761,17 @@ components:
           $ref: '#/components/schemas/_common:QueryVector'
         k:
           description: The total number of nearest neighbors to return as top hits.
-          type: number
+          type: integer
+          format: int32
         min_score:
           description: The minimum similarity score required in order for a neighbor to be considered a hit.
           type: number
+          format: float
           x-version-added: '2.14'
         max_distance:
           description: The maximum physical vector space distance required in order for a neighbor to be considered a hit.
           type: number
+          format: float
           x-version-added: '2.14'
         filter:
           description: The filters for the k-NN search query.
@@ -30770,16 +30783,19 @@ components:
         boost:
           description: The boost value applied to k-NN scores.
           type: number
+          format: float
         method_parameters:
           type: object
           x-version-added: '2.16'
           additionalProperties:
-            type: number
+            type: integer
+            format: int32
         rescore:
           type: object
           x-version-added: '2.17'
           additionalProperties:
             type: number
+            format: float
       required:
         - vector
     _common:LatLonGeoLocation:
@@ -30856,7 +30872,8 @@ components:
     _common:MinimumShouldMatch:
       description: The minimum number of terms that should match as an integer, percentage, or range.
       oneOf:
-        - type: number
+        - type: integer
+          format: int32
         - type: string
     _common:MultiTermQueryRewrite:
       type: string
@@ -30882,6 +30899,7 @@ components:
           $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
         max_children:
           type: integer
+          format: int32
         nested:
           $ref: '#/components/schemas/_common:NestedSortValue'
         path:
@@ -31051,6 +31069,7 @@ components:
       type: string
     _common:PercentageNumber:
       type: number
+      format: double
     _common:PercentageString:
       type: string
       pattern: \d+(\.\d+)?
@@ -31164,6 +31183,7 @@ components:
       type: array
       items:
         type: number
+        format: float
     _common:RankBase:
       type: object
     _common:RankContainer:
@@ -31450,6 +31470,8 @@ components:
         - bulk
         - search
     _common:Routing:
+      type: string
+    _common:RoutingInQueryString:
       oneOf:
         - type: string
         - type: array
@@ -31822,7 +31844,8 @@ components:
         id:
           $ref: '#/components/schemas/_common:Id'
         max:
-          type: number
+          type: integer
+          format: int32
       required:
         - id
         - max
@@ -32116,8 +32139,10 @@ components:
         - index-setting
     _common:WaitForActiveShards:
       oneOf:
-        - type: number
-        - $ref: '#/components/schemas/_common:WaitForActiveShardOptions'
+        - title: count
+          type: integer
+        - title: option
+          $ref: '#/components/schemas/_common:WaitForActiveShardOptions'
     _common:WaitForEvents:
       type: string
       enum:
@@ -32186,9 +32211,11 @@ components:
         x:
           description: The x coordinate.
           type: number
+          format: double
         'y':
           description: The y coordinate.
           type: number
+          format: double
       required:
         - x
         - 'y'
@@ -32206,6 +32233,7 @@ components:
           type: array
           items:
             type: number
+            format: double
         - title: text
           type: string
     _common.aggregations:AdjacencyMatrixAggregate:
@@ -34708,7 +34736,7 @@ components:
           type: boolean
     _common.aggregations:NestedAggregate:
       allOf:
-        - $ref: '#/components/schemas/_common.aggregations:SingleBucketAggregateBase'
+        - $ref: '#/components/schemas/_common.aggregations:AggregateBase'
         - type: object
           properties:
             doc_count:
@@ -38535,53 +38563,6 @@ components:
           type: boolean
       required:
         - required
-    _common.mapping:RuntimeField:
-      type: object
-      properties:
-        fetch_fields:
-          description: For type `lookup`
-          type: array
-          items:
-            $ref: '#/components/schemas/_common.mapping:RuntimeFieldFetchFields'
-        format:
-          description: A custom format for `date` type runtime fields.
-          type: string
-        input_field:
-          $ref: '#/components/schemas/_common:Field'
-        target_field:
-          $ref: '#/components/schemas/_common:Field'
-        target_index:
-          $ref: '#/components/schemas/_common:IndexName'
-        script:
-          $ref: '#/components/schemas/_common:Script'
-        type:
-          $ref: '#/components/schemas/_common.mapping:RuntimeFieldType'
-      required:
-        - type
-    _common.mapping:RuntimeFieldFetchFields:
-      type: object
-      properties:
-        field:
-          $ref: '#/components/schemas/_common:Field'
-        format:
-          type: string
-      required:
-        - field
-    _common.mapping:RuntimeFields:
-      type: object
-      additionalProperties:
-        $ref: '#/components/schemas/_common.mapping:RuntimeField'
-    _common.mapping:RuntimeFieldType:
-      type: string
-      enum:
-        - boolean
-        - date
-        - double
-        - geo_point
-        - ip
-        - keyword
-        - long
-        - lookup
     _common.mapping:ScaledFloatNumberProperty:
       allOf:
         - $ref: '#/components/schemas/_common.mapping:NumberPropertyBase'
@@ -38826,10 +38807,6 @@ components:
           $ref: '#/components/schemas/_common.mapping:SizeField'
         _source:
           $ref: '#/components/schemas/_common.mapping:SourceField'
-        runtime:
-          type: object
-          additionalProperties:
-            $ref: '#/components/schemas/_common.mapping:RuntimeField'
         enabled:
           type: boolean
         _data_stream_timestamp:
@@ -40688,7 +40665,8 @@ components:
       description: Can only be used as a clause in a span_near query.
       type: object
       additionalProperties:
-        type: number
+        type: integer
+        format: int32
       minProperties: 1
       maxProperties: 1
     _common.query_dsl:SpanMultiTermQuery:
@@ -41038,7 +41016,8 @@ components:
         routing:
           $ref: '#/components/schemas/_common:Routing'
         if_primary_term:
-          type: number
+          type: integer
+          format: int64
         if_seq_no:
           $ref: '#/components/schemas/_common:SequenceNumber'
         version:
@@ -41077,12 +41056,14 @@ components:
           type: string
         status:
           description: HTTP status code returned for the operation.
-          type: number
+          type: integer
+          format: int32
         error:
           $ref: '#/components/schemas/_common:ErrorCause'
         _primary_term:
           description: The primary term assigned to the document for the operation.
-          type: number
+          type: integer
+          format: int64
         result:
           description: |-
             Result of the operation.
@@ -41136,7 +41117,8 @@ components:
               description: When `true`, the request's actions must target an index alias.
               type: boolean
             retry_on_conflict:
-              type: number
+              type: integer
+              format: int32
     _core.bulk:WriteOperation:
       allOf:
         - $ref: '#/components/schemas/_core.bulk:OperationBase'
@@ -41169,7 +41151,15 @@ components:
           items:
             $ref: '#/components/schemas/_core.explain:ExplanationDetail'
         value:
-          type: number
+          oneOf:
+            - type: integer
+              format: int32
+            - type: integer
+              format: int64
+            - type: number
+              format: float
+            - type: number
+              format: double
       required:
         - description
         - details
@@ -41184,7 +41174,15 @@ components:
           items:
             $ref: '#/components/schemas/_core.explain:ExplanationDetail'
         value:
-          type: number
+          oneOf:
+            - type: integer
+              format: int32
+            - type: integer
+              format: int64
+            - type: number
+              format: float
+            - type: number
+              format: double
       required:
         - description
         - value
@@ -41355,13 +41353,13 @@ components:
       type: object
       properties:
         explain:
-          description: When `true`, returns detailed information about score calculations as part of each hit.
+          description: When `true`, returns detailed information about score calculation as part of each hit.
           type: boolean
         id:
           $ref: '#/components/schemas/_common:Id'
         params:
           description: |-
-            The key-value pairs used to replace any Mustache variables in the template.
+            The key-value pairs used to replace Mustache variables in the template.
             The key is the variable name.
             The value is the variable value.
           type: object
@@ -41372,8 +41370,8 @@ components:
           type: boolean
         source:
           description: |-
-            An inline search template that supports the same parameters as the search API's
-            request body. Also supports Mustache variables. When no template ID is specified, this
+            An inline search template that supports the same parameters as the Search API's
+            request body and Mustache variables. If no `id` is specified, this
             parameter is required.
           type: string
     _core.msearch:MultisearchBody:
@@ -41388,10 +41386,10 @@ components:
         query:
           $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
         explain:
-          description: If true, returns detailed information about score computation as part of a hit.
+          description: When `true`, returns detailed information about score computation as part of a hit.
           type: boolean
         ext:
-          description: Configuration of search extensions defined by OpenSearch plugins.
+          description: The configuration of search extensions defined by OpenSearch plugins.
           type: object
           additionalProperties:
             type: object
@@ -41414,13 +41412,13 @@ components:
         from:
           description: |-
             The starting document offset. By default, you cannot page through more than 10,000
-            hits using the from and size parameters. To page through more hits, use the
+            hits using the `from` and `size` parameters. To page through more than 10,000 hits, use the
             `search_after` parameter.
           type: number
         highlight:
           $ref: '#/components/schemas/_core.search:Highlight'
         indices_boost:
-          description: Boosts the `_score` of documents from specified indexes.
+          description: Boosts the `_score` of documents from the specified indexes.
           type: array
           items:
             type: object
@@ -41442,7 +41440,7 @@ components:
               items:
                 $ref: '#/components/schemas/_core.search:Rescore'
         script_fields:
-          description: Retrieve a script evaluation (based on different fields) for each hit.
+          description: Retrieves a script evaluation (based on different fields) for each hit.
           type: object
           additionalProperties:
             $ref: '#/components/schemas/_common:ScriptField'
@@ -41451,8 +41449,8 @@ components:
         size:
           description: |-
             The number of hits to return. By default, you cannot page through more
-            than 10,000 hits using the from and size parameters. To page through more
-            hits, use the search_after parameter.
+            than 10,000 hits using the `from` and `size` parameters. To page through more
+            hits, use the `search_after` parameter.
           type: number
         sort:
           $ref: '#/components/schemas/_common:Sort'
@@ -41486,18 +41484,16 @@ components:
             Default is no timeout.
           type: string
         track_scores:
-          description: When true, calculates and returns all document scores, even if the scores are not used for sorting.
+          description: When `true`, calculates and returns all document scores, even if the scores are not used for sorting.
           type: boolean
         track_total_hits:
           $ref: '#/components/schemas/_core.search:TrackHits'
         version:
-          description: When true, returns the document version as part of the hit.
+          description: When `true`, returns the document version as part of the hit.
           type: boolean
-        runtime_mappings:
-          $ref: '#/components/schemas/_common.mapping:RuntimeFields'
         seq_no_primary_term:
           description: |-
-            When true, returns the sequence number and primary term of the last modification
+            When `true`, returns the sequence number and primary term of the last modification.
             of each hit. See Optimistic concurrency control.
           type: boolean
         pit:
@@ -41564,23 +41560,23 @@ components:
         _index:
           $ref: '#/components/schemas/_common:IndexName'
         doc:
-          description: An artificial document (a document not present in the index) for which you want to retrieve term vectors.
+          description: An artificial document for which you want to retrieve term vectors.
           type: object
         fields:
           $ref: '#/components/schemas/_common:Fields'
         field_statistics:
-          description: When `true`, the response includes the document count, the sum of document frequencies, and the sum of term frequencies.
+          description: When `true`, the response includes the document count, the sum of the document frequencies, and the sum of the term frequencies.
           type: boolean
         filter:
           $ref: '#/components/schemas/_core.termvectors:Filter'
         offsets:
-          description: When `true`, the response includes term offsets.
+          description: When `true`, the response includes the term offsets.
           type: boolean
         payloads:
-          description: When `true`, the response includes term payloads.
+          description: When `true`, the response includes the term payloads.
           type: boolean
         positions:
-          description: When `true`, the response includes term positions.
+          description: When `true`, the response includes the term positions.
           type: boolean
         routing:
           $ref: '#/components/schemas/_common:Routing'
@@ -41623,7 +41619,7 @@ components:
         _index:
           $ref: '#/components/schemas/_common:IndexName'
         rating:
-          description: The document's relevance with regard to this search request.
+          description: The document's relevance with regard to the specified search request.
           type: number
       required:
         - _id
@@ -41671,26 +41667,26 @@ components:
       type: object
       properties:
         k:
-          description: Sets the maximum number of documents retrieved per query. This value will act in place of the usual size parameter in the query.
+          description: Sets the maximum number of documents retrieved per query. This value replaces the usual `size` parameter in the query.
           type: number
     _core.rank_eval:RankEvalMetricDetail:
       type: object
       properties:
         metric_score:
-          description: The metric_score in the details section shows the contribution of this query to the global quality metric score
+          description: The `metric_score`, found in the `metric_details` section, shows the contribution of this query to the global quality metric score.
           type: number
         unrated_docs:
-          description: The unrated_docs section contains an _index and _id entry for each document in the search result for this query that didn't have a ratings value. This can be used to ask the user to supply ratings for these documents
+          description: The `unrated_docs` section contains an `_index` and `_id` entry for each document that didn't have a ratings value. This can be used to ask the user to supply ratings for these documents.
           type: array
           items:
             $ref: '#/components/schemas/_core.rank_eval:UnratedDocument'
         hits:
-          description: The hits section shows a grouping of the search results with their supplied ratings
+          description: The `hits` section shows a grouping of the search results with their supplied ratings
           type: array
           items:
             $ref: '#/components/schemas/_core.rank_eval:RankEvalHitItem'
         metric_details:
-          description: The metric_details give additional information about the calculated quality metric (e.g. how many of the retrieved documents were relevant). The content varies for each metric but allows for better interpretation of the results
+          description: The `metric_details` section gives additional information about the calculated quality metric, in other words, how many of the retrieved documents were relevant. The content varies for each metric but allows for better interpretation of the results.
           type: object
           additionalProperties:
             type: object
@@ -41707,7 +41703,7 @@ components:
         - type: object
           properties:
             normalize:
-              description: If set to true, this metric will calculate the Normalized DCG (https://en.wikipedia.org/wiki/Discounted_cumulative_gain#Normalized_DCG).
+              description: When `true`, this metric calculates the Normalized DCG (https://en.wikipedia.org/wiki/Discounted_cumulative_gain#Normalized_DCG).
               type: boolean
     _core.rank_eval:RankEvalMetricExpectedReciprocalRank:
       allOf:
@@ -41729,7 +41725,7 @@ components:
         - type: object
           properties:
             ignore_unlabeled:
-              description: Controls how unlabeled documents in the search results are counted. If set to true, unlabeled documents are ignored and neither count as relevant or irrelevant. Set to false (the default), they are treated as irrelevant.
+              description: Controls how unlabeled documents in the search results are counted. When `true`, unlabeled documents are ignored and do not count as relevant or irrelevant. When `false`, unlabeled documents are treated as irrelevant.
               type: boolean
     _core.rank_eval:RankEvalMetricRatingThreshold:
       allOf:
@@ -41737,7 +41733,7 @@ components:
         - type: object
           properties:
             relevant_rating_threshold:
-              description: Sets the rating threshold above which documents are considered to be "relevant".
+              description: Sets the rating threshold above which documents are considered to be relevant.
               type: number
     _core.rank_eval:RankEvalMetricRecall:
       allOf:
@@ -41760,7 +41756,7 @@ components:
         request:
           $ref: '#/components/schemas/_core.rank_eval:RankEvalQuery'
         ratings:
-          description: List of document ratings
+          description: A list of document ratings.
           type: array
           items:
             $ref: '#/components/schemas/_core.rank_eval:DocumentRating'
@@ -41934,8 +41930,6 @@ components:
           $ref: '#/components/schemas/_common:Sort'
         _source:
           $ref: '#/components/schemas/_common:Fields'
-        runtime_mappings:
-          $ref: '#/components/schemas/_common.mapping:RuntimeFields'
       required:
         - index
     _core.scripts_painless_execute:PainlessContextSetup:
@@ -41965,29 +41959,41 @@ components:
       type: object
       properties:
         build_aggregation:
-          type: number
+          type: integer
+          format: int64
         build_aggregation_count:
-          type: number
+          type: integer
+          format: int64
         build_leaf_collector:
-          type: number
+          type: integer
+          format: int64
         build_leaf_collector_count:
-          type: number
+          type: integer
+          format: int64
         collect:
-          type: number
+          type: integer
+          format: int64
         collect_count:
-          type: number
+          type: integer
+          format: int64
         initialize:
-          type: number
+          type: integer
+          format: int64
         initialize_count:
-          type: number
+          type: integer
+          format: int64
         post_collection:
-          type: number
+          type: integer
+          format: int64
         post_collection_count:
-          type: number
+          type: integer
+          format: int64
         reduce:
-          type: number
+          type: integer
+          format: int64
         reduce_count:
-          type: number
+          type: integer
+          format: int64
       required:
         - build_aggregation
         - build_aggregation_count
@@ -42025,15 +42031,19 @@ components:
       type: object
       properties:
         segments_with_multi_valued_ords:
-          type: number
+          type: integer
+          format: int32
         collection_strategy:
           type: string
         segments_with_single_valued_ords:
-          type: number
+          type: integer
+          format: int32
         total_buckets:
-          type: number
+          type: integer
+          format: int32
         built_buckets:
-          type: number
+          type: integer
+          format: int32
         result_strategy:
           type: string
         has_filter:
@@ -42043,58 +42053,76 @@ components:
         delegate_debug:
           $ref: '#/components/schemas/_core.search:AggregationProfileDebug'
         chars_fetched:
-          type: number
+          type: integer
+          format: int32
         extract_count:
-          type: number
+          type: integer
+          format: int32
         extract_ns:
-          type: number
+          type: integer
+          format: int32
         values_fetched:
-          type: number
+          type: integer
+          format: int32
         collect_analyzed_ns:
-          type: number
+          type: integer
+          format: int32
         collect_analyzed_count:
-          type: number
+          type: integer
+          format: int32
         surviving_buckets:
-          type: number
+          type: integer
+          format: int32
         ordinals_collectors_used:
-          type: number
+          type: integer
+          format: int32
         ordinals_collectors_overhead_too_high:
-          type: number
+          type: integer
+          format: int32
         string_hashing_collectors_used:
-          type: number
+          type: integer
+          format: int32
         numeric_collectors_used:
-          type: number
+          type: integer
+          format: int32
         empty_collectors_used:
-          type: number
+          type: integer
+          format: int32
         deferred_aggregators:
           type: array
           items:
             type: string
         segments_with_doc_count_field:
-          type: number
+          type: integer
+          format: int32
         segments_with_deleted_docs:
-          type: number
+          type: integer
+          format: int32
         filters:
           type: array
           items:
             $ref: '#/components/schemas/_core.search:AggregationProfileDelegateDebugFilter'
         segments_counted:
-          type: number
+          type: integer
+          format: int32
         segments_collected:
-          type: number
+          type: integer
+          format: int32
         map_reducer:
           type: string
     _core.search:AggregationProfileDelegateDebugFilter:
       type: object
       properties:
         results_from_metadata:
-          type: number
+          type: integer
+          format: int32
         query:
           type: string
         specialized_for:
           type: string
         segments_counted_in_constant_time:
-          type: number
+          type: integer
+          format: int32
     _core.search:BoundaryScanner:
       type: string
       enum:
@@ -42160,12 +42188,14 @@ components:
           $ref: '#/components/schemas/_common:Routing'
         _score:
           type: number
+          format: float
         _source:
           type: object
         text:
           type: string
         score:
           type: number
+          format: float
       required:
         - text
     _core.search:Context:
@@ -42203,17 +42233,23 @@ components:
         load_source_count:
           type: number
         load_stored_fields:
-          type: number
+          type: integer
+          format: int32
         load_stored_fields_count:
-          type: number
+          type: integer
+          format: int32
         next_reader:
-          type: number
+          type: integer
+          format: int32
         next_reader_count:
-          type: number
+          type: integer
+          format: int32
         process_count:
-          type: number
+          type: integer
+          format: int32
         process:
-          type: number
+          type: integer
+          format: int32
     _core.search:FetchProfileDebug:
       type: object
       properties:
@@ -42222,7 +42258,8 @@ components:
           items:
             type: string
         fast_path:
-          type: number
+          type: integer
+          format: int32
     _core.search:FieldCollapse:
       type: object
       properties:
@@ -42263,7 +42300,8 @@ components:
           type: string
         boundary_max_scan:
           description: How far to scan for boundary characters.
-          type: number
+          type: integer
+          format: int32
         boundary_scanner:
           $ref: '#/components/schemas/_core.search:BoundaryScanner'
         boundary_scanner_locale:
@@ -42278,22 +42316,26 @@ components:
           $ref: '#/components/schemas/_core.search:HighlighterFragmenter'
         fragment_size:
           description: The size of the highlighted fragment in characters.
-          type: number
+          type: integer
+          format: int32
         highlight_filter:
           type: boolean
         highlight_query:
           $ref: '#/components/schemas/_common.query_dsl:QueryContainer'
         max_fragment_length:
-          type: number
+          type: integer
+          format: int32
         max_analyzed_offset:
           description: |-
             If set to a non-negative value, highlighting stops at this defined maximum limit.
             The rest of the text is not processed, thus not highlighted and no error is returned
             The `max_analyzed_offset` query setting does not override the `index.highlight.max_analyzed_offset` setting, which prevails when it's set to lower value than the query setting.
-          type: number
+          type: integer
+          format: int32
         no_match_size:
           description: The amount of text you want to return from the beginning of the field if there are no matching fragments to highlight.
-          type: number
+          type: integer
+          format: int32
         number_of_fragments:
           description: |-
             The maximum number of fragments to return.
@@ -42301,7 +42343,8 @@ components:
             Instead, the entire field contents are highlighted and returned.
             This can be handy when you need to highlight short texts such as a title or address, but fragmentation is not required.
             If `number_of_fragments` is `0`, `fragment_size` is ignored.
-          type: number
+          type: integer
+          format: int32
         options:
           type: object
           additionalProperties:
@@ -42314,7 +42357,8 @@ components:
             Prevents the `fvh` highlighter from analyzing too many phrases and consuming too much memory.
             When using `matched_fields`, `phrase_limit` phrases per matched field are considered. Raising the limit increases query time and consumes more memory.
             Only supported by the `fvh` highlighter.
-          type: number
+          type: integer
+          format: int32
         post_tags:
           description: |-
             Use in conjunction with `pre_tags` to define the HTML tags to use for the highlighted text.
@@ -42366,7 +42410,8 @@ components:
         - type: object
           properties:
             fragment_offset:
-              type: number
+              type: integer
+              format: int32
             matched_fields:
               $ref: '#/components/schemas/_common:Fields'
             analyzer:
@@ -42428,7 +42473,8 @@ components:
         _seq_no:
           $ref: '#/components/schemas/_common:SequenceNumber'
         _primary_term:
-          type: number
+          type: integer
+          format: int64
         _version:
           $ref: '#/components/schemas/_common:VersionNumber'
         sort:
@@ -42443,7 +42489,8 @@ components:
           description: Total hit count information, present only if `track_total_hits` wasn't `false` in the search request.
           oneOf:
             - $ref: '#/components/schemas/_core.search:TotalHits'
-            - type: number
+            - type: integer
+              format: int64
         hits:
           type: array
           items:
@@ -42463,9 +42510,11 @@ components:
         size:
           description: The maximum number of hits to return per `inner_hits`.
           type: integer
+          format: int32
         from:
           description: Inner hit starting document offset.
           type: integer
+          format: int32
         collapse:
           $ref: '#/components/schemas/_core.search:FieldCollapse'
         docvalue_fields:
@@ -42509,7 +42558,8 @@ components:
         field:
           $ref: '#/components/schemas/_common:Field'
         offset:
-          type: number
+          type: integer
+          format: int32
         _nested:
           $ref: '#/components/schemas/_core.search:NestedIdentity'
       required:
@@ -42535,6 +42585,7 @@ components:
           type: string
         score:
           type: number
+          format: float
         highlighted:
           type: string
         collate_match:
@@ -42564,41 +42615,59 @@ components:
       type: object
       properties:
         advance:
-          type: number
+          type: integer
+          format: int64
         advance_count:
-          type: number
+          type: integer
+          format: int64
         build_scorer:
-          type: number
+          type: integer
+          format: int64
         build_scorer_count:
-          type: number
+          type: integer
+          format: int64
         create_weight:
-          type: number
+          type: integer
+          format: int64
         create_weight_count:
-          type: number
+          type: integer
+          format: int64
         match:
-          type: number
+          type: integer
+          format: int64
         match_count:
-          type: number
+          type: integer
+          format: int64
         shallow_advance:
-          type: number
+          type: integer
+          format: int64
         shallow_advance_count:
-          type: number
+          type: integer
+          format: int64
         next_doc:
-          type: number
+          type: integer
+          format: int64
         next_doc_count:
-          type: number
+          type: integer
+          format: int64
         score:
-          type: number
+          type: integer
+          format: int64
         score_count:
-          type: number
+          type: integer
+          format: int64
         compute_max_score:
-          type: number
+          type: integer
+          format: int64
         compute_max_score_count:
-          type: number
+          type: integer
+          format: int64
         set_min_competitive_score:
-          type: number
+          type: integer
+          format: int64
         set_min_competitive_score_count:
-          type: number
+          type: integer
+          format: int64
       required:
         - advance
         - advance_count
@@ -42644,7 +42713,8 @@ components:
         query:
           $ref: '#/components/schemas/_core.search:RescoreQuery'
         window_size:
-          type: number
+          type: integer
+          format: int32
       required:
         - query
     _core.search:RescoreQuery:
@@ -42655,9 +42725,11 @@ components:
         query_weight:
           description: Relative importance of the original query versus the rescore query.
           type: number
+          format: float
         rescore_query_weight:
           description: Relative importance of the rescore query versus the original query.
           type: number
+          format: float
         score_mode:
           $ref: '#/components/schemas/_core.search:ScoreMode'
       required:
@@ -42666,7 +42738,8 @@ components:
       type: object
       properties:
         took:
-          type: number
+          type: integer
+          format: int64
         timed_out:
           type: boolean
         _shards:
@@ -42688,8 +42761,10 @@ components:
             type: object
         max_score:
           type: number
+          format: float
         num_reduce_phases:
-          type: number
+          type: integer
+          format: int32
         profile:
           $ref: '#/components/schemas/_core.search:Profile'
         pit_id:
@@ -42729,7 +42804,8 @@ components:
           items:
             $ref: '#/components/schemas/_core.search:QueryProfile'
         rewrite_time:
-          type: number
+          type: integer
+          format: int64
       required:
         - collector
         - query
@@ -42787,9 +42863,11 @@ components:
       type: object
       properties:
         length:
-          type: number
+          type: integer
+          format: int32
         offset:
-          type: number
+          type: integer
+          format: int32
         text:
           type: string
       required:
@@ -42822,8 +42900,10 @@ components:
           type: string
         score:
           type: number
+          format: float
         freq:
           type: number
+          format: double
         highlighted:
           type: string
         collate_match:
@@ -42838,7 +42918,8 @@ components:
         relation:
           $ref: '#/components/schemas/_core.search:TotalHitsRelation'
         value:
-          type: number
+          type: integer
+          format: int64
       required:
         - relation
         - value
@@ -42855,7 +42936,8 @@ components:
         Defaults to 10,000 hits.
       oneOf:
         - type: boolean
-        - type: number
+        - type: integer
+          format: int32
     _core.termvectors:FieldStatistics:
       type: object
       properties:
@@ -43097,7 +43179,8 @@ components:
             When possible, let OpenSearch perform early termination automatically.
             Avoid specifying this parameter for requests that target data streams with backing indices across multiple data tiers.
             If set to `0` (default), the query does not terminate early.
-          type: number
+          type: integer
+          format: int32
         timeout:
           description: |-
             Specifies the period of time to wait for a response from each shard.
@@ -43117,8 +43200,6 @@ components:
           $ref: '#/components/schemas/_common:Fields'
         pit:
           $ref: '#/components/schemas/_core.search:PointInTimeReference'
-        runtime_mappings:
-          $ref: '#/components/schemas/_common.mapping:RuntimeFields'
         stats:
           description: |-
             Stats groups to associate with the search.
@@ -46449,11 +46530,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/cluster.stats:FieldTypes'
-        runtime_field_types:
-          description: Contains statistics about runtime field data types used in selected nodes.
-          type: array
-          items:
-            $ref: '#/components/schemas/cluster.stats:RuntimeFieldTypes'
         total_field_count:
           description: Total number of fields in all non-system indices.
           type: number
@@ -46579,67 +46655,6 @@ components:
         - total_in_bytes
         - used_in_bytes
         - used_percent
-    cluster.stats:RuntimeFieldTypes:
-      type: object
-      properties:
-        chars_max:
-          description: Maximum number of characters for a single runtime field script.
-          type: number
-        chars_total:
-          description: Total number of characters for the scripts that define the current runtime field data type.
-          type: number
-        count:
-          description: Number of runtime fields mapped to the field data type in selected nodes.
-          type: number
-        doc_max:
-          description: Maximum number of accesses to doc_values for a single runtime field script
-          type: number
-        doc_total:
-          description: Total number of accesses to doc_values for the scripts that define the current runtime field data type.
-          type: number
-        index_count:
-          description: Number of indices containing a mapping of the runtime field data type in selected nodes.
-          type: number
-        lang:
-          description: Script languages used for the runtime fields scripts.
-          type: array
-          items:
-            type: string
-        lines_max:
-          description: Maximum number of lines for a single runtime field script.
-          type: number
-        lines_total:
-          description: Total number of lines for the scripts that define the current runtime field data type.
-          type: number
-        name:
-          $ref: '#/components/schemas/_common:Name'
-        scriptless_count:
-          description: Number of runtime fields that don't declare a script.
-          type: number
-        shadowed_count:
-          description: Number of runtime fields that shadow an indexed field.
-          type: number
-        source_max:
-          description: Maximum number of accesses to _source for a single runtime field script.
-          type: number
-        source_total:
-          description: Total number of accesses to _source for the scripts that define the current runtime field data type.
-          type: number
-      required:
-        - chars_max
-        - chars_total
-        - count
-        - doc_max
-        - doc_total
-        - index_count
-        - lang
-        - lines_max
-        - lines_total
-        - name
-        - scriptless_count
-        - shadowed_count
-        - source_max
-        - source_total
     cluster.stats:StatsResponseBase:
       allOf:
         - $ref: '#/components/schemas/nodes._common:NodesResponseBase'
@@ -48608,6 +48623,18 @@ components:
           $ref: '#/components/schemas/_common:Uuid'
         index:
           $ref: '#/components/schemas/_common:IndexName'
+        isSearchableSnapshot:
+          type: boolean
+        remoteStoreIndexShallowCopy:
+          type: boolean
+        sourceRemoteStoreRepository:
+          type:
+            - 'null'
+            - string
+        sourceRemoteTranslogRepository:
+          type:
+            - 'null'
+            - string
     indices.recovery:RecoveryStartStatus:
       type: object
       properties:
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
index b5bd3c03af..62d50543d5 100644
--- 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
@@ -1,3 +1,4 @@
+    @Override
     public boolean equals(Object o) {
         {{#extendsOtherShape}}
             if(!super.equals(o)) {
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
index d14479eb81..354fd87e80 100644
--- 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
@@ -1,3 +1,4 @@
+    @Override
     public int hashCode() {
         {{#extendsOtherShape}}
         int result = super.hashCode();
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
index ece94de59b..046ef327cb 100644
--- 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
@@ -1,3 +1,4 @@
+    @Override
     public boolean equals(Object o) {
         if(this == o) return true;
         if(o == null || this.getClass() != o.getClass()) return false;
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
index eb7a1d39a1..68d2a29f3f 100644
--- 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
@@ -1,3 +1,4 @@
+    @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + {{TYPES.Java.Util.Objects}}.hashCode(this._kind);