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

interim

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-12-10 07:56:15 +01:00
parent 90c3c35f68
commit 9edc08d97e
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -981,8 +981,8 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
/*
*
*/
private boolean isConversionHintRequired(Object actualType, Class<?> rawType) {
return rawType != actualType;
private boolean isConversionHintRequired(Type actualType, Class<?> rawType) {
return rawType != actualType; // && !FunctionTypeUtils.isMessage(actualType);
}
/*
@@ -1003,14 +1003,28 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
}
}
Object convertedInput = message;
type = this.extractActualValueTypeIfNecessary(type);
Class rawType = FunctionTypeUtils.getRawType(type);
convertedInput = this.isConversionHintRequired(type, rawType)
? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, type)
: SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType);
Object convertedInput = message.getPayload();
if (this.isInputTypeMessage()) {
// if (FunctionTypeUtils.isMessage(type) && FunctionTypeUtils.getRawType(type)) {
//
// }
// type = this.extractActualValueTypeIfNecessary(type);
Type itemType = this.extractActualValueTypeIfNecessary(type);
Class<?> rawType = FunctionTypeUtils.isMessage(type)
? FunctionTypeUtils.getRawType(itemType)
: FunctionTypeUtils.getRawType(type);
// if (!rawType.isAssignableFrom(message.getPayload().getClass())) {
convertedInput = this.isConversionHintRequired(type, rawType)
? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, itemType)
: SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType);
// }
if (FunctionTypeUtils.isMessage(type)) {
if (convertedInput == null) {
/*
* In the event conversion was unsuccessful we simply return the original un-converted message.
@@ -1099,11 +1113,15 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
else if (FunctionTypeUtils.isFlux(type) && publisher instanceof Mono) {
publisher = Flux.from(publisher);
}
Type actualType = type != null ? FunctionTypeUtils.getGenericType(type) : type;
Type actualType = type != null && FunctionTypeUtils.isPublisher(type) ? FunctionTypeUtils.getImmediateGenericType(type, 0) : type;
// Type actualType = type != null ? FunctionTypeUtils.getGenericType(type, 0) : type;
// if (actualType == null) {
// actualType = type;
// }
return publisher instanceof Mono
? Mono.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType))
? Mono.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType))
.doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex))
: Flux.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType))
: Flux.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType))
.doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex));
}