Skip to content

Clean up ReactiveSupport #3908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbakerman merged 1 commit into from
Apr 9, 2025
Merged

Clean up ReactiveSupport #3908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 2 additions & 42 deletions src/main/java/graphql/execution/reactive/ReactiveSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import graphql.DuckTyped;
import graphql.Internal;
import org.reactivestreams.FlowAdapters;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;

import java.util.Objects;
import java.util.concurrent.CompletableFuture;
Expand All @@ -26,17 +25,11 @@ public static Object fetchedObject(Object fetchedObject) {
return flowPublisherToCF((Flow.Publisher<?>) fetchedObject);
}
if (fetchedObject instanceof Publisher) {
return reactivePublisherToCF((Publisher<?>) fetchedObject);
return flowPublisherToCF(FlowAdapters.toFlowPublisher((Publisher<?>) fetchedObject));
}
return fetchedObject;
}

private static CompletableFuture<Object> reactivePublisherToCF(Publisher<?> publisher) {
ReactivePublisherToCompletableFuture<Object> cf = new ReactivePublisherToCompletableFuture<>();
publisher.subscribe(cf);
return cf;
}

private static CompletableFuture<Object> flowPublisherToCF(Flow.Publisher<?> publisher) {
FlowPublisherToCompletableFuture<Object> cf = new FlowPublisherToCompletableFuture<>();
publisher.subscribe(cf);
Expand Down Expand Up @@ -116,39 +109,6 @@ void onCompleteImpl() {
}
}

private static class ReactivePublisherToCompletableFuture<T> extends PublisherToCompletableFuture<T, Subscription> implements Subscriber<T> {

@Override
void doSubscriptionCancel(Subscription subscription) {
subscription.cancel();
}

@Override
void doSubscriptionRequest(Subscription subscription, long n) {
subscription.request(n);
}

@Override
public void onSubscribe(Subscription s) {
onSubscribeImpl(s);
}

@Override
public void onNext(T t) {
onNextImpl(t);
}

@Override
public void onError(Throwable t) {
onErrorImpl(t);
}

@Override
public void onComplete() {
onCompleteImpl();
}
}

private static class FlowPublisherToCompletableFuture<T> extends PublisherToCompletableFuture<T, Flow.Subscription> implements Flow.Subscriber<T> {

@Override
Expand Down
Loading