From 51dd8cf1d5f6c2af14fffb70b6384a3a00fced84 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 15 Mar 2021 12:23:27 +0100
Subject: [PATCH] Fix encoder/decoder to return decodableMimeTypes

This effectively fixes the Cbor exclusiion
---
 spring-cloud-function-rsocket/pom.xml                       | 6 ------
 .../cloud/function/rsocket/MessageAwareJsonDecoder.java     | 1 +
 .../cloud/function/rsocket/MessageAwareJsonEncoder.java     | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-function-rsocket/pom.xml b/spring-cloud-function-rsocket/pom.xml
index 2a7fdd6ab..ef0d8cdad 100644
--- a/spring-cloud-function-rsocket/pom.xml
+++ b/spring-cloud-function-rsocket/pom.xml
@@ -23,12 +23,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-rsocket</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.dataformat</groupId>
-					<artifactId>jackson-dataformat-cbor</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 		    <groupId>io.rsocket</groupId>
diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonDecoder.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonDecoder.java
index cf3b125c3..4df89dac9 100644
--- a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonDecoder.java
+++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonDecoder.java
@@ -49,6 +49,7 @@ class MessageAwareJsonDecoder extends AbstractDecoder<Object> {
 	private final JsonMapper jsonMapper;
 
 	MessageAwareJsonDecoder(JsonMapper jsonMapper) {
+		super(MimeTypeUtils.APPLICATION_JSON);
 		this.jsonMapper = jsonMapper;
 	}
 
diff --git a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonEncoder.java b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonEncoder.java
index 4d223c5ae..1cc105927 100644
--- a/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonEncoder.java
+++ b/spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonEncoder.java
@@ -55,6 +55,7 @@ class MessageAwareJsonEncoder extends AbstractEncoder<Object> {
 	}
 
 	MessageAwareJsonEncoder(JsonMapper mapper, boolean isClient) {
+		super(MimeTypeUtils.APPLICATION_JSON);
 		this.mapper = mapper;
 		this.isClient = isClient;
 		this.byteArrayEncoder = new ByteArrayEncoder();