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

SCST-2065 Fix deserialization error when multi IO signature

Browse Source 
Fix deserializatioin error when using complex signatures such as Function<Tuple2<Flux<Message<String>>
The issue originated from spring cloud stream https://github.com/spring-cloud/spring-cloud-stream/issues/2065
This commit is contained in:
Oleg Zhurakousky
2020-12-10 15:53:05 +01:00
parent 9edc08d97e
commit 7403a51464
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java
View File

@@ -59,7 +59,12 @@ class CloudEventsFunctionInvocationHelper implements FunctionInvocationHelper<Me
@Override @Override
public Message<?> preProcessInput(Message<?> input, Object inputConverter) { public Message<?> preProcessInput(Message<?> input, Object inputConverter) {
return CloudEventMessageUtils.toCanonical(input, (MessageConverter) inputConverter); try {
return CloudEventMessageUtils.toCanonical(input, (MessageConverter) inputConverter);
}
catch (Exception e) {
return input;
}
} }
@Override @Override

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

@@ -982,7 +982,10 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
* *
*/ */
private boolean isConversionHintRequired(Type actualType, Class<?> rawType) { private boolean isConversionHintRequired(Type actualType, Class<?> rawType) {
return rawType != actualType; // && !FunctionTypeUtils.isMessage(actualType); if (Collection.class.isAssignableFrom(rawType) || Map.class.isAssignableFrom(rawType)) {
return true;
}
return rawType != actualType && !FunctionTypeUtils.isMessage(actualType);
} }
/* /*
@@ -1005,23 +1008,13 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
Object convertedInput = message.getPayload(); Object convertedInput = message.getPayload();
// if (FunctionTypeUtils.isMessage(type) && FunctionTypeUtils.getRawType(type)) {
//
// }
// type = this.extractActualValueTypeIfNecessary(type);
Type itemType = this.extractActualValueTypeIfNecessary(type); Type itemType = this.extractActualValueTypeIfNecessary(type);
Class<?> rawType = FunctionTypeUtils.isMessage(type) Class<?> rawType = FunctionTypeUtils.isMessage(type)
? FunctionTypeUtils.getRawType(itemType) ? FunctionTypeUtils.getRawType(itemType)
: FunctionTypeUtils.getRawType(type); : FunctionTypeUtils.getRawType(type);
// if (!rawType.isAssignableFrom(message.getPayload().getClass())) { convertedInput = this.isConversionHintRequired(type, rawType)
convertedInput = this.isConversionHintRequired(type, rawType) ? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, itemType)
? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, itemType) : SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType);
: SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType);
// }
if (FunctionTypeUtils.isMessage(type)) { if (FunctionTypeUtils.isMessage(type)) {
@@ -1113,11 +1106,9 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
else if (FunctionTypeUtils.isFlux(type) && publisher instanceof Mono) { else if (FunctionTypeUtils.isFlux(type) && publisher instanceof Mono) {
publisher = Flux.from(publisher); publisher = Flux.from(publisher);
} }
Type actualType = type != null && FunctionTypeUtils.isPublisher(type) ? FunctionTypeUtils.getImmediateGenericType(type, 0) : type; Type actualType = type != null && FunctionTypeUtils.isPublisher(type)
// Type actualType = type != null ? FunctionTypeUtils.getGenericType(type, 0) : type; ? FunctionTypeUtils.getImmediateGenericType(type, 0)
// if (actualType == null) { : type;
// actualType = type;
// }
return publisher instanceof Mono return publisher instanceof Mono
? Mono.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType)) ? Mono.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType))
.doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex)) .doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex))