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

Fix encoder/decoder to return decodableMimeTypes

Browse Source 
This effectively fixes the Cbor exclusiion
This commit is contained in:
Oleg Zhurakousky
2021-03-15 12:23:27 +01:00
parent 98fe5bc8eb
commit 51dd8cf1d5
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-function-rsocket/pom.xml
View File

@@ -23,12 +23,6 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-rsocket</artifactId> <artifactId>spring-boot-starter-rsocket</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.rsocket</groupId> <groupId>io.rsocket</groupId>

1
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonDecoder.java
View File

@@ -49,6 +49,7 @@ class MessageAwareJsonDecoder extends AbstractDecoder<Object> {
private final JsonMapper jsonMapper; private final JsonMapper jsonMapper;
MessageAwareJsonDecoder(JsonMapper jsonMapper) { MessageAwareJsonDecoder(JsonMapper jsonMapper) {
super(MimeTypeUtils.APPLICATION_JSON);
this.jsonMapper = jsonMapper; this.jsonMapper = jsonMapper;
} }

1
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/MessageAwareJsonEncoder.java
View File

@@ -55,6 +55,7 @@ class MessageAwareJsonEncoder extends AbstractEncoder<Object> {
} }
MessageAwareJsonEncoder(JsonMapper mapper, boolean isClient) { MessageAwareJsonEncoder(JsonMapper mapper, boolean isClient) {
super(MimeTypeUtils.APPLICATION_JSON);
this.mapper = mapper; this.mapper = mapper;
this.isClient = isClient; this.isClient = isClient;
this.byteArrayEncoder = new ByteArrayEncoder(); this.byteArrayEncoder = new ByteArrayEncoder();