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

Make ObjectMapper optional

Browse Source 
Plain text will just be passed straight through.

Fixes gh-226
This commit is contained in:
Dave Syer
2018-10-28 11:10:37 +00:00
parent a03e34b6ee
commit c43af567ea
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.cloud.function.context.catalog.FunctionInspector; import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.cloud.function.context.message.MessageUtils;
import org.springframework.cloud.function.core.FluxWrapper; import org.springframework.cloud.function.core.FluxWrapper;
@@ -64,9 +65,9 @@ public class RequestProcessor {
private final JsonMapper mapper; private final JsonMapper mapper;
public RequestProcessor(FunctionInspector inspector, JsonMapper mapper, public RequestProcessor(FunctionInspector inspector, ObjectProvider<JsonMapper> mapper,
StringConverter converter) { StringConverter converter) {
this.mapper = mapper; this.mapper = mapper.getIfAvailable();
this.inspector = inspector; this.inspector = inspector;
this.converter = converter; this.converter = converter;
} }
@@ -100,8 +101,8 @@ public class RequestProcessor {
Class<?> inputType = inspector.getInputType(function); Class<?> inputType = inspector.getInputType(function);
Type itemType = getItemType(function); Type itemType = getItemType(function);
Object input = null; Object input = body;
if (StringUtils.hasText(body)) { if (StringUtils.hasText(body) && this.mapper!=null) {
if (body.startsWith("[")) { if (body.startsWith("[")) {
Class<?> collectionType = Collection.class.isAssignableFrom(inputType) ? inputType : Collection.class; Class<?> collectionType = Collection.class.isAssignableFrom(inputType) ? inputType : Collection.class;
input = mapper.toObject(body, ResolvableType input = mapper.toObject(body, ResolvableType

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

@@ -105,7 +105,7 @@ class FunctionEndpointInitializer
context.getBeanFactory())); context.getBeanFactory()));
context.registerBean(RequestProcessor.class, context.registerBean(RequestProcessor.class,
() -> new RequestProcessor(context.getBean(FunctionInspector.class), () -> new RequestProcessor(context.getBean(FunctionInspector.class),
context.getBean(JsonMapper.class), context.getBeanProvider(JsonMapper.class),
context.getBean(StringConverter.class))); context.getBean(StringConverter.class)));
context.registerBean(FunctionEndpointFactory.class, context.registerBean(FunctionEndpointFactory.class,
() -> new FunctionEndpointFactory(context.getBean(FunctionCatalog.class), () -> new FunctionEndpointFactory(context.getBean(FunctionCatalog.class),