root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update Mono.then(Supplier) deprecated calls 

Reactor Core has now deprecated the `Mono.then(Supplier)`.
This is now replaced with `Mono.then(Mono.defer(Supplier))`.
This commit is contained in:
Brian Clozel 2017-04-18 21:11:19 +02:00
parent 09b0364ad7
commit 88f8df4dce
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java
View File

@ -90,7 +90,7 @@ public class FluxExchangeResult<T> extends ExchangeResult {
public byte[] getResponseBodyContent() { public byte[] getResponseBodyContent() {
return this.body.ignoreElements() return this.body.ignoreElements()
.timeout(this.timeout, Mono.error(TIMEOUT_ERROR)) .timeout(this.timeout, Mono.error(TIMEOUT_ERROR))
.then(() -> Mono.just(super.getResponseBodyContent())) .then(Mono.defer(() -> Mono.just(super.getResponseBodyContent())))
.block(); .block();
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -83,7 +83,7 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa
response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR); response.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR);
return Mono.empty(); return Mono.empty();
}) })
.then(response::setComplete); .then(Mono.defer(response::setComplete));
} }
protected ServerWebExchange createExchange(ServerHttpRequest request, ServerHttpResponse response) { protected ServerWebExchange createExchange(ServerHttpRequest request, ServerHttpResponse response) {

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

@ -263,7 +263,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
try { try {
// Ensure form data is parsed for "params" conditions... // Ensure form data is parsed for "params" conditions...
return exchange.getRequestParams() return exchange.getRequestParams()
.then(() -> { .then(Mono.defer(() -> {
HandlerMethod handlerMethod = null; HandlerMethod handlerMethod = null;
try { try {
handlerMethod = lookupHandlerMethod(lookupPath, exchange); handlerMethod = lookupHandlerMethod(lookupPath, exchange);
@ -283,7 +283,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
handlerMethod = handlerMethod.createWithResolvedBean(); handlerMethod = handlerMethod.createWithResolvedBean();
} }
return Mono.justOrEmpty(handlerMethod); return Mono.justOrEmpty(handlerMethod);
}); }));
} }
finally { finally {
this.mappingRegistry.releaseReadLock(); this.mappingRegistry.releaseReadLock();

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

@ -186,10 +186,10 @@ public class RequestMappingHandlerAdapter implements HandlerAdapter, Application
return this.modelInitializer return this.modelInitializer
.initModel(bindingContext, modelAttributeMethods, exchange) .initModel(bindingContext, modelAttributeMethods, exchange)
.then(() -> this.methodResolver.getRequestMappingMethod(handlerMethod) .then(Mono.defer(() -> this.methodResolver.getRequestMappingMethod(handlerMethod)
.invoke(exchange, bindingContext) .invoke(exchange, bindingContext)
.doOnNext(result -> result.setExceptionHandler(exceptionHandler)) .doOnNext(result -> result.setExceptionHandler(exceptionHandler))
.onErrorResume(exceptionHandler)); .onErrorResume(exceptionHandler)));
} }
private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod, private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod,