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

Fix type resolution for wild card types

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-10-27 13:33:11 +01:00
parent 4f17f7596d
commit 54d65c1c74
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,11 +92,16 @@ public final class FunctionTypeUtils {
if (isMessage(type)) { if (isMessage(type)) {
type = getImmediateGenericType(type, 0); type = getImmediateGenericType(type, 0);
} }
return type; return TypeResolver.reify(type);
} }
/**
* Effectively converts {@link Type} which could be {@link ParameterizedType} to raw Class (no generics).
* @param type actual {@link Type} instance
* @return instance of {@link Class} as raw representation of the provided {@link Type}
*/
public static Class<?> getRawType(Type type) { public static Class<?> getRawType(Type type) {
return type != null ? TypeResolver.resolveRawClass(type, null) : null; return type != null ? TypeResolver.resolveRawClass(TypeResolver.reify(type), null) : null;
} }
/** /**

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

@@ -36,7 +36,6 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.jodah.typetools.TypeResolver;
import org.apache.commons.logging.Log; 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;
@@ -372,11 +371,11 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
} }
public Class<?> getRawOutputType() { public Class<?> getRawOutputType() {
return this.outputType == null ? null : TypeResolver.resolveRawClass(this.outputType, null); return this.outputType == null ? null : FunctionTypeUtils.getRawType(this.outputType);
} }
public Class<?> getRawInputType() { public Class<?> getRawInputType() {
return this.inputType == null ? null : TypeResolver.resolveRawClass(this.inputType, null); return this.inputType == null ? null : FunctionTypeUtils.getRawType(this.inputType);
} }
/** /**
@@ -541,7 +540,9 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
* *
*/ */
private Class<?> getRawClassFor(@Nullable Type type) { private Class<?> getRawClassFor(@Nullable Type type) {
return type instanceof TypeVariable || type instanceof WildcardType ? Object.class : TypeResolver.resolveRawClass(type, null); return type instanceof TypeVariable || type instanceof WildcardType
? Object.class
: FunctionTypeUtils.getRawType(type);
} }
/** /**
@@ -843,7 +844,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
private Object convertNonMessageInputIfNecessary(Type inputType, Object input) { private Object convertNonMessageInputIfNecessary(Type inputType, Object input) {
Object convertedInput = input; Object convertedInput = input;
Class<?> rawInputType = this.isTypePublisher(inputType) || this.isInputTypeMessage() Class<?> rawInputType = this.isTypePublisher(inputType) || this.isInputTypeMessage()
? TypeResolver.resolveRawClass(FunctionTypeUtils.getImmediateGenericType(inputType, 0), null) ? FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(inputType))
: this.getRawClassFor(inputType); : this.getRawClassFor(inputType);
if (JsonMapper.isJsonString(input) && !Message.class.isAssignableFrom(rawInputType)) { if (JsonMapper.isJsonString(input) && !Message.class.isAssignableFrom(rawInputType)) {
@@ -878,7 +879,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
*/ */
private Type extractActualValueTypeIfNecessary(Type type) { private Type extractActualValueTypeIfNecessary(Type type) {
if (type instanceof ParameterizedType && (FunctionTypeUtils.isPublisher(type) || FunctionTypeUtils.isMessage(type))) { if (type instanceof ParameterizedType && (FunctionTypeUtils.isPublisher(type) || FunctionTypeUtils.isMessage(type))) {
return FunctionTypeUtils.getImmediateGenericType(type, 0); return FunctionTypeUtils.getGenericType(type);
} }
return type; return type;
} }
@@ -903,12 +904,11 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
Object convertedInput = message; Object convertedInput = message;
type = this.extractActualValueTypeIfNecessary(type); type = this.extractActualValueTypeIfNecessary(type);
Class rawType = TypeResolver.resolveRawClass(type, null); Class rawType = FunctionTypeUtils.getRawType(type);
convertedInput = this.isConversionHintRequired(type, rawType) convertedInput = this.isConversionHintRequired(type, rawType)
? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, type) ? SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType, type)
: SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType); : SimpleFunctionRegistry.this.messageConverter.fromMessage(message, rawType);
if (this.isInputTypeMessage()) { if (this.isInputTypeMessage()) {
if (convertedInput == null) { if (convertedInput == null) {
/* /*