GH-1294 Additional changes related to removal of TARGET_PROTOCOL

Author: olegz

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

@@ -140,7 +140,8 @@ public static boolean isTypeMap(Type type) {
 	}
 
 	public static boolean isTypeArray(Type type) {
-		return getRawType(type).isArray();
+		return type instanceof GenericArrayType;
+//		return getRawType(type).isArray();
 	}
 
 	public static boolean isJsonNode(Type type) {
@@ -537,8 +538,13 @@ public static boolean isFlux(Type type) {
 	}
 
 	public static boolean isCollectionOfMessage(Type type) {
-		if (isMessage(type) && isTypeCollection(type)) {
-			return isMessage(getImmediateGenericType(type, 0));
+		if (isMessage(type) && (isTypeCollection(type) || isTypeArray(type))) {
+			if (isTypeCollection(type)) {
+				return isMessage(getImmediateGenericType(type, 0));
+			}
+			else if (type instanceof GenericArrayType arrayType) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -547,6 +553,9 @@ public static boolean isMessage(Type type) {
 		if (isPublisher(type)) {
 			type = getImmediateGenericType(type, 0);
 		}
+		if (type instanceof GenericArrayType arrayType) {
+			type = arrayType.getGenericComponentType();
+		}
 
 		Class<?> resolveRawClass = FunctionTypeUtils.getRawType(type);
 		if (type instanceof ParameterizedType && !Message.class.isAssignableFrom(resolveRawClass)) {

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

@@ -452,6 +452,9 @@ public class FunctionInvocationWrapper implements Function<Object, Object>, Cons
 				Map<String, FunctionConfigurationProperties> funcConfiguration = functionProperties.getConfiguration();
 				if (!CollectionUtils.isEmpty(funcConfiguration)) {
 					FunctionConfigurationProperties configuration = funcConfiguration.get(functionDefinition);
+					if (configuration == null) {
+						configuration = funcConfiguration.get("default");
+					}
 					if (configuration != null) {
 						propagateInputHeaders = configuration.isCopyInputHeaders();
 					}
@@ -1177,13 +1180,12 @@ private Message filterOutHeaders(Message message) {
 		}
 
 		private boolean isExtractPayload(Message<?> message, Type type) {
-			if (this.propagateInputHeaders || this.isRoutingFunction() || FunctionTypeUtils.isMessage(type)) {
-				return false;
-			}
 			if (FunctionTypeUtils.isCollectionOfMessage(type)) {
 				return true;
 			}
-
+			if (this.propagateInputHeaders || this.isRoutingFunction() || FunctionTypeUtils.isMessage(type)) {
+				return false;
+			}
 			Object payload = message.getPayload();
 			if ((payload instanceof byte[])) {
 				return false;