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

Update Mono.then(Supplier) deprecated calls

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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 {
// Ensure form data is parsed for "params" conditions...
return exchange.getRequestParams()
.then(() -> {
.then(Mono.defer(() -> {
HandlerMethod handlerMethod = null;
try {
handlerMethod = lookupHandlerMethod(lookupPath, exchange);
@@ -283,7 +283,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
handlerMethod = handlerMethod.createWithResolvedBean();
}
return Mono.justOrEmpty(handlerMethod);
});
}));
}
finally {
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
.initModel(bindingContext, modelAttributeMethods, exchange)
.then(() -> this.methodResolver.getRequestMappingMethod(handlerMethod)
.then(Mono.defer(() -> this.methodResolver.getRequestMappingMethod(handlerMethod)
.invoke(exchange, bindingContext)
.doOnNext(result -> result.setExceptionHandler(exceptionHandler))
.onErrorResume(exceptionHandler));
.onErrorResume(exceptionHandler)));
}
private Mono<HandlerResult> handleException(Throwable ex, HandlerMethod handlerMethod,