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

Minor simplification in FunctionRSocketMessageHandler

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-03-17 14:58:35 +01:00
parent 835f3cc723
commit 1e42e82063
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/FunctionRSocketMessageHandler.java
View File

@@ -248,24 +248,17 @@ class FunctionRSocketMessageHandler extends RSocketMessageHandler {
? Flux.just((DataBuffer) payload)
: Flux.from((Publisher<DataBuffer>) payload);
if (MimeTypeUtils.APPLICATION_JSON_VALUE.equals(message.getHeaders().get(MessageHeaders.CONTENT_TYPE).toString())) {
if (message.getHeaders().containsKey(MessageHeaders.CONTENT_TYPE)
&& MimeTypeUtils.APPLICATION_JSON_VALUE.equals(message.getHeaders().get(MessageHeaders.CONTENT_TYPE).toString())) {
Flux<Object> argument = data.map(buffer -> {
byte[] bytePayload = this.decoder.decode(buffer, ResolvableType.forType(byte[].class), null, null);
if (JsonMapper.isJsonString(bytePayload)) {
// // could be array, map or string
Object structure = this.jsonMapper.fromJson(bytePayload, Object.class);
if (structure instanceof Map) {
if (((Map<String, ?>) structure).containsKey(FunctionRSocketUtils.PAYLOAD)) {
return MessageBuilder.withPayload(((Map<String, ?>) structure).remove(FunctionRSocketUtils.PAYLOAD))
.copyHeaders((Map<String, ?>) ((Map<String, ?>) structure).get(FunctionRSocketUtils.HEADERS))
.build();
}
else {
return MessageBuilder.withPayload(structure).build();
}
}
else {
return MessageBuilder.withPayload(structure).build();
if (structure instanceof Map && ((Map<String, ?>) structure).containsKey(FunctionRSocketUtils.PAYLOAD)) {
return MessageBuilder.withPayload(((Map<String, ?>) structure).remove(FunctionRSocketUtils.PAYLOAD))
.copyHeaders((Map<String, ?>) ((Map<String, ?>) structure).get(FunctionRSocketUtils.HEADERS))
.build();
}
}
return MessageBuilder.withPayload(bytePayload).copyHeadersIfAbsent(message.getHeaders()).build();