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

Fix reactor-core 3.0.0.RELEASE 

Fix the build to work with reactor-core-3.0.0.RELEASE
This commit is contained in:
Rob Winch 2016-08-19 12:30:52 -05:00
parent 3d68806ca1
commit d48c32e7f6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import reactor.core.publisher.MonoSource;
import reactor.core.publisher.OperatorAdapter;
import reactor.core.publisher.Operators;
import org.springframework.util.Assert;
@ -54,7 +53,7 @@ public class ChannelSendOperator<T> extends MonoSource<T, Void> {
source.subscribe(new WriteWithBarrier(s));
}
private class WriteWithBarrier extends OperatorAdapter<T, Void> implements Publisher<T> {
private class WriteWithBarrier extends Operators.SubscriberAdapter<T, Void> implements Publisher<T> {
/**
* We've at at least one emission, we've called the write function, the write

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

@ -29,7 +29,7 @@ import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.OperatorAdapter;
import reactor.core.publisher.Operators;
import reactor.core.publisher.Signal;
import static org.junit.Assert.assertEquals;
@ -148,7 +148,7 @@ public class ChannelSendOperatorTests {
};
}
private class WriteSubscriber extends OperatorAdapter<String, Void> {
private class WriteSubscriber extends Operators.SubscriberAdapter<String, Void> {
public WriteSubscriber(Subscriber<? super Void> subscriber) {
super(subscriber);