Add support ResolvableTypeProvider to authorization events

Closes gh-16700

Signed-off-by: Max Batischev <[email protected]>

Author: franticticktick

core/src/main/java/org/springframework/security/authorization/event/AuthorizationDeniedEvent.java

@@ -19,6 +19,8 @@
 import java.util.function.Supplier;
 
 import org.springframework.context.ApplicationEvent;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.ResolvableTypeProvider;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationResult;
 import org.springframework.security.core.Authentication;
@@ -31,7 +33,7 @@
  * @since 5.7
  */
 @SuppressWarnings("serial")
-public class AuthorizationDeniedEvent<T> extends AuthorizationEvent {
+public class AuthorizationDeniedEvent<T> extends AuthorizationEvent implements ResolvableTypeProvider {
 
 	/**
 	 * @deprecated Please use an {@link AuthorizationResult} constructor instead
@@ -59,4 +61,14 @@ public T getObject() {
 		return (T) getSource();
 	}
 
+	/**
+	 * Get {@link ResolvableType} of this class.
+	 * @return {@link ResolvableType}
+	 * @since 6.5
+	 */
+	@Override
+	public ResolvableType getResolvableType() {
+		return ResolvableType.forClassWithGenerics(getClass(), ResolvableType.forInstance(getObject()));
+	}
+
 }

core/src/main/java/org/springframework/security/authorization/event/AuthorizationEvent.java

@@ -20,8 +20,6 @@
 import java.util.function.Supplier;
 
 import org.springframework.context.ApplicationEvent;
-import org.springframework.core.ResolvableType;
-import org.springframework.core.ResolvableTypeProvider;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationResult;
 import org.springframework.security.core.Authentication;
@@ -35,7 +33,7 @@
  * @since 5.8
  */
 @SuppressWarnings("serial")
-public class AuthorizationEvent extends ApplicationEvent implements ResolvableTypeProvider {
+public class AuthorizationEvent extends ApplicationEvent {
 
 	@Serial
 	private static final long serialVersionUID = -9053927371500241295L;
@@ -112,14 +110,4 @@ public AuthorizationResult getAuthorizationResult() {
 		return this.result;
 	}
 
-	/**
-	 * Get {@link ResolvableType} of this class.
-	 * @return {@link ResolvableType}
-	 * @since 6.5
-	 */
-	@Override
-	public ResolvableType getResolvableType() {
-		return ResolvableType.forClassWithGenerics(getClass(), ResolvableType.forInstance(getObject()));
-	}
-
 }

core/src/main/java/org/springframework/security/authorization/event/AuthorizationGrantedEvent.java

@@ -20,6 +20,8 @@
 import java.util.function.Supplier;
 
 import org.springframework.context.ApplicationEvent;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.ResolvableTypeProvider;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationResult;
 import org.springframework.security.core.Authentication;
@@ -32,7 +34,7 @@
  * @since 5.7
  */
 @SuppressWarnings("serial")
-public class AuthorizationGrantedEvent<T> extends AuthorizationEvent {
+public class AuthorizationGrantedEvent<T> extends AuthorizationEvent implements ResolvableTypeProvider {
 
 	@Serial
 	private static final long serialVersionUID = -8690818228055810339L;
@@ -65,4 +67,14 @@ public T getObject() {
 		return (T) getSource();
 	}
 
+	/**
+	 * Get {@link ResolvableType} of this class.
+	 * @return {@link ResolvableType}
+	 * @since 6.5
+	 */
+	@Override
+	public ResolvableType getResolvableType() {
+		return ResolvableType.forClassWithGenerics(getClass(), ResolvableType.forInstance(getObject()));
+	}
+
 }