Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update HttpClient with Inbound/Outbound contract split

Browse Source
This commit is contained in:
Stephane Maldini
2016-04-15 23:23:54 +01:00
parent 4431a76a05
commit 9a4b98d2e9
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
View File

@@ -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();

12
spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
View File

@@ -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<DataBuffer> 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

4
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
View File

@@ -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<Buffer, Buffer, HttpChannel> {
implements ChannelHandler<Buffer, Buffer, HttpChannel> {
private final HttpHandler httpHandler;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
View File

@@ -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