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

GH-745 Fix conversion issue with json Strings and byte[]

Browse Source 
Resolves #745
This commit is contained in:
Oleg Zhurakousky
2021-09-21 07:15:27 +02:00
parent c8f146a98a
commit 6aafea1537
3 changed files with 97 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package org.springframework.cloud.function.rsocket;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -80,12 +81,18 @@ class MessageAwareJsonEncoder extends AbstractEncoder<Object> {
return Collections.singletonList(MimeTypeUtils.APPLICATION_JSON);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public DataBuffer encodeValue(Object value, DataBufferFactory bufferFactory,
ResolvableType valueType, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
if (value instanceof Message) {
Object payload = ((Message<?>) value).getPayload();
value = FunctionRSocketUtils.sanitizeMessageToMap((Message<?>) value);
if (payload instanceof byte[]) {
payload = new String((byte[]) payload, StandardCharsets.UTF_8); // safe for cases when we have JSON
((Map) value).put(FunctionRSocketUtils.PAYLOAD, payload);
}
}
else if (!(value instanceof Map)) {
if (JsonMapper.isJsonString(value)) {