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

Use more efficient Reactor operators

Browse Source 
Use handle/flatMapIterable instead of flatMap/flatMapMany
when possible.

Closes gh-22727
This commit is contained in:
Sebastien Deleuze
2019-04-02 15:11:00 +02:00
parent b1231de062
commit d2fa5536db
5 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,13 +441,13 @@ class DefaultWebClient implements WebClient {
@Override
public <T> Flux<T> bodyToFlux(Class<T> elementType) {
return this.responseMono.flatMapMany(response ->
handleBody(response, response.bodyToFlux(elementType), mono -> mono.flatMapMany(Flux::error)));
handleBody(response, response.bodyToFlux(elementType), mono -> mono.handle((t, sink) -> sink.error(t))));
}
@Override
public <T> Flux<T> bodyToFlux(ParameterizedTypeReference<T> elementType) {
return this.responseMono.flatMapMany(response ->
handleBody(response, response.bodyToFlux(elementType), mono -> mono.flatMapMany(Flux::error)));
handleBody(response, response.bodyToFlux(elementType), mono -> mono.handle((t, sink) -> sink.error(t))));
}
private <T extends Publisher<?>> T handleBody(ClientResponse response,

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.web.reactive.result.method.annotation;
import java.util.Collections;
import java.util.List;
import reactor.core.publisher.Flux;
@@ -71,12 +72,15 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageReaderArgu
String name = getPartName(parameter, requestPart);
Flux<Part> parts = exchange.getMultipartData()
.flatMapMany(map -> {
.flatMapIterable(map -> {
List<Part> list = map.get(name);
if (CollectionUtils.isEmpty(list)) {
return (isRequired ? Flux.error(getMissingPartException(name, parameter)) : Flux.empty());
if (isRequired) {
throw getMissingPartException(name, parameter);
}
return Collections.emptyList();
}
return Flux.fromIterable(list);
return list;
});
if (Part.class.isAssignableFrom(parameter.getParameterType())) {