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

GH-500 Fix NPE in FunctionEndpointInitializer

Browse Source 
This ensures that posting to the consumer does not result in NPE given that there is no body

Resolves #500
This commit is contained in:
Oleg Zhurakousky
2020-06-10 19:44:27 +02:00
parent 27540a93e8
commit 56b026597b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,13 +240,12 @@ class FunctionEndpointFactory {
.flatMap(content -> this.processor.post(wrapper, content, false)); .flatMap(content -> this.processor.post(wrapper, content, false));
return stream.flatMap(entity -> { return stream.flatMap(entity -> {
return status(entity.getStatusCode()).headers(headers -> headers.addAll(entity.getHeaders())) return status(entity.getStatusCode()).headers(headers -> headers.addAll(entity.getHeaders()))
.body(Mono.just((T) entity.getBody()), outputType); .body(entity.hasBody() ? Mono.just((T) entity.getBody()) : Mono.empty(), outputType);
}); });
}) })
.andRoute(GET("/**"), request -> { .andRoute(GET("/**"), request -> {
Object functionComponent = extract(request); Object functionComponent = extract(request);
Class<T> outputType = (Class<T>) this.inspector.getOutputType(functionComponent); Class<T> outputType = (Class<T>) this.inspector.getOutputType(functionComponent);
// if (functionComponent instanceof Supplier) {
if (((FunctionInvocationWrapper) functionComponent).isSupplier()) { if (((FunctionInvocationWrapper) functionComponent).isSupplier()) {
Supplier<? extends Flux<?>> supplier = (Supplier<Flux<?>>) functionComponent; Supplier<? extends Flux<?>> supplier = (Supplier<Flux<?>>) functionComponent;
FunctionWrapper wrapper = RequestProcessor.wrapper(null, null, supplier); FunctionWrapper wrapper = RequestProcessor.wrapper(null, null, supplier);