Skip to content

Commit 6333edb

Browse files
committed
Merge branch '2.0.x'
2 parents b58314f + 66156cc commit 6333edb

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ protected void initialized(Supplier<C> context) {
8888
@SuppressWarnings("unchecked")
8989
private Supplier<C> createContext(ServerWebExchange exchange) {
9090
ApplicationContext context = exchange.getApplicationContext();
91-
Assert.state(context != null, "No ApplicationContext found.");
91+
Assert.state(context != null,
92+
"No ApplicationContext found on ServerWebExchange.");
9293
if (this.contextClass.isInstance(context)) {
9394
return () -> (C) context;
9495
}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcherTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void matchesWhenContextIsNull() {
9191
MockServerWebExchange exchange = MockServerWebExchange
9292
.from(MockServerHttpRequest.get("/path").build());
9393
this.thrown.expect(IllegalStateException.class);
94-
this.thrown.expectMessage("No ApplicationContext found.");
94+
this.thrown.expectMessage("No ApplicationContext found on ServerWebExchange.");
9595
new TestApplicationContextServerWebExchangeMatcher<>(ExistingBean.class)
9696
.callMatchesAndReturnProvidedContext(exchange);
9797
}

0 commit comments

Comments
 (0)