Skip to content

Commit d48c32e

Browse files
author
Rob Winch
committed
Fix reactor-core 3.0.0.RELEASE
Fix the build to work with reactor-core-3.0.0.RELEASE
1 parent 3d68806 commit d48c32e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.reactivestreams.Subscriber;
2222
import org.reactivestreams.Subscription;
2323
import reactor.core.publisher.MonoSource;
24-
import reactor.core.publisher.OperatorAdapter;
2524
import reactor.core.publisher.Operators;
2625

2726
import org.springframework.util.Assert;
@@ -54,7 +53,7 @@ public void subscribe(Subscriber<? super Void> s) {
5453
source.subscribe(new WriteWithBarrier(s));
5554
}
5655

57-
private class WriteWithBarrier extends OperatorAdapter<T, Void> implements Publisher<T> {
56+
private class WriteWithBarrier extends Operators.SubscriberAdapter<T, Void> implements Publisher<T> {
5857

5958
/**
6059
* We've at at least one emission, we've called the write function, the write

spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.reactivestreams.Subscription;
3030
import reactor.core.publisher.Flux;
3131
import reactor.core.publisher.Mono;
32-
import reactor.core.publisher.OperatorAdapter;
32+
import reactor.core.publisher.Operators;
3333
import reactor.core.publisher.Signal;
3434

3535
import static org.junit.Assert.assertEquals;
@@ -148,7 +148,7 @@ public Publisher<Void> send(Publisher<String> publisher) {
148148
};
149149
}
150150

151-
private class WriteSubscriber extends OperatorAdapter<String, Void> {
151+
private class WriteSubscriber extends Operators.SubscriberAdapter<String, Void> {
152152

153153
public WriteSubscriber(Subscriber<? super Void> subscriber) {
154154
super(subscriber);

0 commit comments

Comments
 (0)