diff --git a/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java b/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java
index c25a467af1f58..52ac76cdf958d 100644
--- a/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java
+++ b/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java
@@ -88,8 +88,8 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof BooleanValue) {
-            return ((BooleanValue) obj).value == this.value;
+        if (obj instanceof BooleanValue other) {
+            return other.value == this.value;
         }
         return false;
     }
diff --git a/flink-core/src/main/java/org/apache/flink/types/ByteValue.java b/flink-core/src/main/java/org/apache/flink/types/ByteValue.java
index 73b436efc4a4f..f8e550635c397 100644
--- a/flink-core/src/main/java/org/apache/flink/types/ByteValue.java
+++ b/flink-core/src/main/java/org/apache/flink/types/ByteValue.java
@@ -107,8 +107,8 @@ public int hashCode() {
 
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof ByteValue) {
-            return ((ByteValue) obj).value == this.value;
+        if (obj instanceof ByteValue other) {
+            return other.value == this.value;
         }
         return false;
     }
diff --git a/flink-core/src/main/java/org/apache/flink/types/IntValue.java b/flink-core/src/main/java/org/apache/flink/types/IntValue.java
index 508f47a275a8c..572b9f7b6c0cb 100644
--- a/flink-core/src/main/java/org/apache/flink/types/IntValue.java
+++ b/flink-core/src/main/java/org/apache/flink/types/IntValue.java
@@ -102,8 +102,8 @@ public int hashCode() {
 
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof IntValue) {
-            return ((IntValue) obj).value == this.value;
+        if (obj instanceof IntValue other) {
+            return other.value == this.value;
         }
         return false;
     }
diff --git a/flink-core/src/main/java/org/apache/flink/types/LongValue.java b/flink-core/src/main/java/org/apache/flink/types/LongValue.java
index c94576fadd4cd..95b5fd9b438cd 100644
--- a/flink-core/src/main/java/org/apache/flink/types/LongValue.java
+++ b/flink-core/src/main/java/org/apache/flink/types/LongValue.java
@@ -115,8 +115,8 @@ public int hashCode() {
      */
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof LongValue) {
-            return ((LongValue) obj).value == this.value;
+        if (obj instanceof LongValue other) {
+            return other.value == this.value;
         }
         return false;
     }
diff --git a/flink-core/src/main/java/org/apache/flink/types/ShortValue.java b/flink-core/src/main/java/org/apache/flink/types/ShortValue.java
index d2163b57de205..b259dc5ccf166 100644
--- a/flink-core/src/main/java/org/apache/flink/types/ShortValue.java
+++ b/flink-core/src/main/java/org/apache/flink/types/ShortValue.java
@@ -107,12 +107,12 @@ public int hashCode() {
 
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof ShortValue) {
-            return ((ShortValue) obj).value == this.value;
+        if (obj instanceof ShortValue other) {
+            return other.value == this.value;
         }
         return false;
     }
-
+    
     // --------------------------------------------------------------------------------------------
 
     @Override