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

INT-4055: Fix New SonarQube Violations

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4055

Further fixes for Sonar report

Fix more errors from Sonar

Fix unused `import`
This commit is contained in:
Artem Bilan
2016-06-14 16:22:54 -04:00
committed by Gary Russell
parent 105f5ef86d
commit 266b4d46ad
7 changed files with 118 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
View File

@@ -63,9 +63,9 @@ import org.springframework.util.CollectionUtils;
/**
* Abstract Message handler that holds a buffer of correlated messages in a
* {@link MessageStore}. This class takes care of correlated groups of messages
* that can be completed in batches. It is useful for custom implementation of MessageHandlers that require correlation
* and is used as a base class for Aggregator - {@link AggregatingMessageHandler} and
* Resequencer - {@link ResequencingMessageHandler},
* that can be completed in batches. It is useful for custom implementation of
* MessageHandlers that require correlation and is used as a base class for Aggregator -
* {@link AggregatingMessageHandler} and Resequencer - {@link ResequencingMessageHandler},
* or custom implementations requiring correlation.
* <p>
* To customize this handler inject {@link CorrelationStrategy},
@@ -94,10 +94,10 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageP
private final Map<UUID, ScheduledFuture<?>> expireGroupScheduledFutures = new HashMap<UUID, ScheduledFuture<?>>();
protected volatile MessageGroupStore messageStore;
private final MessageGroupProcessor outputProcessor;
private volatile MessageGroupStore messageStore;
private volatile CorrelationStrategy correlationStrategy;
private volatile ReleaseStrategy releaseStrategy;
@@ -486,8 +486,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageP
}
private void discardMessage(Message<?> message) {
MessageChannel discardChannel = getDiscardChannel();
this.messagingTemplate.send(discardChannel, message);
this.messagingTemplate.send(getDiscardChannel(), message);
}
/**

9
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java
View File

@@ -64,17 +64,18 @@ public class AggregatingMessageHandler extends AbstractCorrelatingMessageHandler
@Override
protected void afterRelease(MessageGroup messageGroup, Collection<Message<?>> completedMessages) {
Object groupId = messageGroup.getGroupId();
this.messageStore.completeGroup(groupId);
MessageGroupStore messageStore = getMessageStore();
messageStore.completeGroup(groupId);
if (this.expireGroupsUponCompletion) {
remove(messageGroup);
}
else {
if (this.messageStore instanceof SimpleMessageStore) {
((SimpleMessageStore) this.messageStore).clearMessageGroup(groupId);
if (messageStore instanceof SimpleMessageStore) {
((SimpleMessageStore) messageStore).clearMessageGroup(groupId);
}
else {
this.messageStore.removeMessagesFromGroup(groupId, messageGroup.getMessages());
messageStore.removeMessagesFromGroup(groupId, messageGroup.getMessages());
}
}
}

11
spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java
View File

@@ -82,19 +82,20 @@ public class ResequencingMessageHandler extends AbstractCorrelatingMessageHandle
}
else {
Object groupId = messageGroup.getGroupId();
MessageGroupStore messageStore = getMessageStore();
if (completedMessages != null) {
int lastReleasedSequenceNumber = findLastReleasedSequenceNumber(groupId, completedMessages);
this.messageStore.setLastReleasedSequenceNumberForGroup(groupId, lastReleasedSequenceNumber);
if (this.messageStore instanceof SimpleMessageStore
messageStore.setLastReleasedSequenceNumberForGroup(groupId, lastReleasedSequenceNumber);
if (messageStore instanceof SimpleMessageStore
&& completedMessages.size() == messageGroup.size()) {
((SimpleMessageStore) this.messageStore).clearMessageGroup(groupId);
((SimpleMessageStore) messageStore).clearMessageGroup(groupId);
}
else {
this.messageStore.removeMessagesFromGroup(groupId, completedMessages);
messageStore.removeMessagesFromGroup(groupId, completedMessages);
}
}
if (timeout) {
this.messageStore.completeGroup(groupId);
messageStore.completeGroup(groupId);
}
}
}