Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce Method Complexity (Sonar)

Browse Source
This commit is contained in:
Gary Russell
2020-08-28 17:39:45 -04:00
parent 85a862fdd9
commit c9ec1e3e1e
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannelImpl.java
View File

@@ -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;