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

Fix previous commit's byte[] handling

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-09-23 16:04:00 +02:00
parent c6dccc9d05
commit bc6ca20116
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,7 @@ class MessageAwareJsonDecoder extends AbstractDecoder<Object> {
if (messageMap.containsKey(FunctionRSocketUtils.PAYLOAD)) { if (messageMap.containsKey(FunctionRSocketUtils.PAYLOAD)) {
Type requestedType = FunctionTypeUtils.getGenericType(targetType.getType()); Type requestedType = FunctionTypeUtils.getGenericType(targetType.getType());
Object payload; Object payload;
if (String.class.isAssignableFrom(FunctionTypeUtils.getRawType(targetType.getType())) if (String.class.isAssignableFrom(FunctionTypeUtils.getRawType(targetType.getType()))) {
|| byte[].class.isAssignableFrom(FunctionTypeUtils.getRawType(targetType.getType()))) {
Object rawPayload = messageMap.get(FunctionRSocketUtils.PAYLOAD); Object rawPayload = messageMap.get(FunctionRSocketUtils.PAYLOAD);
if (rawPayload instanceof byte[]) { if (rawPayload instanceof byte[]) {
payload = new String((byte[]) rawPayload, StandardCharsets.UTF_8); payload = new String((byte[]) rawPayload, StandardCharsets.UTF_8);
@@ -83,9 +82,31 @@ class MessageAwareJsonDecoder extends AbstractDecoder<Object> {
payload = rawPayload; payload = rawPayload;
} }
} }
else if (byte[].class.isAssignableFrom(FunctionTypeUtils.getRawType(targetType.getType()))) {
Object rawPayload = messageMap.get(FunctionRSocketUtils.PAYLOAD);
if (rawPayload instanceof String) {
payload = ((String) rawPayload).getBytes(StandardCharsets.UTF_8);
}
else {
payload = rawPayload;
}
}
else { else {
payload = this.jsonMapper.fromJson(messageMap.get(FunctionRSocketUtils.PAYLOAD), requestedType); payload = this.jsonMapper.fromJson(messageMap.get(FunctionRSocketUtils.PAYLOAD), requestedType);
} }
// if (String.class.isAssignableFrom(FunctionTypeUtils.getRawType(targetType.getType()))
// || byte[].class.isAssignableFrom(FunctionTypeUtils.getRawType(targetType.getType()))) {
// Object rawPayload = messageMap.get(FunctionRSocketUtils.PAYLOAD);
// if (rawPayload instanceof byte[]) {
// payload = new String((byte[]) rawPayload, StandardCharsets.UTF_8);
// }
// else {
// payload = rawPayload;
// }
// }
// else {
// payload = this.jsonMapper.fromJson(messageMap.get(FunctionRSocketUtils.PAYLOAD), requestedType);
// }
if (FunctionTypeUtils.isMessage(targetType.getType())) { if (FunctionTypeUtils.isMessage(targetType.getType())) {
return MessageBuilder.withPayload(payload).copyHeaders( return MessageBuilder.withPayload(payload).copyHeaders(