root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #18349 from dreis2211

Browse Source 
* gh-18349:
  Fix deprecation warnings caused by BodyInserters.fromObject

Closes gh-18349
pull/18443/head
Andy Wilkinson 5 years ago
parent eb00ba7470 4262aab446
commit 7548da1b40
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
Unescape Escape View File

@ -143,7 +143,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
boolean includeStackTrace = isIncludeStackTrace(request, MediaType.ALL); boolean includeStackTrace = isIncludeStackTrace(request, MediaType.ALL);
Map<String, Object> error = getErrorAttributes(request, includeStackTrace); Map<String, Object> error = getErrorAttributes(request, includeStackTrace);
return ServerResponse.status(getHttpStatus(error)).contentType(MediaType.APPLICATION_JSON) return ServerResponse.status(getHttpStatus(error)).contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromObject(error)); .body(BodyInserters.fromValue(error));
} }
/** /**

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactoryTests.java
Unescape Escape View File

@ -118,7 +118,7 @@ class UndertowReactiveWebServerFactoryTests extends AbstractReactiveWebServerFac
this.webServer.start(); this.webServer.start();
WebClient client = getWebClient().build(); WebClient client = getWebClient().build();
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN) 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)); .flatMap((response) -> response.bodyToMono(String.class));
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World"); assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World");
File accessLog = new File(accessLogDirectory, expectedFile); File accessLog = new File(accessLogDirectory, expectedFile);

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
Unescape Escape View File

@ -94,7 +94,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
this.webServer = factory.getWebServer(new EchoHandler()); this.webServer = factory.getWebServer(new EchoHandler());
this.webServer.start(); this.webServer.start();
Mono<String> result = getWebClient().build().post().uri("/test").contentType(MediaType.TEXT_PLAIN) 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)); .flatMap((response) -> response.bodyToMono(String.class));
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World"); assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World");
assertThat(this.webServer.getPort()).isEqualTo(specificPort); assertThat(this.webServer.getPort()).isEqualTo(specificPort);
@ -122,7 +122,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort()) WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
.clientConnector(connector).build(); .clientConnector(connector).build();
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN) 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)); .flatMap((response) -> response.bodyToMono(String.class));
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World"); 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()) WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
.clientConnector(clientConnector).build(); .clientConnector(clientConnector).build();
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN) 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)); .flatMap((response) -> response.bodyToMono(String.class));
assertThat(result.block(Duration.ofSeconds(30))).isEqualTo("Hello World"); 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()) WebClient client = WebClient.builder().baseUrl("https://localhost:" + this.webServer.getPort())
.clientConnector(clientConnector).build(); .clientConnector(clientConnector).build();
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN) 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)); .flatMap((response) -> response.bodyToMono(String.class));
StepVerifier.create(result).expectError(SSLException.class).verify(Duration.ofSeconds(10)); StepVerifier.create(result).expectError(SSLException.class).verify(Duration.ofSeconds(10));
} }

Write Preview
Loading…
Cancel
Save