Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Josh Cummings 2024-03-22 14:33:57 -06:00
parent 04799c5aac afcce0c277
commit 148776309f
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/springframework/security/authorization/AuthorizationObservationConvention.java
View File

@ -21,8 +21,6 @@ import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention; import io.micrometer.observation.ObservationConvention;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.springframework.security.authorization.method.MethodInvocationResult;
/** /**
* An {@link ObservationConvention} for translating authorizations into {@link KeyValues}. * An {@link ObservationConvention} for translating authorizations into {@link KeyValues}.
* *
@ -85,10 +83,10 @@ public final class AuthorizationObservationConvention
if (context.getObject() instanceof MethodInvocation) { if (context.getObject() instanceof MethodInvocation) {
return "method"; return "method";
} }
if (context.getObject() instanceof MethodInvocationResult) { String className = context.getObject().getClass().getSimpleName();
if (className.contains("Method")) {
return "method"; return "method";
} }
String className = context.getObject().getClass().getSimpleName();
if (className.contains("Request")) { if (className.contains("Request")) {
return "request"; return "request";
} }