From c9ec1e3e1e65b8298fcdc2a41100d8207448b746 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 28 Aug 2020 17:39:45 -0400 Subject: [PATCH] Reduce Method Complexity (Sonar) --- .../PublisherCallbackChannelImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannelImpl.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannelImpl.java index 595e5a82..9cf053d4 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannelImpl.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannelImpl.java @@ -1060,20 +1060,7 @@ public class PublisherCallbackChannelImpl if (this.logger.isDebugEnabled()) { this.logger.debug("Return " + this.toString()); } - LongString returnCorrelation = (LongString) returned.getProperties().getHeaders() - .get(RETURNED_MESSAGE_CORRELATION_KEY); - PendingConfirm confirm = null; - if (returnCorrelation != null) { - confirm = this.pendingReturns.remove(returnCorrelation.toString()); - if (confirm != null) { - MessageProperties messageProperties = CONVERTER.toMessageProperties(returned.getProperties(), - new Envelope(0L, false, returned.getExchange(), returned.getRoutingKey()), - StandardCharsets.UTF_8.name()); - if (confirm.getCorrelationData() != null) { - confirm.getCorrelationData().setReturnedMessage(new Message(returned.getBody(), messageProperties)); // NOSONAR never null - } - } - } + PendingConfirm confirm = findConfirm(returned); Listener listener = findListener(returned.getProperties()); if (listener == null || !listener.isReturnListener()) { if (this.logger.isDebugEnabled()) { @@ -1102,6 +1089,24 @@ public class PublisherCallbackChannelImpl } } + private PendingConfirm findConfirm(Return returned) { + LongString returnCorrelation = (LongString) returned.getProperties().getHeaders() + .get(RETURNED_MESSAGE_CORRELATION_KEY); + PendingConfirm confirm = null; + if (returnCorrelation != null) { + confirm = this.pendingReturns.remove(returnCorrelation.toString()); + if (confirm != null) { + MessageProperties messageProperties = CONVERTER.toMessageProperties(returned.getProperties(), + new Envelope(0L, false, returned.getExchange(), returned.getRoutingKey()), + StandardCharsets.UTF_8.name()); + if (confirm.getCorrelationData() != null) { + confirm.getCorrelationData().setReturnedMessage(new Message(returned.getBody(), messageProperties)); // NOSONAR never null + } + } + } + return confirm; + } + @Nullable private Listener findListener(AMQP.BasicProperties properties) { Listener listener = null;