From 6d96fb251664ed72bc47c4f3baa03e58e2c9a95c Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 19 Nov 2021 16:04:10 +0100
Subject: [PATCH] GH-771 Remove ApplicationJsonMessageMarshallingConverter from
 the list of available converters

Resolves #771
---
 .../config/ContextFunctionCatalogAutoConfiguration.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
index 35149a36b..4a6d944eb 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
@@ -109,7 +109,9 @@ public class ContextFunctionCatalogAutoConfiguration {
 		if (!CollectionUtils.isEmpty(messageConverters)) {
 			for (MessageConverter mc : messageConverters) {
 				if (mc instanceof CompositeMessageConverter) {
-					mcList.addAll(((CompositeMessageConverter) mc).getConverters());
+					List<MessageConverter> conv = ((CompositeMessageConverter) mc).getConverters().stream()
+						.filter(c -> !c.getClass().getSimpleName().equals("ApplicationJsonMessageMarshallingConverter")).collect(Collectors.toList());
+					mcList.addAll(conv);
 				}
 				else {
 					mcList.add(mc);