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

Use registry to convert to CompletableFuture 

Use the ReactiveAdapterRegistry to convert to CompletableFuture,
and remove the ToFutureSubscriber.
This commit is contained in:
Arjen Poutsma 2020-10-02 11:39:31 +02:00
parent 4e76a4780c
commit 3303a68436
1 changed files with 10 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
spring-webmvc/src/main/java/org/springframework/web/servlet/function/AsyncServerResponse.java
View File

@ -33,8 +33,6 @@ import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import org.springframework.core.ReactiveAdapter;
import org.springframework.core.ReactiveAdapterRegistry;
@ -138,67 +136,22 @@ final class AsyncServerResponse extends ErrorHandlingServerResponse {
return new AsyncServerResponse(futureResponse);
}
else if (reactiveStreamsPresent) {
ReactiveAdapter adapter = ReactiveAdapterRegistry.getSharedInstance().getAdapter(o.getClass());
if (adapter != null) {
Publisher<ServerResponse> publisher = adapter.toPublisher(o);
CompletableFuture<ServerResponse> futureResponse = new CompletableFuture<>();
publisher.subscribe(new ToFutureSubscriber(futureResponse));
return new AsyncServerResponse(futureResponse);
ReactiveAdapterRegistry registry = ReactiveAdapterRegistry.getSharedInstance();
ReactiveAdapter publisherAdapter = registry.getAdapter(o.getClass());
if (publisherAdapter != null) {
Publisher<ServerResponse> publisher = publisherAdapter.toPublisher(o);
ReactiveAdapter futureAdapter = registry.getAdapter(CompletableFuture.class);
if (futureAdapter != null) {
CompletableFuture<ServerResponse> futureResponse =
(CompletableFuture<ServerResponse>) futureAdapter.fromPublisher(publisher);
return new AsyncServerResponse(futureResponse);
}
}
}
throw new IllegalArgumentException("Asynchronous type not supported: " + o.getClass());
}
/**
* Subscriber that exposes the first result it receives via a CompletableFuture.
*/
private static final class ToFutureSubscriber implements Subscriber<ServerResponse> {
private final CompletableFuture<ServerResponse> future;
@Nullable
private Subscription subscription;
public ToFutureSubscriber(CompletableFuture<ServerResponse> future) {
this.future = future;
}
@Override
public void onSubscribe(Subscription s) {
if (this.subscription == null) {
this.subscription = s;
s.request(1);
}
else {
s.cancel();
}
}
@Override
public void onNext(ServerResponse serverResponse) {
if (!this.future.isDone()) {
this.future.complete(serverResponse);
}
}
@Override
public void onError(Throwable t) {
if (!this.future.isDone()) {
this.future.completeExceptionally(t);
}
}
@Override
public void onComplete() {
if (!this.future.isDone()) {
this.future.completeExceptionally(new IllegalStateException("Did not receive ServerResponse"));
}
}
}
/**
* HttpServletRequestWrapper that shares its AsyncContext between this
* AsyncServerResponse class and other, subsequent ServerResponse