Skip to content

Commit 8e3f490

Browse files
Incorporate feedback
Replace Optional by ObjectProvider, remove unecessary annotation Signed-off-by: damable-nuvolex <damable@nuvolex.com>
1 parent 8ad1ec8 commit 8e3f490

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveAuthorizationManagerMethodSecurityConfiguration.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.security.config.annotation.method.configuration;
1818

19-
import java.util.Optional;
20-
2119
import org.aopalliance.intercept.MethodInterceptor;
2220
import org.aopalliance.intercept.MethodInvocation;
2321

@@ -85,16 +83,16 @@ final class ReactiveAuthorizationManagerMethodSecurityConfiguration
8583

8684
private final AuthorizationManagerAfterReactiveMethodInterceptor postAuthorizeMethodInterceptor;
8785

88-
@Autowired
89-
ReactiveAuthorizationManagerMethodSecurityConfiguration(Optional<MethodSecurityExpressionHandler> expressionHandler,
86+
ReactiveAuthorizationManagerMethodSecurityConfiguration(
87+
ObjectProvider<MethodSecurityExpressionHandler> expressionHandlers,
9088
ObjectProvider<ObjectPostProcessor<ReactiveAuthorizationManager<MethodInvocation>>> preAuthorizePostProcessor,
9189
ObjectProvider<ObjectPostProcessor<ReactiveAuthorizationManager<MethodInvocationResult>>> postAuthorizePostProcessor) {
92-
if (expressionHandler.isPresent()) {
93-
final MethodSecurityExpressionHandler handler = expressionHandler.get();
94-
this.preFilterMethodInterceptor = new PreFilterAuthorizationReactiveMethodInterceptor(handler);
95-
this.preAuthorizeAuthorizationManager = new PreAuthorizeReactiveAuthorizationManager(handler);
96-
this.postFilterMethodInterceptor = new PostFilterAuthorizationReactiveMethodInterceptor(handler);
97-
this.postAuthorizeAuthorizationManager = new PostAuthorizeReactiveAuthorizationManager(handler);
90+
MethodSecurityExpressionHandler expressionHandler = expressionHandlers.getIfUnique();
91+
if (expressionHandler != null) {
92+
this.preFilterMethodInterceptor = new PreFilterAuthorizationReactiveMethodInterceptor(expressionHandler);
93+
this.preAuthorizeAuthorizationManager = new PreAuthorizeReactiveAuthorizationManager(expressionHandler);
94+
this.postFilterMethodInterceptor = new PostFilterAuthorizationReactiveMethodInterceptor(expressionHandler);
95+
this.postAuthorizeAuthorizationManager = new PostAuthorizeReactiveAuthorizationManager(expressionHandler);
9896
}
9997
ReactiveAuthorizationManager<MethodInvocation> preAuthorize = preAuthorizePostProcessor
10098
.getIfUnique(ObjectPostProcessor::identity)

0 commit comments

Comments
 (0)