From 8fd4694c6f4952e1ba2b18453b8603e23e74b514 Mon Sep 17 00:00:00 2001
From: miguel-vila <miguelvilag@gmail.com>
Date: Fri, 20 Sep 2024 11:24:02 +0100
Subject: [PATCH] use fqn for Objects.hashCode, take into account parent

Signed-off-by: miguel-vila <miguelvilag@gmail.com>
---
 .../client/opensearch/_types/BaseNode.java       | 10 +++++-----
 .../opensearch/_types/BulkByScrollFailure.java   | 10 +++++-----
 .../_types/BulkByScrollTaskStatus.java           |  8 ++++----
 .../client/opensearch/_types/ErrorCause.java     | 12 ++++++------
 .../client/opensearch/_types/NodeStatistics.java |  2 +-
 .../opensearch/_types/OpenSearchVersionInfo.java |  2 +-
 .../client/opensearch/_types/ShardFailure.java   |  6 +++---
 .../opensearch/_types/ShardStatistics.java       |  2 +-
 .../DeleteDanglingIndexResponse.java             |  2 +-
 .../ImportDanglingIndexResponse.java             |  2 +-
 .../ListDanglingIndicesResponse.java             |  4 ++--
 .../list_dangling_indices/DanglingIndex.java     |  2 +-
 .../opensearch/ml/DeleteModelGroupResponse.java  |  2 +-
 .../opensearch/ml/DeleteModelResponse.java       |  2 +-
 .../client/opensearch/ml/DeleteTaskResponse.java |  2 +-
 .../opensearch/ml/DeployModelResponse.java       |  2 +-
 .../client/opensearch/ml/GetTaskResponse.java    | 12 ++++++------
 .../client/opensearch/ml/UndeployModelNode.java  |  2 +-
 .../opensearch/ml/UndeployModelResponse.java     |  2 +-
 .../client/opensearch/tasks/CancelResponse.java  |  2 +-
 .../opensearch/tasks/GetTasksResponse.java       |  4 ++--
 .../client/opensearch/tasks/ListResponse.java    |  2 +-
 .../client/opensearch/tasks/Status.java          | 16 ++++++++--------
 .../opensearch/tasks/TaskExecutingNode.java      |  2 +-
 .../client/opensearch/tasks/TaskGroup.java       |  4 ++--
 .../client/opensearch/tasks/TaskInfo.java        |  8 ++++----
 .../opensearch/tasks/TaskListResponseBase.java   |  8 ++++----
 .../client/opensearch/tasks/TaskResponse.java    |  8 ++++----
 .../templates/ObjectShape/HashCode.mustache      |  7 ++++++-
 29 files changed, 76 insertions(+), 71 deletions(-)

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 7346291502..382e9b88f4 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
@@ -284,12 +284,12 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBaseNode
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (attributes != null ? this.attributes.hashCode() : 0);
-        result = 31 * result + (host != null ? this.host.hashCode() : 0);
-        result = 31 * result + (ip != null ? this.ip.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.attributes);
+        result = 31 * result + java.util.Objects.hashCode(this.host);
+        result = 31 * result + java.util.Objects.hashCode(this.ip);
         result = 31 * result + this.name.hashCode();
