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

Added support for passing conversion hint to MessageConverter

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-08-07 15:54:30 +02:00
parent 6312b5e0aa
commit d53fc6b672
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -516,7 +516,9 @@ public class BeanFactoryAwareFunctionRegistry
}
if (value instanceof Message<?>) { // see AWS adapter with Optional payload
if (messageNeedsConversion(rawType, (Message<?>) value)) {
convertedValue = messageConverter.fromMessage((Message<?>) value, (Class<?>) rawType);
convertedValue = FunctionTypeUtils.isTypeCollection(type)
? messageConverter.fromMessage((Message<?>) value, (Class<?>) rawType, type)
: messageConverter.fromMessage((Message<?>) value, (Class<?>) rawType);
if (logger.isDebugEnabled()) {
logger.debug("Converted from Message: " + convertedValue);
}

19
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionTypeUtils.java
View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.function.context.catalog;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -27,6 +28,7 @@ import org.reactivestreams.Publisher;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.core.ResolvableType;
import org.springframework.messaging.Message;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
@@ -42,6 +44,23 @@ public final class FunctionTypeUtils {
}
/**
* Will return 'true' if the provided type is a {@link Collection} type.
* This also includes collections wrapped in {@link Message}. For example,
* If provided type is {@code Message<List<Foo>>} this operation will return 'true'.
*
* @param type type to interrogate
* @return 'true' if this type represents a {@link Collection}. Otherwise 'false'.
*/
public static boolean isTypeCollection(Type type) {
if (isMessage(type)) {
type = getImmediateGenericType(type, 0);
}
Type rawType = type instanceof ParameterizedType ? ((ParameterizedType) type).getRawType() : type;
return rawType instanceof Class<?> && Collection.class.isAssignableFrom((Class<?>) rawType);
}
public static Type getFunctionTypeFromFunctionMethod(Method functionMethod) {
Assert.isTrue(
functionMethod.getName().equals("apply") ||