spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-06 01:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Improve null-safety of module/spring-boot-webflux

Browse Source 
See gh-46926
This commit is contained in:
Moritz Halbritter
2025-08-28 09:40:23 +02:00
parent 89c64ef443
commit 3dba915c01
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/endpoint/web/AbstractWebFluxEndpointHandlerMapping.java
+2 -2
View File
@@ -433,8 +433,8 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
if (result instanceof Flux) {
result = ((Flux<?>) result).collectList();
}
return Mono.from(result)
.map(this::toResponseEntity)
Mono<?> mono = (result != null) ? Mono.from(result) : Mono.empty();
return mono.map(this::toResponseEntity)
.onErrorMap(InvalidEndpointRequestException.class,
(ex) -> new ResponseStatusException(HttpStatus.BAD_REQUEST, ex.getReason()))
.defaultIfEmpty(new ResponseEntity<>(
module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/error/DefaultErrorWebExceptionHandler.java
+6 -1
View File
@@ -130,10 +130,15 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
return Flux.just(getData(status).toArray(new String[] {}))
.flatMap((viewName) -> renderErrorView(viewName, responseBody, errorAttributes))
.switchIfEmpty(this.errorProperties.getWhitelabel().isEnabled()
? renderDefaultErrorView(responseBody, errorAttributes) : Mono.error(getError(request)))
? renderDefaultErrorView(responseBody, errorAttributes) : getErrorMono(request))
.next();
}
private Mono<ServerResponse> getErrorMono(ServerRequest request) {
Throwable error = getError(request);
return (error != null) ? Mono.error(error) : Mono.empty();
}
private List<String> getData(int errorStatus) {
List<String> data = new ArrayList<>();
data.add("error/" + errorStatus);