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

Fix new Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2019-12-27 22:32:38 -05:00
parent 5ac262f866
commit a6b99dba35
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.java
View File

@@ -294,8 +294,9 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc
for (int j = filenames.size() - 1; j >= 0; j--) {
String filename = filenames.get(j);
PropertiesHolder propHolder = getProperties(filename);
if (propHolder.getProperties() != null) {
mergedProps.putAll(propHolder.getProperties());
Properties propHolderProperties = propHolder.getProperties();
if (propHolderProperties != null) {
mergedProps.putAll(propHolderProperties);
}
}
}

15
spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
View File

@@ -38,11 +38,12 @@ import reactor.core.CoreSubscriber;
public abstract class AbstractMessageHandler extends MessageHandlerSupport
implements MessageHandler, CoreSubscriber<Message<?>> {
@SuppressWarnings("deprecation")
@SuppressWarnings("deprecation") // NOSONAR
public void handleMessage(Message<?> message) {
Assert.notNull(message, "Message must not be null");
Message<?> messageToUse = message;
Assert.notNull(messageToUse, "Message must not be null");
if (isLoggingEnabled() && this.logger.isDebugEnabled()) {
this.logger.debug(this + " received message: " + message);
this.logger.debug(this + " received message: " + messageToUse);
}
org.springframework.integration.support.management.MetricsContext start = null;
SampleFacade sample = null;
@@ -52,19 +53,19 @@ public abstract class AbstractMessageHandler extends MessageHandlerSupport
}
try {
if (shouldTrack()) {
message = MessageHistory.write(message, this, getMessageBuilderFactory());
messageToUse = MessageHistory.write(messageToUse, this, getMessageBuilderFactory());
}
AbstractMessageHandlerMetrics handlerMetrics = getHandlerMetrics();
if (isCountsEnabled()) {
start = handlerMetrics.beforeHandle();
handleMessageInternal(message);
handleMessageInternal(messageToUse);
if (sample != null) {
sample.stop(sendTimer());
}
handlerMetrics.afterHandle(start, true);
}
else {
handleMessageInternal(message);
handleMessageInternal(messageToUse);
}
}
catch (Exception e) {
@@ -74,7 +75,7 @@ public abstract class AbstractMessageHandler extends MessageHandlerSupport
if (isCountsEnabled()) {
getHandlerMetrics().afterHandle(start, false);
}
throw IntegrationUtils.wrapInHandlingExceptionIfNecessary(message,
throw IntegrationUtils.wrapInHandlingExceptionIfNecessary(messageToUse,
() -> "error occurred in message handler [" + this + "]", e);
}
}