SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for another API change

Browse Source
This commit is contained in:
Dave Syer
2016-12-15 11:28:09 +00:00
parent 3ce376937e
commit 7bcafabd20
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestConfiguration.java
View File

@@ -32,16 +32,17 @@ import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter; import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.reactive.function.RequestPredicates; import org.springframework.web.reactive.function.server.RequestPredicates;
import org.springframework.web.reactive.function.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunction;
import org.springframework.web.reactive.function.RouterFunctions; import org.springframework.web.reactive.function.server.RouterFunctions;
import org.springframework.web.reactive.function.ServerRequest; import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.ServerResponse; import org.springframework.web.reactive.function.server.ServerResponse;
import static org.springframework.http.codec.BodyExtractors.toFlux; import static org.springframework.web.reactive.function.BodyExtractors.toFlux;
import static org.springframework.http.codec.BodyInserters.fromPublisher; import static org.springframework.web.reactive.function.BodyInserters.fromPublisher;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.ipc.netty.NettyContext; import reactor.ipc.netty.NettyContext;
import reactor.ipc.netty.http.server.HttpServer; import reactor.ipc.netty.http.server.HttpServer;
@@ -72,7 +73,7 @@ public class RestConfiguration {
: registry.composeFunction( : registry.composeFunction(
StringUtils.commaDelimitedListToStringArray(name)); StringUtils.commaDelimitedListToStringArray(name));
FunctionInvokingHandler handler = new FunctionInvokingHandler(function); FunctionInvokingHandler handler = new FunctionInvokingHandler(function);
RouterFunction<Publisher<String>> route = RouterFunctions.route( RouterFunction<ServerResponse> route = RouterFunctions.route(
RequestPredicates.POST(webProperties.getPath()) RequestPredicates.POST(webProperties.getPath())
.and(RequestPredicates.contentType(MediaType.TEXT_PLAIN)), .and(RequestPredicates.contentType(MediaType.TEXT_PLAIN)),
handler::handleText); handler::handleText);
@@ -92,7 +93,7 @@ public class RestConfiguration {
this.function = function; this.function = function;
} }
private ServerResponse<Publisher<String>> handleText(ServerRequest request) { private Mono<ServerResponse> handleText(ServerRequest request) {
Flux<String> input = request.body(toFlux(String.class)); Flux<String> input = request.body(toFlux(String.class));
Publisher<String> output = this.function.apply(input); Publisher<String> output = this.function.apply(input);
return ServerResponse.ok().body(fromPublisher(output, String.class)); return ServerResponse.ok().body(fromPublisher(output, String.class));