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

Replace Promises.error->Streams.fail, concatMap->map

This commit is contained in:
Rossen Stoyanchev 2015-08-24 14:03:36 -04:00
parent 6634d1f536
commit 56d6940485
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web-reactive/src/main/java/org/springframework/reactive/web/DispatcherHttpHandler.java
View File

@ -21,7 +21,6 @@ import java.util.List;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.core.reactivestreams.PublisherFactory; import reactor.core.reactivestreams.PublisherFactory;
import reactor.core.reactivestreams.SubscriberWithContext; import reactor.core.reactivestreams.SubscriberWithContext;
import reactor.rx.Promises;
import reactor.rx.Streams; import reactor.rx.Streams;
import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.BeanFactoryUtils;
@ -72,8 +71,8 @@ public class DispatcherHttpHandler implements HttpHandler {
return resultHandler.handleResult(request, response, result); return resultHandler.handleResult(request, response, result);
} }
} }
String error = "No HandlerResultHandler for " + result.getReturnValue(); return Streams.fail(new IllegalStateException(
return Promises.error(new IllegalStateException(error)); "No HandlerResultHandler for " + result.getReturnValue()));
}); });
} }

6
spring-web-reactive/src/test/java/org/springframework/reactive/web/DispatcherApp.java
View File

@ -22,7 +22,6 @@ import java.util.Map;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.reactivex.netty.protocol.http.server.HttpServer; import io.reactivex.netty.protocol.http.server.HttpServer;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.rx.Stream;
import reactor.rx.Streams; import reactor.rx.Streams;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -93,9 +92,8 @@ public class DispatcherApp {
@Override @Override
public Publisher<HandlerResult> handle(ServerHttpRequest request, ServerHttpResponse response, Object handler) { public Publisher<HandlerResult> handle(ServerHttpRequest request, ServerHttpResponse response, Object handler) {
Publisher<String> resultPublisher = ((PlainTextHandler) handler).handle(request, response); Publisher<String> publisher = ((PlainTextHandler) handler).handle(request, response);
Stream<String> stream = Streams.wrap(resultPublisher); return Streams.wrap(publisher).map(HandlerResult::new);
return stream.concatMap((returnValue) -> Streams.just(new HandlerResult(returnValue)));
} }
} }