Fix new Sonar smells

This commit is contained in:
Artem Bilan
2020-07-02 10:30:03 -04:00
parent f62b0916b6
commit 412d9f5400
2 changed files with 31 additions and 27 deletions

View File

@@ -613,13 +613,14 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
private Mono<Message<?>> doSendAndReceiveMessageReactive(MessageChannel requestChannel, Object object,
boolean error) {
final Message<?> requestMessage;
Message<?> requestMessage;
try {
Message<?> message =
object instanceof Message<?>
? (Message<?>) object
: this.requestMapper.toMessage(object);
Assert.state(message != null, () -> "request mapper resulted in no message for " + object);
message = this.historyWritingPostProcessor.postProcessMessage(message);
requestMessage = message;
}
@@ -628,7 +629,6 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
}
return Mono.defer(() -> {
Object originalReplyChannelHeader = requestMessage.getHeaders().getReplyChannel();
Object originalErrorChannelHeader = requestMessage.getHeaders().getErrorChannel();