GH-1266 Additional cleanup of SimpleFunctionRegistry

olegz · olegz · commit f2bdddd26e8d · 2025-04-16T21:12:27.000+02:00
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -808,7 +808,7 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) {
 				if (functionInvocationHelper != null && CloudEventMessageUtils.isCloudEvent(((Message) input))) {
 					result = functionInvocationHelper.postProcessResult(result, (Message) input);
 				}
-				if (!FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {
+				if (!(result instanceof Message) && !FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {
 					result = MessageBuilder.withPayload(result).copyHeaders(this.sanitizeHeaders(((Message) input).getHeaders())).build();
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) {`
`808`	`808`	`if (functionInvocationHelper != null && CloudEventMessageUtils.isCloudEvent(((Message) input))) {`
`809`	`809`	`result = functionInvocationHelper.postProcessResult(result, (Message) input);`
`810`	`810`	`}`
`811`		`- if (!FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {`
	`811`	`+ if (!(result instanceof Message) && !FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {`
`812`	`812`	`result = MessageBuilder.withPayload(result).copyHeaders(this.sanitizeHeaders(((Message) input).getHeaders())).build();`
`813`	`813`	`}`
`814`	`814`	`}`