From d48c32e7f67c5c891b1acbdc228971b7bb3a611c Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Fri, 19 Aug 2016 12:30:52 -0500
Subject: [PATCH] Fix reactor-core 3.0.0.RELEASE

Fix the build to work with reactor-core-3.0.0.RELEASE
---
 .../http/server/reactive/ChannelSendOperator.java             | 3 +--
 .../http/server/reactive/ChannelSendOperatorTests.java        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java
index 74dce3b5ca..d001cb6f4b 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java
@@ -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
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
index 27fb35b8f3..e60d1d58f9 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
@@ -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);