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

GH-1075 Fix conversion of complex types

Browse Source 
Resolves #1075
This commit is contained in:
Oleg Zhurakousky
2023-10-13 10:25:26 +02:00
parent 74d0d96101
commit 8e9948c4c3
2 changed files with 84 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -1325,16 +1325,6 @@ public class SimpleFunctionRegistry implements FunctionRegistry {
return type;
}
/*
*
*/
private boolean isConversionHintRequired(Type actualType, Class<?> rawType) {
if (Collection.class.isAssignableFrom(rawType) || Map.class.isAssignableFrom(rawType)) {
return true;
}
return rawType != actualType && !FunctionTypeUtils.isMessage(actualType);
}
/*
*
*/
@@ -1362,7 +1352,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry {
Class<?> rawType = FunctionTypeUtils.isMessage(type)
? FunctionTypeUtils.getRawType(itemType)
: FunctionTypeUtils.getRawType(type);
convertedInput = this.isConversionHintRequired(type, rawType)
convertedInput = type instanceof ParameterizedType
? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, itemType)
: SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType);