Remove deprecation warnings with Context.putAll

Closes spring-projectsgh-11476
sjohnr · Jul 8, 2022 · 4620bd0 · 4620bd0
1 parent 4a5c0ac
commit 4620bd0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...rg/springframework/security/test/context/support/ReactorContextTestExecutionListener.java b/...rg/springframework/security/test/context/support/ReactorContextTestExecutionListener.java
@@ -22,6 +22,7 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Operators;
 import reactor.util.context.Context;
+import reactor.util.context.ContextView;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
@@ -107,7 +108,7 @@ public Context currentContext() {
 					return context;
 				}
 				Context toMerge = ReactiveSecurityContextHolder.withSecurityContext(Mono.just(this.securityContext));
-				return toMerge.putAll(context);
+				return toMerge.putAll(context.readOnly());
 			}
 
 			@Override

diff --git a/...rc/main/java/org/springframework/security/web/server/context/ReactorContextWebFilter.java b/...rc/main/java/org/springframework/security/web/server/context/ReactorContextWebFilter.java
@@ -49,8 +49,8 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 	}
 
 	private Context withSecurityContext(Context mainContext, ServerWebExchange exchange) {
-		return mainContext
-				.putAll(this.repository.load(exchange).as(ReactiveSecurityContextHolder::withSecurityContext));
+		return mainContext.putAll(
+				this.repository.load(exchange).as(ReactiveSecurityContextHolder::withSecurityContext).readOnly());
 	}
 
 }