Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to latest Reactor 3.1 API changes

Browse Source 
Issue: SPR-15318
This commit is contained in:
Sebastien Deleuze
2017-04-14 13:18:20 +02:00
parent 135651de9a
commit 005e85b0f5
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java
View File

@@ -90,7 +90,7 @@ public class DecoderHttpMessageReader<T> implements HttpMessageReader<T> {
MediaType contentType = getContentType(message); MediaType contentType = getContentType(message);
return this.decoder return this.decoder
.decode(message.getBody(), elementType, contentType, hints) .decode(message.getBody(), elementType, contentType, hints)
.mapError(this::mapError); .onErrorMap(this::mapError);
} }
@Override @Override
@@ -100,7 +100,7 @@ public class DecoderHttpMessageReader<T> implements HttpMessageReader<T> {
MediaType contentType = getContentType(message); MediaType contentType = getContentType(message);
return this.decoder return this.decoder
.decodeToMono(message.getBody(), elementType, contentType, hints) .decodeToMono(message.getBody(), elementType, contentType, hints)
.mapError(this::mapError); .onErrorMap(this::mapError);
} }
private MediaType getContentType(HttpMessage inputMessage) { private MediaType getContentType(HttpMessage inputMessage) {

2
spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
View File

@@ -99,7 +99,7 @@ public class EncoderHttpMessageWriter<T> implements HttpMessageWriter<T> {
Flux<DataBuffer> body = this.encoder Flux<DataBuffer> body = this.encoder
.encode(inputStream, message.bufferFactory(), elementType, contentType, hints) .encode(inputStream, message.bufferFactory(), elementType, contentType, hints)
.mapError(this::mapError); .onErrorMap(this::mapError);
return isStreamingMediaType(contentType) ? return isStreamingMediaType(contentType) ?
message.writeAndFlushWith(body.map(Flux::just)) : message.writeAndFlushWith(body.map(Flux::just)) :

2
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
View File

@@ -57,7 +57,7 @@ public class ReactorHttpHandlerAdapter
ReactorServerHttpResponse resp = new ReactorServerHttpResponse(response, bufferFactory); ReactorServerHttpResponse resp = new ReactorServerHttpResponse(response, bufferFactory);
return this.httpHandler.handle(req, resp) return this.httpHandler.handle(req, resp)
.switchOnError(ex -> { .onErrorResume(ex -> {
logger.error("Could not complete request", ex); logger.error("Could not complete request", ex);
response.status(HttpResponseStatus.INTERNAL_SERVER_ERROR); response.status(HttpResponseStatus.INTERNAL_SERVER_ERROR);
return Mono.empty(); return Mono.empty();

2
spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java
View File

@@ -66,7 +66,7 @@ public class RxNettyHttpHandlerAdapter implements RequestHandler<ByteBuf, ByteBu
RxNettyServerHttpResponse response = new RxNettyServerHttpResponse(nativeResponse, bufferFactory); RxNettyServerHttpResponse response = new RxNettyServerHttpResponse(nativeResponse, bufferFactory);
Publisher<Void> result = this.httpHandler.handle(request, response) Publisher<Void> result = this.httpHandler.handle(request, response)
.switchOnError(ex -> { .onErrorResume(ex -> {
logger.error("Could not complete request", ex); logger.error("Could not complete request", ex);
nativeResponse.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); nativeResponse.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
return Mono.empty(); return Mono.empty();

2
spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java
View File

@@ -76,7 +76,7 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa
public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) { public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {
ServerWebExchange exchange = createExchange(request, response); ServerWebExchange exchange = createExchange(request, response);
return getDelegate().handle(exchange) return getDelegate().handle(exchange)
.switchOnError(ex -> { .onErrorResume(ex -> {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Could not complete request", ex); logger.debug("Could not complete request", ex);
} }

2
spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java
View File

@@ -99,7 +99,7 @@ public class ExceptionHandlingWebHandler extends WebHandlerDecorator {
} }
for (WebExceptionHandler handler : this.exceptionHandlers) { for (WebExceptionHandler handler : this.exceptionHandlers) {
completion = completion.switchOnError(ex -> handler.handle(exchange, ex)); completion = completion.onErrorResume(ex -> handler.handle(exchange, ex));
} }
return completion; return completion;

2
spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java
View File

@@ -96,7 +96,7 @@ public class ServerHttpResponseTests {
public void writeWithError() throws Exception { public void writeWithError() throws Exception {
TestServerHttpResponse response = new TestServerHttpResponse(); TestServerHttpResponse response = new TestServerHttpResponse();
IllegalStateException error = new IllegalStateException("boo"); IllegalStateException error = new IllegalStateException("boo");
response.writeWith(Flux.error(error)).switchOnError(ex -> Mono.empty()).block(); response.writeWith(Flux.error(error)).onErrorResume(ex -> Mono.empty()).block();
assertFalse(response.statusCodeWritten); assertFalse(response.statusCodeWritten);
assertFalse(response.headersWritten); assertFalse(response.headersWritten);

2
spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
View File

@@ -141,7 +141,7 @@ public class DispatcherHandler implements WebHandler, ApplicationContextAware {
private Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result) { private Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result) {
return getResultHandler(result).handleResult(exchange, result) return getResultHandler(result).handleResult(exchange, result)
.switchOnError(ex -> result.applyExceptionHandler(ex).flatMap(exceptionResult -> .onErrorResume(ex -> result.applyExceptionHandler(ex).flatMap(exceptionResult ->
getResultHandler(exceptionResult).handleResult(exchange, exceptionResult))); getResultHandler(exceptionResult).handleResult(exchange, exceptionResult)));
} }

4
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
View File

@@ -120,13 +120,13 @@ class DefaultServerRequest implements ServerRequest {
@Override @Override
public <T> Mono<T> bodyToMono(Class<? extends T> elementClass) { public <T> Mono<T> bodyToMono(Class<? extends T> elementClass) {
Mono<T> mono = body(BodyExtractors.toMono(elementClass)); Mono<T> mono = body(BodyExtractors.toMono(elementClass));
return mono.mapError(UnsupportedMediaTypeException.class, ERROR_MAPPER); return mono.onErrorMap(UnsupportedMediaTypeException.class, ERROR_MAPPER);
} }
@Override @Override
public <T> Flux<T> bodyToFlux(Class<? extends T> elementClass) { public <T> Flux<T> bodyToFlux(Class<? extends T> elementClass) {
Flux<T> flux = body(BodyExtractors.toFlux(elementClass)); Flux<T> flux = body(BodyExtractors.toFlux(elementClass));
return flux.mapError(UnsupportedMediaTypeException.class, ERROR_MAPPER); return flux.onErrorMap(UnsupportedMediaTypeException.class, ERROR_MAPPER);
} }
@Override @Override

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
View File

@@ -234,7 +234,7 @@ public abstract class RouterFunctions {
.defaultIfEmpty(notFound()) .defaultIfEmpty(notFound())
.flatMap(handlerFunction -> wrapException(() -> handlerFunction.handle(request))) .flatMap(handlerFunction -> wrapException(() -> handlerFunction.handle(request)))
.flatMap(response -> wrapException(() -> response.writeTo(exchange, strategies))) .flatMap(response -> wrapException(() -> response.writeTo(exchange, strategies)))
.switchOnError(ResponseStatusException.class, .onErrorResume(ResponseStatusException.class,
ex -> { ex -> {
exchange.getResponse().setStatusCode(ex.getStatus()); exchange.getResponse().setStatusCode(ex.getStatus());
if (ex.getMessage() != null) { if (ex.getMessage() != null) {

4
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
View File

@@ -117,7 +117,7 @@ public abstract class AbstractMessageReaderArgumentResolver extends HandlerMetho
Map<String, Object> readHints = Collections.emptyMap(); Map<String, Object> readHints = Collections.emptyMap();
if (adapter != null && adapter.isMultiValue()) { if (adapter != null && adapter.isMultiValue()) {
Flux<?> flux = reader.read(bodyType, elementType, request, response, readHints); Flux<?> flux = reader.read(bodyType, elementType, request, response, readHints);
flux = flux.onErrorResumeWith(ex -> Flux.error(getReadError(bodyParameter, ex))); flux = flux.onErrorResume(ex -> Flux.error(getReadError(bodyParameter, ex)));
if (isBodyRequired || !adapter.supportsEmpty()) { if (isBodyRequired || !adapter.supportsEmpty()) {
flux = flux.switchIfEmpty(Flux.error(getRequiredBodyError(bodyParameter))); flux = flux.switchIfEmpty(Flux.error(getRequiredBodyError(bodyParameter)));
} }
@@ -130,7 +130,7 @@ public abstract class AbstractMessageReaderArgumentResolver extends HandlerMetho
} }
else { else {
Mono<?> mono = reader.readMono(bodyType, elementType, request, response, readHints); Mono<?> mono = reader.readMono(bodyType, elementType, request, response, readHints);
mono = mono.switchOnError(ex -> Mono.error(getReadError(bodyParameter, ex))); mono = mono.onErrorResume(ex -> Mono.error(getReadError(bodyParameter, ex)));
if (isBodyRequired || (adapter != null && !adapter.supportsEmpty())) { if (isBodyRequired || (adapter != null && !adapter.supportsEmpty())) {
mono = mono.switchIfEmpty(Mono.error(getRequiredBodyError(bodyParameter))); mono = mono.switchIfEmpty(Mono.error(getRequiredBodyError(bodyParameter)));
} }

2
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
View File

@@ -189,7 +189,7 @@ public class RequestMappingHandlerAdapter implements HandlerAdapter, Application
.then(() -> this.methodResolver.getRequestMappingMethod(handlerMethod) .then(() -> this.methodResolver.getRequestMappingMethod(handlerMethod)
.invoke(exchange, bindingContext) .invoke(exchange, bindingContext)
.doOnNext(result -> result.setExceptionHandler(exceptionHandler)) .doOnNext(result -> result.setExceptionHandler(exceptionHandler))
.switchOnError(exceptionHandler)); .onErrorResume(exceptionHandler));
} }
private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod, private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod,