diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java
index 2c361fe025dfa..ca6dfa5ef6e51 100644
--- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java
@@ -76,10 +76,7 @@ public int hashCode() {
 
         @Override
         public boolean equals(Object obj) {
-            if (super.equals(obj)) {
-                return true;
-            }
-            return obj != null && getClass() != obj.getClass();
+            return obj == this || (obj != null && obj.getClass() == this.getClass());
         }
     }
 
diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java
index 4415c87e9815e..1cc9335b5963e 100644
--- a/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java
@@ -83,10 +83,7 @@ public int hashCode() {
 
         @Override
         public boolean equals(Object obj) {
-            if (super.equals(obj)) {
-                return true;
-            }
-            return obj != null && getClass() != obj.getClass();
+            return obj == this || (obj != null && obj.getClass() == this.getClass());
         }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java
index ff22e1d57f832..70c3c4458a217 100644
--- a/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java
@@ -86,10 +86,7 @@ public int hashCode() {
 
         @Override
         public boolean equals(Object obj) {
-            if (super.equals(obj)) {
-                return true;
-            }
-            return obj != null && getClass() != obj.getClass();
+            return obj == this || (obj != null && obj.getClass() == this.getClass());
         }
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java
index c36d73e8d12d6..dd8c334d2db61 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/OperationModeUpdateTask.java
@@ -160,7 +160,7 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState)
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), ilmMode, slmMode);
+        return Objects.hash(ilmMode, slmMode);
     }
 
     @Override