diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java index 16a192a5bc0..fc589a14635 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java @@ -111,7 +111,7 @@ public class ReactorClientHttpRequest extends AbstractClientHttpRequest { }) .after(() -> { if (body != null) { - return channel.send(body); + return channel.sendBody(body); } else { return channel.sendHeaders(); diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java index 019256ac779..6c7d7a8ac4b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java @@ -19,7 +19,7 @@ package org.springframework.http.client.reactive; import java.util.Collection; import reactor.core.publisher.Flux; -import reactor.io.netty.http.HttpChannel; +import reactor.io.netty.http.HttpInbound; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferAllocator; @@ -40,29 +40,29 @@ public class ReactorClientHttpResponse implements ClientHttpResponse { private final DataBufferAllocator allocator; - private final HttpChannel channel; + private final HttpInbound channel; - public ReactorClientHttpResponse(HttpChannel channel, DataBufferAllocator allocator) { + public ReactorClientHttpResponse(HttpInbound channel, DataBufferAllocator allocator) { this.allocator = allocator; this.channel = channel; } @Override public Flux getBody() { - return channel.receive().map(b -> allocator.wrap(b.byteBuffer())); + return channel.receiveBody().map(b -> allocator.wrap(b.byteBuffer())); } @Override public HttpHeaders getHeaders() { HttpHeaders headers = new HttpHeaders(); - this.channel.responseHeaders().entries().stream().forEach(e -> headers.add(e.getKey(), e.getValue())); + this.channel.headers().entries().stream().forEach(e -> headers.add(e.getKey(), e.getValue())); return headers; } @Override public HttpStatus getStatusCode() { - return HttpStatus.valueOf(this.channel.responseStatus().code()); + return HttpStatus.valueOf(this.channel.status().code()); } @Override diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java index ca3cddb280f..f6abc3bb168 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java @@ -18,7 +18,7 @@ package org.springframework.http.server.reactive; import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; -import reactor.io.ipc.ChannelFluxHandler; +import reactor.io.ipc.ChannelHandler; import reactor.io.netty.http.HttpChannel; import org.springframework.core.io.buffer.DataBufferAllocator; @@ -28,7 +28,7 @@ import org.springframework.util.Assert; * @author Stephane Maldini */ public class ReactorHttpHandlerAdapter - implements ChannelFluxHandler { + implements ChannelHandler { private final HttpHandler httpHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java index ff44c2b1c21..fbd9f7661a7 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java @@ -55,7 +55,7 @@ public class ReactorServerHttpResponse extends AbstractServerHttpResponse { @Override public void setStatusCode(HttpStatus status) { - getReactorChannel().responseStatus(HttpResponseStatus.valueOf(status.value())); + getReactorChannel().status(HttpResponseStatus.valueOf(status.value())); } @Override