Skip to content

Commit b896a74

Browse files
ngocnhan-tran1996jzheaux
authored andcommitted
Resolve Observation Bean Name Collisions
Closes gh-16011
1 parent 91832bf commit b896a74

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

config/src/main/java/org/springframework/security/config/annotation/rsocket/ReactiveObservationConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ReactiveObservationConfiguration {
4545

4646
@Bean
4747
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
48-
static ObjectPostProcessor<ReactiveAuthorizationManager<ServerWebExchange>> webAuthorizationManagerPostProcessor(
48+
static ObjectPostProcessor<ReactiveAuthorizationManager<ServerWebExchange>> rSocketAuthorizationManagerPostProcessor(
4949
ObjectProvider<ObservationRegistry> registry, ObjectProvider<SecurityObservationSettings> predicate) {
5050
return new ObjectPostProcessor<>() {
5151
@Override
@@ -59,7 +59,7 @@ public ReactiveAuthorizationManager postProcess(ReactiveAuthorizationManager obj
5959

6060
@Bean
6161
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
62-
static ObjectPostProcessor<ReactiveAuthenticationManager> authenticationManagerPostProcessor(
62+
static ObjectPostProcessor<ReactiveAuthenticationManager> rSocketAuthenticationManagerPostProcessor(
6363
ObjectProvider<ObservationRegistry> registry, ObjectProvider<SecurityObservationSettings> predicate) {
6464
return new ObjectPostProcessor<>() {
6565
@Override
@@ -73,7 +73,7 @@ public ReactiveAuthenticationManager postProcess(ReactiveAuthenticationManager o
7373

7474
@Bean
7575
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
76-
static ObjectPostProcessor<WebFilterChainDecorator> filterChainDecoratorPostProcessor(
76+
static ObjectPostProcessor<WebFilterChainDecorator> rSocketFilterChainDecoratorPostProcessor(
7777
ObjectProvider<ObservationRegistry> registry, ObjectProvider<SecurityObservationSettings> predicate) {
7878
return new ObjectPostProcessor<>() {
7979
@Override

config/src/main/java/org/springframework/security/config/annotation/web/socket/WebSocketObservationConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class WebSocketObservationConfiguration {
4141

4242
@Bean
4343
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
44-
static ObjectPostProcessor<AuthorizationManager<Message<?>>> webAuthorizationManagerPostProcessor(
44+
static ObjectPostProcessor<AuthorizationManager<Message<?>>> webSocketAuthorizationManagerPostProcessor(
4545
ObjectProvider<ObservationRegistry> registry, ObjectProvider<SecurityObservationSettings> predicate) {
4646
return new ObjectPostProcessor<>() {
4747
@Override

0 commit comments

Comments
 (0)