diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EscapeCharacter.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EscapeCharacter.java
index 99a1dd02c..b9897832f 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EscapeCharacter.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EscapeCharacter.java
@@ -69,11 +69,10 @@ public final class EscapeCharacter {
 			return true;
 		}
 
-		if (!(o instanceof EscapeCharacter)) {
+		if (!(o instanceof EscapeCharacter that)) {
 			return false;
 		}
 
-		EscapeCharacter that = (EscapeCharacter) o;
 		return escapeCharacter == that.escapeCharacter;
 	}
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinding.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinding.java
index f60be1419..4778943f6 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinding.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinding.java
@@ -279,12 +279,10 @@ class ParameterBinding {
 		@Override
 		public boolean equals(Object obj) {
 
-			if (!(obj instanceof LikeParameterBinding)) {
+			if (!(obj instanceof LikeParameterBinding that)) {
 				return false;
 			}
 
-			LikeParameterBinding that = (LikeParameterBinding) obj;
-
 			return super.equals(obj) && this.type.equals(that.type);
 		}
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java
index c589001f5..e86a59151 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java
@@ -77,11 +77,10 @@ class ProcedureParameter {
 			return true;
 		}
 
-		if (!(o instanceof ProcedureParameter)) {
+		if (!(o instanceof ProcedureParameter that)) {
 			return false;
 		}
 
-		ProcedureParameter that = (ProcedureParameter) o;
 		return Objects.equals(name, that.name) && mode == that.mode && Objects.equals(type, that.type);
 	}
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
index 0357fefa8..80403737d 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
@@ -223,12 +223,10 @@ public final class BeanDefinitionUtils {
 				return true;
 			}
 
-			if (!(o instanceof EntityManagerFactoryBeanDefinition)) {
+			if (!(o instanceof EntityManagerFactoryBeanDefinition that)) {
 				return false;
 			}
 
-			EntityManagerFactoryBeanDefinition that = (EntityManagerFactoryBeanDefinition) o;
-
 			if (!ObjectUtils.nullSafeEquals(beanName, that.beanName)) {
 				return false;
 			}
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemId.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemId.java
index 27b5417af..774c609c9 100755
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemId.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemId.java
@@ -58,11 +58,9 @@ public class ItemId implements Serializable {
 	public boolean equals(Object o) {
 		if (this == o)
 			return true;
-		if (!(o instanceof ItemId))
+		if (!(o instanceof ItemId itemId))
 			return false;
 
-		ItemId itemId = (ItemId) o;
-
 		if (id != null ? !id.equals(itemId.id) : itemId.id != null)
 			return false;
 		return manufacturerId != null ? manufacturerId.equals(itemId.manufacturerId) : itemId.manufacturerId == null;
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemSiteId.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemSiteId.java
index e645fe3f4..c691ac8f5 100755
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemSiteId.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/ItemSiteId.java
@@ -42,11 +42,9 @@ public class ItemSiteId implements Serializable {
 	public boolean equals(Object o) {
 		if (this == o)
 			return true;
-		if (!(o instanceof ItemSiteId))
+		if (!(o instanceof ItemSiteId that))
 			return false;
 
-		ItemSiteId that = (ItemSiteId) o;
-
 		if (item != null ? !item.equals(that.item) : that.item != null)
 			return false;
 		return site != null ? site.equals(that.site) : that.site == null;
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java
index ba1cef184..d029ba5c9 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java
@@ -1,13 +1,13 @@
 package org.springframework.data.jpa.domain.sample;
 
-import java.io.Serializable;
-
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 
+import java.io.Serializable;
+
 @Entity
 @IdClass(SampleWithIdClass.SampleWithIdClassPK.class)
 @Access(AccessType.FIELD)
@@ -29,12 +29,10 @@ public class SampleWithIdClass {
 				return true;
 			}
 
-			if (!(obj instanceof SampleWithIdClassPK)) {
+			if (!(obj instanceof SampleWithIdClassPK that)) {
 				return false;
 			}
 
-			SampleWithIdClassPK that = (SampleWithIdClassPK) obj;
-
 			return this.first.equals(that.first) && this.second.equals(that.second);
 		}
 
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java
index d98ed10d6..ec981b020 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java
@@ -262,12 +262,10 @@ public class User {
 	@Override
 	public boolean equals(Object obj) {
 
-		if (!(obj instanceof User)) {
+		if (!(obj instanceof User that)) {
 			return false;
 		}
 
-		User that = (User) obj;
-
 		if ((null == this.getId()) || (null == that.getId())) {
 			return false;
 		}