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

Fix new Sonar smells (#2768)

Browse Source 
* Fix new Sonar smells

* Fix some old Sonar smells as well
* Fix Micrometer leaks in the `PollableChannel` when we register
meters, but don't remove them.

* * Fix NPE around `MetricsCaptor` in channels

* * Fix new smells according test report

* * Further Sonar smell fixes

* * More smell fixes for `MessagingMethodInvokerHelper`
* Remove `throws Exception` from `AbstractMessageHandler.destroy()`

* * Fix complexity in the `MessagingMethodInvokerHelper.processInvokeExceptionAndFallbackToExpressionIfAny()`
This commit is contained in:
Artem Bilan
2019-02-27 15:17:51 -05:00
committed by Gary Russell
parent f741724656
commit d2e974a6de
33 changed files with 828 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MessageMatcher.java
View File

@@ -59,13 +59,6 @@ public class MessageMatcher extends BaseMatcher<Message<?>> {
this.headers = getHeaders(operand);
}
private Map<String, Object> getHeaders(Message<?> operand) {
HashMap<String, Object> headers = new HashMap<>(operand.getHeaders());
headers.remove(MessageHeaders.ID);
headers.remove(MessageHeaders.TIMESTAMP);
return headers;
}
public boolean matches(Object arg) {
Message<?> input = (Message<?>) arg;
Map<String, Object> inputHeaders = getHeaders(input);
@@ -78,4 +71,11 @@ public class MessageMatcher extends BaseMatcher<Message<?>> {
.appendValue(this.headers);
}
private static Map<String, Object> getHeaders(Message<?> operand) {
HashMap<String, Object> headersToFilter = new HashMap<>(operand.getHeaders());
headersToFilter.remove(MessageHeaders.ID);
headersToFilter.remove(MessageHeaders.TIMESTAMP);
return headersToFilter;
}
}

6
spring-integration-test-support/src/main/java/org/springframework/integration/test/predicate/MessagePredicate.java
View File

@@ -68,9 +68,9 @@ public class MessagePredicate implements Predicate<Message<?>> {
}
private Map<String, Object> getHeaders(Message<?> operand) {
HashMap<String, Object> headers = new HashMap<>(operand.getHeaders());
this.ignoredHeaders.forEach(headers::remove);
return headers;
HashMap<String, Object> headersToFilter = new HashMap<>(operand.getHeaders());
this.ignoredHeaders.forEach(headersToFilter::remove);
return headersToFilter;
}
}