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

Add support for Function<Message,Message> in lite server

Browse Source 
Fixes gh-221
This commit is contained in:
Dave Syer
2018-10-22 16:35:52 +01:00
parent 592889c0fb
commit 263fe1c632
7 changed files with 213 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RequestProcessor.java
View File

@@ -33,6 +33,7 @@ import org.reactivestreams.Publisher;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.context.message.MessageUtils;
import org.springframework.cloud.function.core.FluxWrapper;
import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.cloud.function.web.util.HeaderUtils;
import org.springframework.http.HttpHeaders;
@@ -64,18 +65,22 @@ public class RequestProcessor {
@Value("${debug:${DEBUG:false}}")
private String debug = "false";
public RequestProcessor(JsonMapper mapper, FunctionInspector inspector,
public RequestProcessor(FunctionInspector inspector, JsonMapper mapper,
StringConverter converter) {
this.mapper = mapper;
this.inspector = inspector;
this.converter = converter;
}
public static FunctionWrapper wrapper(Function<Publisher<?>, Publisher<?>> function,
Consumer<Publisher<?>> consumer, Supplier<Publisher<?>> supplier) {
public static FunctionWrapper wrapper(Function<? extends Publisher<?>, ? extends Publisher<?>> function,
Consumer<? extends Publisher<?>> consumer, Supplier<? extends Publisher<?>> supplier) {
return new FunctionWrapper(function, consumer, supplier);
}
public static FunctionWrapper wrapper(Function<? extends Publisher<?>, ? extends Publisher<?>> function) {
return new FunctionWrapper(function, null, null);
}
public Mono<ResponseEntity<?>> get(FunctionWrapper wrapper) {
if (wrapper.function() != null) {
return response(wrapper, wrapper.function(),
@@ -169,8 +174,7 @@ public class RequestProcessor {
}
private void addHeaders(BodyBuilder builder, Message<?> message) {
HttpHeaders headers = new HttpHeaders();
builder.headers(HeaderUtils.fromMessage(message.getHeaders(), headers));
builder.headers(HeaderUtils.fromMessage(message.getHeaders()));
}
private Mono<ResponseEntity<?>> stream(FunctionWrapper request, Publisher<?> result) {
@@ -221,6 +225,9 @@ public class RequestProcessor {
}
private boolean isOutputSingle(Object handler) {
if (handler instanceof FluxWrapper) {
handler = ((FluxWrapper<?>) handler).getTarget();
}
Class<?> type = inspector.getOutputType(handler);
Class<?> wrapper = inspector.getOutputWrapper(handler);
if (Stream.class.isAssignableFrom(type)) {
@@ -232,9 +239,9 @@ public class RequestProcessor {
}
}
private Mono<?> value(Function<Publisher<?>, Publisher<?>> function, String value) {
Object input = converter.convert(function, value);
return Mono.from(function.apply(Flux.just(input)));
private Publisher<?> value(Function<Publisher<?>, Publisher<?>> function, Publisher<String> value) {
Flux<?> input = Flux.from(value).map(body -> converter.convert(function, body));
return Mono.from(function.apply(input));
}
public static class FunctionWrapper {
@@ -249,13 +256,14 @@ public class RequestProcessor {
private HttpHeaders headers = new HttpHeaders();
private String argument;
private Publisher<String> argument;
public FunctionWrapper(Function<Publisher<?>, Publisher<?>> function,
Consumer<Publisher<?>> consumer, Supplier<Publisher<?>> supplier) {
this.function = function;
this.consumer = consumer;
this.supplier = supplier;
@SuppressWarnings("unchecked")
public FunctionWrapper(Function<? extends Publisher<?>, ? extends Publisher<?>> function,
Consumer<? extends Publisher<?>> consumer, Supplier<? extends Publisher<?>> supplier) {
this.function = (Function<Publisher<?>, Publisher<?>>) function;
this.consumer = (Consumer<Publisher<?>>) consumer;
this.supplier = (Supplier<Publisher<?>>) supplier;
}
public Object handler() {
@@ -292,12 +300,17 @@ public class RequestProcessor {
return this;
}
public FunctionWrapper argument(String argument) {
public FunctionWrapper argument(Publisher<String> argument) {
this.argument = argument;
return this;
}
public String argument() {
public FunctionWrapper argument(String argument) {
this.argument = Mono.just(argument);
return this;
}
public Publisher<String> argument() {
return this.argument;
}
}

4
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
View File

@@ -101,7 +101,9 @@ public class FunctionController {
wrapper.headers(request.getRequest().getHeaders());
wrapper.params(request.getRequest().getQueryParams());
String argument = (String) request.getAttribute(WebRequestConstants.ARGUMENT);
wrapper.argument(argument);
if (argument != null) {
wrapper.argument(argument);
}
return wrapper;
}
}

36
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java
View File

@@ -31,6 +31,11 @@ import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;
import org.springframework.boot.web.reactive.error.ErrorAttributes;
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.cloud.function.web.BasicStringConverter;
import org.springframework.cloud.function.web.RequestProcessor;
import org.springframework.cloud.function.web.RequestProcessor.FunctionWrapper;
import org.springframework.cloud.function.web.StringConverter;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ApplicationEvent;
@@ -38,6 +43,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.SmartApplicationListener;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.http.ResponseEntity;
import org.springframework.http.codec.ServerCodecConfigurer;
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
@@ -51,7 +57,7 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
import static org.springframework.web.reactive.function.server.ServerResponse.ok;
import static org.springframework.web.reactive.function.server.ServerResponse.status;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -70,7 +76,9 @@ class FunctionEndpointInitializer
@Override
public void initialize(GenericApplicationContext context) {
if (context.getEnvironment().getProperty("spring.functional.enabled",
Boolean.class, false) && ClassUtils.isPresent("org.springframework.http.server.reactive.HttpHandler", null)) {
Boolean.class, false)
&& ClassUtils.isPresent(
"org.springframework.http.server.reactive.HttpHandler", null)) {
registerEndpoint(context);
registerWebFluxAutoConfiguration(context);
}
@@ -85,9 +93,17 @@ class FunctionEndpointInitializer
}
private void registerEndpoint(GenericApplicationContext context) {
context.registerBean(StringConverter.class,
() -> new BasicStringConverter(context.getBean(FunctionInspector.class),
context.getBeanFactory()));
context.registerBean(RequestProcessor.class,
() -> new RequestProcessor(context.getBean(FunctionInspector.class),
context.getBean(JsonMapper.class),
context.getBean(StringConverter.class)));
context.registerBean(FunctionEndpointFactory.class,
() -> new FunctionEndpointFactory(context.getBean(FunctionCatalog.class),
context.getBean(FunctionInspector.class),
context.getBean(RequestProcessor.class),
context.getEnvironment()));
context.registerBean(RouterFunction.class,
() -> context.getBean(FunctionEndpointFactory.class).functionEndpoints());
@@ -183,12 +199,15 @@ class FunctionEndpointFactory {
private FunctionInspector inspector;
private RequestProcessor processor;
public FunctionEndpointFactory(FunctionCatalog catalog, FunctionInspector inspector,
Environment environment) {
RequestProcessor processor, Environment environment) {
String handler = environment.resolvePlaceholders("${function.handler}");
if (handler.startsWith("$")) {
handler = null;
}
this.processor = processor;
this.inspector = inspector;
this.function = extract(catalog, handler);
}
@@ -212,12 +231,13 @@ class FunctionEndpointFactory {
@SuppressWarnings({ "unchecked" })
public <T> RouterFunction<?> functionEndpoints() {
return route(POST("/"), request -> {
Class<?> inputType = this.inspector.getInputType(this.function);
Class<T> outputType = (Class<T>) this.inspector.getOutputType(this.function);
return ok().body(
Mono.from(
(Flux<T>) this.function.apply(request.bodyToFlux(inputType))),
outputType);
FunctionWrapper wrapper = RequestProcessor.wrapper(function, null, null);
Mono<ResponseEntity<?>> stream = request.bodyToMono(String.class)
.flatMap(content -> processor.post(wrapper, content, false));
return stream.flatMap(entity -> status(entity.getStatusCode())
.headers(headers -> headers.addAll(entity.getHeaders()))
.body(Mono.just((T) entity.getBody()), outputType));
});
}

4
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionController.java
View File

@@ -110,7 +110,9 @@ public class FunctionController {
}
String argument = (String) request.getAttribute(WebRequestConstants.ARGUMENT,
WebRequest.SCOPE_REQUEST);
wrapper.argument(argument);
if (argument != null) {
wrapper.argument(argument);
}
return wrapper;
}
}

2
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
View File

@@ -44,7 +44,7 @@ public class HeaderUtils {
REQUEST_ONLY.add(HttpHeaders.HOST, "");
}
public static HttpHeaders fromMessage(MessageHeaders headers, HttpHeaders request) {
public static HttpHeaders fromMessage(MessageHeaders headers) {
HttpHeaders result = new HttpHeaders();
for (String name : headers.keySet()) {
Object value = headers.get(name);