mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #18349 from dreis2211
* gh-18349: Fix deprecation warnings caused by BodyInserters.fromObject Closes gh-18349
This commit is contained in:
commit
7548da1b40
@ -143,7 +143,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
|
||||
boolean includeStackTrace = isIncludeStackTrace(request, MediaType.ALL);
|
||||
Map<String, Object> error = getErrorAttributes(request, includeStackTrace);
|
||||
return ServerResponse.status(getHttpStatus(error)).contentType(MediaType.APPLICATION_JSON)
|
||||
.body(BodyInserters.fromObject(error));
|
||||
.body(BodyInserters.fromValue(error));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -118,7 +118,7 @@ class UndertowReactiveWebServerFactoryTests extends AbstractReactiveWebServerFac
|
||||
this.webServer.start();
|
||||
WebClient client = getWebClient().build();
|
||||
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
|
||||
.body(BodyInserters.fromObject("Hello World")).exchange()
|
||||
.body(BodyInserters.fromValue("Hello World")).exchange()
|
||||
.flatMap((response) -> response.bodyToMono(String.class));
|
||||
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World");
|
||||
File accessLog = new File(accessLogDirectory, expectedFile);
|
||||
|
@ -94,7 +94,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
|
||||
this.webServer = factory.getWebServer(new EchoHandler());
|
||||
this.webServer.start();
|
||||
Mono<String> result = getWebClient().build().post().uri("/test").contentType(MediaType.TEXT_PLAIN)
|
||||
.body(BodyInserters.fromObject("Hello World")).exchange()
|
||||
.body(BodyInserters.fromValue("Hello World")).exchange()
|
||||
.flatMap((response) -> response.bodyToMono(String.class));
|
||||
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World");
|
||||
assertThat(this.webServer.getPort()).isEqualTo(specificPort);
|
||||
@ -122,7 +122,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
|
||||
WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
|
||||
.clientConnector(connector).build();
|
||||
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
|
||||
.body(BodyInserters.fromObject("Hello World")).exchange()
|
||||
.body(BodyInserters.fromValue("Hello World")).exchange()
|
||||
.flatMap((response) -> response.bodyToMono(String.class));
|
||||
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World");
|
||||
}
|
||||
@ -176,7 +176,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
|
||||
WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
|
||||
.clientConnector(clientConnector).build();
|
||||
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
|
||||
.body(BodyInserters.fromObject("Hello World")).exchange()
|
||||
.body(BodyInserters.fromValue("Hello World")).exchange()
|
||||
.flatMap((response) -> response.bodyToMono(String.class));
|
||||
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World");
|
||||
}
|
||||
@ -209,7 +209,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
|
||||
WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
|
||||
.clientConnector(clientConnector).build();
|
||||
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
|
||||
.body(BodyInserters.fromObject("Hello World")).exchange()
|
||||
.body(BodyInserters.fromValue("Hello World")).exchange()
|
||||
.flatMap((response) -> response.bodyToMono(String.class));
|
||||
StepVerifier.create(result).expectError(SSLException.class).verify(Duration.ofSeconds(10));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user