Changed addBody() to setBody()

This commit is contained in:
Arjen Poutsma
2015-10-29 16:28:22 +01:00
parent 5727abc82d
commit 45a88974bc
11 changed files with 16 additions and 15 deletions

View File

@@ -22,7 +22,7 @@ import org.reactivestreams.Publisher;
/** /**
* Represents a "reactive" HTTP output message, consisting of {@linkplain #getHeaders() headers} * Represents a "reactive" HTTP output message, consisting of {@linkplain #getHeaders() headers}
* and the capability to add a {@linkplain #addBody(Publisher) body}. * and the capability to add a {@linkplain #setBody(Publisher) body}.
* *
* <p>Typically implemented by an HTTP request on the client-side, or a response on the server-side. * <p>Typically implemented by an HTTP request on the client-side, or a response on the server-side.
* *
@@ -36,6 +36,6 @@ public interface ReactiveHttpOutputMessage extends HttpMessage {
* @param body the body to add * @param body the body to add
* @return a publisher that indicates completion * @return a publisher that indicates completion
*/ */
Publisher<Void> addBody(Publisher<ByteBuffer> body); Publisher<Void> setBody(Publisher<ByteBuffer> body);
} }

View File

@@ -140,10 +140,11 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered
outputStream = postProcessor.encode(outputStream, elementType, mediaType, hints.toArray()); outputStream = postProcessor.encode(outputStream, elementType, mediaType, hints.toArray());
} }
response.getHeaders().setContentType(mediaType); response.getHeaders().setContentType(mediaType);
return response.addBody(outputStream); return response.setBody(outputStream);
} }
return Publishers.error(new IllegalStateException( return Publishers.error(new IllegalStateException(
"Return value type '" + returnType.getParameterType().getName() + "' with media type '" + mediaType + "' not supported" )); "Return value type '" + returnType.getParameterType().getName() +
"' with media type '" + mediaType + "' not supported"));
} }
private MediaType resolveMediaType(ReactiveServerHttpRequest request) { private MediaType resolveMediaType(ReactiveServerHttpRequest request) {

View File

@@ -31,7 +31,7 @@ import org.springframework.http.server.ReactiveServerHttpResponse;
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @see ReactiveServerHttpRequest#getBody() * @see ReactiveServerHttpRequest#getBody()
* @see ReactiveServerHttpResponse#addBody(Publisher) * @see ReactiveServerHttpResponse#setBody(Publisher)
*/ */
public interface HttpHandler { public interface HttpHandler {

View File

@@ -67,7 +67,7 @@ public class PublisherReactorServerHttpResponse implements ReactiveServerHttpRes
} }
@Override @Override
public Publisher<Void> addBody(Publisher<ByteBuffer> contentPublisher) { public Publisher<Void> setBody(Publisher<ByteBuffer> contentPublisher) {
applyHeaders(); applyHeaders();
return this.channel.writeWith(Publishers.map(contentPublisher, Buffer::new)); return this.channel.writeWith(Publishers.map(contentPublisher, Buffer::new));
} }

View File

@@ -38,7 +38,7 @@ public class ReactorServerHttpResponse extends PublisherReactorServerHttpRespons
} }
@Override @Override
public Stream<Void> addBody(Publisher<ByteBuffer> contentPublisher) { public Stream<Void> setBody(Publisher<ByteBuffer> contentPublisher) {
return Streams.wrap(super.addBody(contentPublisher)); return Streams.wrap(super.setBody(contentPublisher));
} }
} }

View File

@@ -75,7 +75,7 @@ public class RxNettyServerHttpResponse implements ReactiveServerHttpResponse {
} }
@Override @Override
public Publisher<Void> addBody(Publisher<ByteBuffer> contentPublisher) { public Publisher<Void> setBody(Publisher<ByteBuffer> contentPublisher) {
applyHeaders(); applyHeaders();
Observable<byte[]> contentObservable = RxJava1Converter.from(contentPublisher).map(content -> new Buffer(content).asBytes()); Observable<byte[]> contentObservable = RxJava1Converter.from(contentPublisher).map(content -> new Buffer(content).asBytes());
return RxJava1Converter.from(this.response.writeBytes(contentObservable)); return RxJava1Converter.from(this.response.writeBytes(contentObservable));

View File

@@ -69,7 +69,7 @@ public class ServletServerHttpResponse implements ReactiveServerHttpResponse {
} }
@Override @Override
public Publisher<Void> addBody(final Publisher<ByteBuffer> contentPublisher) { public Publisher<Void> setBody(final Publisher<ByteBuffer> contentPublisher) {
applyHeaders(); applyHeaders();
return (s -> contentPublisher.subscribe(responseSubscriber)); return (s -> contentPublisher.subscribe(responseSubscriber));
} }

View File

@@ -101,7 +101,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler
@Override @Override
public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) { public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) {
return response.addBody(Streams.just(Buffer.wrap("foo").byteBuffer())); return response.setBody(Streams.just(Buffer.wrap("foo").byteBuffer()));
} }
} }
@@ -109,7 +109,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler
@Override @Override
public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) { public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) {
return response.addBody(Streams.just(Buffer.wrap("bar").byteBuffer())); return response.setBody(Streams.just(Buffer.wrap("bar").byteBuffer()));
} }
} }

View File

@@ -28,6 +28,6 @@ public class EchoHandler implements HttpHandler {
@Override @Override
public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) { public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) {
return response.addBody(request.getBody()); return response.setBody(request.getBody());
} }
} }

View File

@@ -76,7 +76,7 @@ public class RandomHandler implements HttpHandler {
}); });
response.getHeaders().setContentLength(RESPONSE_SIZE); response.getHeaders().setContentLength(RESPONSE_SIZE);
return response.addBody(Streams.just(ByteBuffer.wrap(randomBytes()))); return response.setBody(Streams.just(ByteBuffer.wrap(randomBytes())));
} }
private byte[] randomBytes() { private byte[] randomBytes() {

View File

@@ -75,7 +75,7 @@ public class XmlHandler implements HttpHandler {
bos.close(); bos.close();
buffer.flip(); buffer.flip();
return response.addBody(Streams.just(buffer.byteBuffer())); return response.setBody(Streams.just(buffer.byteBuffer()));
} }
catch (Exception ex) { catch (Exception ex) {
logger.error(ex, ex); logger.error(ex, ex);