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

Optimize Flux pipeline in ClientHttpRequest

This commit is contained in:
Brian Clozel 2017-07-04 10:11:56 +02:00
parent f8589d9eca
commit 839b6c18d4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
View File

@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -57,7 +58,7 @@ public abstract class AbstractClientHttpRequest implements ClientHttpRequest {
private final AtomicReference<State> state = new AtomicReference<>(State.NEW);
private final List<Supplier<? extends Mono<Void>>> commitActions = new ArrayList<>(4);
private final List<Supplier<? extends Publisher<Void>>> commitActions = new ArrayList<>(4);
public AbstractClientHttpRequest() {
@ -112,7 +113,7 @@ public abstract class AbstractClientHttpRequest implements ClientHttpRequest {
* @param writeAction the action to write the request body (may be {@code null})
* @return a completion publisher
*/
protected Mono<Void> doCommit(@Nullable Supplier<? extends Mono<Void>> writeAction) {
protected Mono<Void> doCommit(@Nullable Supplier<? extends Publisher<Void>> writeAction) {
if (!this.state.compareAndSet(State.NEW, State.COMMITTING)) {
return Mono.empty();
}
@ -128,10 +129,10 @@ public abstract class AbstractClientHttpRequest implements ClientHttpRequest {
this.commitActions.add(writeAction);
}
List<? extends Mono<Void>> actions = this.commitActions.stream()
List<? extends Publisher<Void>> actions = this.commitActions.stream()
.map(Supplier::get).collect(Collectors.toList());
return Flux.concat(actions).next();
return Mono.fromDirect(Flux.concat(actions));
}