From a32fe161d1a99ca28870d7aded4763ff012ed18c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Fri, 1 Mar 2024 11:47:40 +0100
Subject: [PATCH] Polishing.

Handle warnings. Remove redundant code in DefaultReactiveEntityCallbacks.

Original pull request: #3053
See #3055
---
 .../data/mapping/callback/DefaultEntityCallbacks.java       | 1 +
 .../mapping/callback/DefaultReactiveEntityCallbacks.java    | 6 ++----
 .../data/mapping/callback/EntityCallbacks.java              | 1 +
 .../data/mapping/callback/ReactiveEntityCallbacks.java      | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java b/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java
index 01c7db231..8bf06520b 100644
--- a/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java
+++ b/src/main/java/org/springframework/data/mapping/callback/DefaultEntityCallbacks.java
@@ -63,6 +63,7 @@ class DefaultEntityCallbacks implements EntityCallbacks {
 	}
 
 	@Override
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <T> T callback(Class<? extends EntityCallback> callbackType, T entity, Object... args) {
 
 		Assert.notNull(entity, "Entity must not be null");
diff --git a/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java b/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java
index 348192ec8..d4becf307 100644
--- a/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java
+++ b/src/main/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacks.java
@@ -63,14 +63,12 @@ class DefaultReactiveEntityCallbacks implements ReactiveEntityCallbacks {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <T> Mono<T> callback(Class<? extends EntityCallback> callbackType, T entity, Object... args) {
 
 		Assert.notNull(entity, "Entity must not be null");
 
-		Class<T> entityType = (Class<T>) (entity != null
-				? ClassUtils.getUserClass(entity.getClass())
-				: callbackDiscoverer.resolveDeclaredEntityType(callbackType).getRawClass());
+		Class<T> entityType = (Class<T>) ClassUtils.getUserClass(entity.getClass());
 
 		Method callbackMethod = callbackMethodCache.computeIfAbsent(callbackType, it -> {
 
diff --git a/src/main/java/org/springframework/data/mapping/callback/EntityCallbacks.java b/src/main/java/org/springframework/data/mapping/callback/EntityCallbacks.java
index de62395f8..a76a30969 100644
--- a/src/main/java/org/springframework/data/mapping/callback/EntityCallbacks.java
+++ b/src/main/java/org/springframework/data/mapping/callback/EntityCallbacks.java
@@ -47,6 +47,7 @@ public interface EntityCallbacks {
 	 * @return never {@literal null}.
 	 * @throws IllegalArgumentException if a required argument is {@literal null}.
 	 */
+	@SuppressWarnings("rawtypes")
 	<T> T callback(Class<? extends EntityCallback> callbackType, T entity, Object... args);
 
 	/**
diff --git a/src/main/java/org/springframework/data/mapping/callback/ReactiveEntityCallbacks.java b/src/main/java/org/springframework/data/mapping/callback/ReactiveEntityCallbacks.java
index db4f230f2..410516adc 100644
--- a/src/main/java/org/springframework/data/mapping/callback/ReactiveEntityCallbacks.java
+++ b/src/main/java/org/springframework/data/mapping/callback/ReactiveEntityCallbacks.java
@@ -50,6 +50,7 @@ public interface ReactiveEntityCallbacks {
 	 * @return a {@link Mono} emitting the result after invoking the callbacks.
 	 * @throws IllegalArgumentException if a required argument is {@literal null}.
 	 */
+	@SuppressWarnings("rawtypes")
 	<T> Mono<T> callback(Class<? extends EntityCallback> callbackType, T entity, Object... args);
 
 	/**