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

Resolved merge conflicts

This commit is contained in:
Arjen Poutsma 2015-10-29 16:08:10 +01:00
parent bab3b6fd1c
commit 5727abc82d
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java
View File

@ -26,13 +26,13 @@ import reactor.io.net.http.HttpChannel;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.reactive.web.http.ServerHttpRequest; import org.springframework.http.server.ReactiveServerHttpRequest;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* @author Stephane Maldini * @author Stephane Maldini
*/ */
public class PublisherReactorServerHttpRequest implements ServerHttpRequest { public class PublisherReactorServerHttpRequest implements ReactiveServerHttpRequest {
private final HttpChannel<Buffer, ?> channel; private final HttpChannel<Buffer, ?> channel;

6
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java
View File

@ -25,13 +25,13 @@ import reactor.io.net.http.model.Status;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.reactive.web.http.ServerHttpResponse; import org.springframework.http.server.ReactiveServerHttpResponse;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* @author Stephane Maldini * @author Stephane Maldini
*/ */
public class PublisherReactorServerHttpResponse implements ServerHttpResponse { public class PublisherReactorServerHttpResponse implements ReactiveServerHttpResponse {
private final HttpChannel<?, Buffer> channel; private final HttpChannel<?, Buffer> channel;
@ -67,7 +67,7 @@ public class PublisherReactorServerHttpResponse implements ServerHttpResponse {
} }
@Override @Override
public Publisher<Void> writeWith(Publisher<ByteBuffer> contentPublisher) { public Publisher<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
applyHeaders(); applyHeaders();
return this.channel.writeWith(Publishers.map(contentPublisher, Buffer::new)); return this.channel.writeWith(Publishers.map(contentPublisher, Buffer::new));
} }

14
spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java
View File

@ -15,20 +15,14 @@
*/ */
package org.springframework.reactive.web.http.reactor; package org.springframework.reactive.web.http.reactor;
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.reactive.web.http.ServerHttpResponse;
import org.springframework.util.Assert;
import reactor.Publishers;
import reactor.io.buffer.Buffer; import reactor.io.buffer.Buffer;
import reactor.io.net.http.HttpChannel; import reactor.io.net.http.HttpChannel;
import reactor.io.net.http.model.Status;
import reactor.rx.Stream; import reactor.rx.Stream;
import reactor.rx.Streams; import reactor.rx.Streams;
import java.nio.ByteBuffer;
/** /**
* @author Stephane Maldini * @author Stephane Maldini
*/ */
@ -44,7 +38,7 @@ public class ReactorServerHttpResponse extends PublisherReactorServerHttpRespons
} }
@Override @Override
public Stream<Void> writeWith(Publisher<ByteBuffer> contentPublisher) { public Stream<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
return Streams.wrap(super.writeWith(contentPublisher)); return Streams.wrap(super.addBody(contentPublisher));
} }
} }