Fix Sonar issues

This commit is contained in:
Gary Russell
2019-07-31 09:40:54 -04:00
parent 884db2c609
commit f7fc3360cd
5 changed files with 31 additions and 17 deletions

View File

@@ -264,18 +264,25 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter
mapped = true;
}
if (channelName != null) {
if (this.prefix != null) {
channelName = this.prefix + channelName;
}
if (this.suffix != null) {
channelName = channelName + this.suffix;
}
MessageChannel channel = resolveChannelForName(channelName, message);
if (channel != null) {
channels.add(channel);
if (!mapped && this.dynamicChannels.get(channelName) == null) {
this.dynamicChannels.put(channelName, channel);
}
addChannel(channels, message, channelName, mapped);
}
}
private void addChannel(Collection<MessageChannel> channels, Message<?> message, String channelNameArg,
boolean mapped) {
String channelName = channelNameArg;
if (this.prefix != null) {
channelName = this.prefix + channelName;
}
if (this.suffix != null) {
channelName = channelName + this.suffix;
}
MessageChannel channel = resolveChannelForName(channelName, message);
if (channel != null) {
channels.add(channel);
if (!mapped && this.dynamicChannels.get(channelName) == null) {
this.dynamicChannels.put(channelName, channel);
}
}
}