-        result = 31 * result + (roles != null ? this.roles.hashCode() : 0);
-        result = 31 * result + (transportAddress != null ? this.transportAddress.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.roles);
+        result = 31 * result + java.util.Objects.hashCode(this.transportAddress);
         return result;
     }
 
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 9001de4dd4..4c59014651 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
@@ -316,11 +316,11 @@ protected static void setupBulkByScrollFailureDeserializer(ObjectDeserializer<Bu
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (cause != null ? this.cause.hashCode() : 0);
-        result = 31 * result + (id != null ? this.id.hashCode() : 0);
-        result = 31 * result + (index != null ? this.index.hashCode() : 0);
-        result = 31 * result + (node != null ? this.node.hashCode() : 0);
-        result = 31 * result + (reason != null ? this.reason.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.cause);
+        result = 31 * result + java.util.Objects.hashCode(this.id);
+        result = 31 * result + java.util.Objects.hashCode(this.index);
+        result = 31 * result + java.util.Objects.hashCode(this.node);
+        result = 31 * result + java.util.Objects.hashCode(this.reason);
         result = 31 * result + Integer.hashCode(this.shard);
         result = 31 * result + Integer.hashCode(this.status);
         return result;
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 a44549b7eb..184a756e95 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
@@ -618,17 +618,17 @@ protected static void setupBulkByScrollTaskStatusDeserializer(ObjectDeserializer
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.batches);
-        result = 31 * result + (canceled != null ? this.canceled.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.canceled);
         result = 31 * result + Long.hashCode(this.created);
         result = 31 * result + Long.hashCode(this.deleted);
         result = 31 * result + Long.hashCode(this.noops);
         result = 31 * result + Float.hashCode(this.requestsPerSecond);
         result = 31 * result + this.retries.hashCode();
         result = 31 * result + Integer.hashCode(this.sliceId);
-        result = 31 * result + (slices != null ? this.slices.hashCode() : 0);
-        result = 31 * result + (throttled != null ? this.throttled.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.slices);
+        result = 31 * result + java.util.Objects.hashCode(this.throttled);
         result = 31 * result + Long.hashCode(this.throttledMillis);
-        result = 31 * result + (throttledUntil != null ? this.throttledUntil.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.throttledUntil);
         result = 31 * result + Long.hashCode(this.throttledUntilMillis);
         result = 31 * result + Long.hashCode(this.total);
         result = 31 * result + Long.hashCode(this.updated);
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 3d3f834ad0..a4c26f544d 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
@@ -407,13 +407,13 @@ protected static void setupErrorCauseDeserializer(ObjectDeserializer<ErrorCause.
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (causedBy != null ? this.causedBy.hashCode() : 0);
-        result = 31 * result + (reason != null ? this.reason.hashCode() : 0);
-        result = 31 * result + (rootCause != null ? this.rootCause.hashCode() : 0);
-        result = 31 * result + (stackTrace != null ? this.stackTrace.hashCode() : 0);
-        result = 31 * result + (suppressed != null ? this.suppressed.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.causedBy);
+        result = 31 * result + java.util.Objects.hashCode(this.reason);
+        result = 31 * result + java.util.Objects.hashCode(this.rootCause);
+        result = 31 * result + java.util.Objects.hashCode(this.stackTrace);
+        result = 31 * result + java.util.Objects.hashCode(this.suppressed);
         result = 31 * result + this.type.hashCode();
-        result = 31 * result + (metadata != null ? this.metadata.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.metadata);
         return result;
     }
 
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 a0588cd597..b1fea7cc6a 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
@@ -259,7 +259,7 @@ protected static void setupNodeStatisticsDeserializer(ObjectDeserializer<NodeSta
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.failed);
-        result = 31 * result + (failures != null ? this.failures.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.failures);
         result = 31 * result + Integer.hashCode(this.successful);
         result = 31 * result + Integer.hashCode(this.total);
         return result;
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 62c5ab5f50..b94dba2c0b 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
@@ -355,7 +355,7 @@ protected static void setupOpenSearchVersionInfoDeserializer(ObjectDeserializer<
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.buildDate.hashCode();
-        result = 31 * result + (buildFlavor != null ? this.buildFlavor.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.buildFlavor);
         result = 31 * result + this.buildHash.hashCode();
         result = 31 * result + Boolean.hashCode(this.buildSnapshot);
         result = 31 * result + this.buildType.hashCode();
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 19d7915ac5..2066480d64 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
@@ -248,11 +248,11 @@ protected static void setupShardFailureDeserializer(ObjectDeserializer<ShardFail
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (index != null ? this.index.hashCode() : 0);
-        result = 31 * result + (node != null ? this.node.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.index);
+        result = 31 * result + java.util.Objects.hashCode(this.node);
         result = 31 * result + this.reason.hashCode();
         result = 31 * result + Integer.hashCode(this.shard);
-        result = 31 * result + (status != null ? this.status.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.status);
         return result;
     }
 
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 ccefee390c..5ef8c54cd1 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
@@ -267,7 +267,7 @@ protected static void setupShardStatisticsDeserializer(ObjectDeserializer<ShardS
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.failed);
-        result = 31 * result + (failures != null ? this.failures.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.failures);
         result = 31 * result + Integer.hashCode(this.skipped);
         result = 31 * result + Integer.hashCode(this.successful);
         result = 31 * result + Integer.hashCode(this.total);
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 900dc25918..59b50d34d5 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,7 +103,7 @@ protected static void setupDeleteDanglingIndexResponseDeserializer(ObjectDeseria
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 939ef2af0f..c1fbd03fc7 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,7 +103,7 @@ protected static void setupImportDanglingIndexResponseDeserializer(ObjectDeseria
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 1181fb28c5..5387589e19 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
@@ -233,9 +233,9 @@ protected static void setupListDanglingIndicesResponseDeserializer(ObjectDeseria
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (clusterName != null ? this.clusterName.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.clusterName);
         result = 31 * result + this.danglingIndices.hashCode();
-        result = 31 * result + (nodes != null ? this.nodes.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.nodes);
         return result;
     }
 
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 bb6e0ea9f6..16e9d133ef 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
@@ -252,7 +252,7 @@ protected static void setupDanglingIndexDeserializer(ObjectDeserializer<Dangling
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (creationDate != null ? this.creationDate.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.creationDate);
         result = 31 * result + Long.hashCode(this.creationDateMillis);
         result = 31 * result + this.indexName.hashCode();
         result = 31 * result + this.indexUuid.hashCode();
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 65d097767f..29ea60b07b 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,7 +75,7 @@ protected static void setupDeleteModelGroupResponseDeserializer(ObjectDeserializ
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 602226d8de..7e9898aedd 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,7 +75,7 @@ protected static void setupDeleteModelResponseDeserializer(ObjectDeserializer<De
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 c7382e0328..4c9ee644c9 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,7 +75,7 @@ protected static void setupDeleteTaskResponseDeserializer(ObjectDeserializer<Del
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 554024bbc0..18da4f063a 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
@@ -163,7 +163,7 @@ public int hashCode() {
         int result = 17;
         result = 31 * result + this.status.hashCode();
         result = 31 * result + this.taskId.hashCode();
-        result = 31 * result + (taskType != null ? this.taskType.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.taskType);
         return result;
     }
 
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 7bf92c6ee6..394c80b6c7 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
@@ -396,15 +396,15 @@ protected static void setupGetTaskResponseDeserializer(ObjectDeserializer<GetTas
     public int hashCode() {
         int result = 17;
         result = 31 * result + Long.hashCode(this.createTime);
-        result = 31 * result + (error != null ? this.error.hashCode() : 0);
-        result = 31 * result + (functionName != null ? this.functionName.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.error);
+        result = 31 * result + java.util.Objects.hashCode(this.functionName);
         result = 31 * result + Boolean.hashCode(this.isAsync);
         result = 31 * result + Long.hashCode(this.lastUpdateTime);
-        result = 31 * result + (modelId != null ? this.modelId.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.modelId);
         result = 31 * result + this.state.hashCode();
-        result = 31 * result + (taskId != null ? this.taskId.hashCode() : 0);
-        result = 31 * result + (taskType != null ? this.taskType.hashCode() : 0);
-        result = 31 * result + (workerNode != null ? this.workerNode.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.taskId);
+        result = 31 * result + java.util.Objects.hashCode(this.taskType);
+        result = 31 * result + java.util.Objects.hashCode(this.workerNode);
         return result;
     }
 
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 a4af02d346..c4e7ce4f8b 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
@@ -136,7 +136,7 @@ protected static void setupUndeployModelNodeDeserializer(ObjectDeserializer<Unde
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (stats != null ? this.stats.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.stats);
         return result;
     }
 
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java
index 20073029cf..fd1ff37686 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/ml/UndeployModelResponse.java
@@ -143,7 +143,7 @@ protected static void setupUndeployModelResponseDeserializer(ObjectDeserializer<
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (nodes != null ? this.nodes.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.nodes);
         return result;
     }
 
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 8b2f91f912..efb384f162 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,7 +98,7 @@ protected static void setupCancelResponseDeserializer(ObjectDeserializer<CancelR
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 472ef67547..ed34e0343e 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
@@ -236,8 +236,8 @@ protected static void setupGetTasksResponseDeserializer(ObjectDeserializer<GetTa
     public int hashCode() {
         int result = 17;
         result = 31 * result + Boolean.hashCode(this.completed);
-        result = 31 * result + (error != null ? this.error.hashCode() : 0);
-        result = 31 * result + (response != null ? this.response.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.error);
+        result = 31 * result + java.util.Objects.hashCode(this.response);
         result = 31 * result + this.task.hashCode();
         return result;
     }
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 df412a3337..27dc936c9f 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,7 +98,7 @@ protected static void setupListResponseDeserializer(ObjectDeserializer<ListRespo
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         return result;
     }
 
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 c5fded3e17..9a614a66a5 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
@@ -771,24 +771,24 @@ protected static void setupStatusDeserializer(ObjectDeserializer<Status.Builder>
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.batches);
-        result = 31 * result + (canceled != null ? this.canceled.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.canceled);
         result = 31 * result + Long.hashCode(this.created);
         result = 31 * result + Long.hashCode(this.deleted);
         result = 31 * result + Long.hashCode(this.noops);
-        result = 31 * result + (phase != null ? this.phase.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.phase);
         result = 31 * result + Float.hashCode(this.requestsPerSecond);
-        result = 31 * result + (retries != null ? this.retries.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.retries);
         result = 31 * result + Integer.hashCode(this.sliceId);
-        result = 31 * result + (slices != null ? this.slices.hashCode() : 0);
-        result = 31 * result + (state != null ? this.state.hashCode() : 0);
-        result = 31 * result + (throttled != null ? this.throttled.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.slices);
+        result = 31 * result + java.util.Objects.hashCode(this.state);
+        result = 31 * result + java.util.Objects.hashCode(this.throttled);
         result = 31 * result + Long.hashCode(this.throttledMillis);
-        result = 31 * result + (throttledUntil != null ? this.throttledUntil.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.throttledUntil);
         result = 31 * result + Long.hashCode(this.throttledUntilMillis);
         result = 31 * result + Long.hashCode(this.total);
         result = 31 * result + Long.hashCode(this.updated);
         result = 31 * result + Long.hashCode(this.versionConflicts);
-        result = 31 * result + (metadata != null ? this.metadata.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.metadata);
         return result;
     }
 
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 cf7044462d..d609e19baf 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
@@ -162,7 +162,7 @@ protected static void setupTaskExecutingNodeDeserializer(ObjectDeserializer<Task
     }
 
     public int hashCode() {
-        int result = 17;
+        int result = super.hashCode();
         result = 31 * result + this.tasks.hashCode();
         return result;
     }
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 04c1875a62..9244975a56 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
@@ -164,8 +164,8 @@ protected static void setupTaskGroupDeserializer(ObjectDeserializer<TaskGroup.Bu
     }
 
     public int hashCode() {
-        int result = 17;
-        result = 31 * result + (children != null ? this.children.hashCode() : 0);
+        int result = super.hashCode();
+        result = 31 * result + java.util.Objects.hashCode(this.children);
         return result;
     }
 
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 9ae6a65e1e..6d2cb558b0 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
@@ -484,15 +484,15 @@ public int hashCode() {
         result = 31 * result + this.action.hashCode();
         result = 31 * result + Boolean.hashCode(this.cancellable);
         result = 31 * result + Boolean.hashCode(this.cancelled);
-        result = 31 * result + (description != null ? this.description.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.description);
         result = 31 * result + this.headers.hashCode();
         result = 31 * result + Long.hashCode(this.id);
         result = 31 * result + this.node.hashCode();
-        result = 31 * result + (parentTaskId != null ? this.parentTaskId.hashCode() : 0);
-        result = 31 * result + (runningTime != null ? this.runningTime.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.parentTaskId);
+        result = 31 * result + java.util.Objects.hashCode(this.runningTime);
         result = 31 * result + Long.hashCode(this.runningTimeInNanos);
         result = 31 * result + Long.hashCode(this.startTimeInMillis);
-        result = 31 * result + (status != null ? this.status.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.status);
         result = 31 * result + this.type.hashCode();
         return result;
     }
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 264e0a8c35..7d0d8d22bc 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
@@ -309,10 +309,10 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTaskList
 
     public int hashCode() {
         int result = 17;
-        result = 31 * result + (nodeFailures != null ? this.nodeFailures.hashCode() : 0);
-        result = 31 * result + (nodes != null ? this.nodes.hashCode() : 0);
-        result = 31 * result + (taskFailures != null ? this.taskFailures.hashCode() : 0);
-        result = 31 * result + (tasks != null ? this.tasks.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.nodeFailures);
+        result = 31 * result + java.util.Objects.hashCode(this.nodes);
+        result = 31 * result + java.util.Objects.hashCode(this.taskFailures);
+        result = 31 * result + java.util.Objects.hashCode(this.tasks);
         return result;
     }
 
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 c44b6c8916..04a46a16dd 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
@@ -722,7 +722,7 @@ protected static void setupTaskResponseDeserializer(ObjectDeserializer<TaskRespo
     public int hashCode() {
         int result = 17;
         result = 31 * result + Integer.hashCode(this.batches);
-        result = 31 * result + (canceled != null ? this.canceled.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.canceled);
         result = 31 * result + Long.hashCode(this.created);
         result = 31 * result + Long.hashCode(this.deleted);
         result = 31 * result + this.failures.hashCode();
@@ -730,10 +730,10 @@ public int hashCode() {
         result = 31 * result + Float.hashCode(this.requestsPerSecond);
         result = 31 * result + this.retries.hashCode();
         result = 31 * result + Integer.hashCode(this.sliceId);
-        result = 31 * result + (slices != null ? this.slices.hashCode() : 0);
-        result = 31 * result + (throttled != null ? this.throttled.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.slices);
+        result = 31 * result + java.util.Objects.hashCode(this.throttled);
         result = 31 * result + Long.hashCode(this.throttledMillis);
-        result = 31 * result + (throttledUntil != null ? this.throttledUntil.hashCode() : 0);
+        result = 31 * result + java.util.Objects.hashCode(this.throttledUntil);
         result = 31 * result + Long.hashCode(this.throttledUntilMillis);
         result = 31 * result + Boolean.hashCode(this.timedOut);
         result = 31 * result + Long.hashCode(this.took);
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 a80908c42d..8fbe10adca 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,5 +1,10 @@
     public int hashCode() {
+        {{#extendsOtherShape}}
+        int result = super.hashCode();
+        {{/extendsOtherShape}}
+        {{^extendsOtherShape}}
         int result = 17;
+        {{/extendsOtherShape}}
         {{#fields}}
             {{#isUnboxedPrimitive}}
                 result = 31 * result + {{getBoxedType}}.hashCode(this.{{name}});
@@ -9,7 +14,7 @@
                     result = 31 * result + this.{{name}}.hashCode();
                 {{/isRequired}}
                 {{^isRequired}}
-                    result = 31 * result + ({{name}} != null ? this.{{name}}.hashCode() : 0);
+                    result = 31 * result + java.util.Objects.hashCode(this.{{name}});
                 {{/isRequired}}
             {{/isUnboxedPrimitive}}
         {{/fields}}