From 9e512186ed6ba602b16809684f4c941cd1fe71ab Mon Sep 17 00:00:00 2001 From: trungPa Date: Fri, 23 Jul 2021 22:07:39 +0700 Subject: [PATCH] GH-3549: Fix minor SonarQube smells Fixes https://github.com/spring-projects/spring-integration/issues/3549 --- .../leader/LockRegistryLeaderInitiator.java | 2 +- .../support/locks/DefaultLockRegistry.java | 4 ++-- ...licationEventListeningMessageProducer.java | 4 ++-- ...acheCommonsFileTailingMessageProducer.java | 2 +- .../session/AbstractFtpSessionFactory.java | 2 +- .../integration/http/inbound/CrossOrigin.java | 2 +- ...ternetProtocolReceivingChannelAdapter.java | 4 ++-- .../TcpConnectionFactoryFactoryBean.java | 2 +- .../ip/tcp/TcpOutboundGateway.java | 2 +- .../ip/tcp/TcpReceivingChannelAdapter.java | 2 +- .../ip/tcp/connection/TcpNetConnection.java | 2 +- .../tcp/connection/TcpNioSSLConnection.java | 4 ++-- .../ByteArraySingleTerminatorSerializer.java | 2 +- .../ip/udp/DatagramPacketMessageMapper.java | 14 +++++------ .../ip/udp/UnicastSendingMessageHandler.java | 2 +- .../integration/ip/util/TestingUtilities.java | 24 +++++++++---------- .../jdbc/metadata/JdbcMetadataStore.java | 12 +++++----- ...elMessageStorePreparedStatementSetter.java | 10 ++++---- .../integration/jms/DynamicJmsTemplate.java | 2 +- .../RedisChannelPriorityMessageStore.java | 2 +- .../redis/util/RedisLockRegistry.java | 2 +- ...ftpPersistentAcceptOnceFileListFilter.java | 2 +- .../sftp/gateway/SftpOutboundGateway.java | 2 +- .../inbound/SftpInboundFileSynchronizer.java | 2 +- .../session/DefaultSftpSessionFactory.java | 4 ++-- .../sftp/session/SftpFileInfo.java | 2 +- .../ByteStreamReadingMessageSource.java | 2 +- .../syslog/RFC5424SyslogParser.java | 22 ++++++++--------- .../inbound/RFC6587SyslogDeserializer.java | 6 ++--- .../AbstractRequestResponseScenarioTests.java | 2 +- .../config/XmppConnectionFactoryBean.java | 2 +- .../config/CuratorFrameworkFactoryBean.java | 4 ++-- .../config/LeaderInitiatorFactoryBean.java | 2 +- 33 files changed, 77 insertions(+), 77 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java b/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java index 1b59060102..d268ce1774 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java @@ -140,7 +140,7 @@ public class LockRegistryLeaderInitiator implements SmartLifecycle, DisposableBe /** * @see SmartLifecycle which is an extension of org.springframework.context.Phased */ - private int phase = Integer.MAX_VALUE - 1000; + private int phase = Integer.MAX_VALUE - 1000; // NOSONAR magic number /** * Time in milliseconds to wait in between attempts to acquire the lock, if it is not diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java index 6a6cfdce52..9c3864a358 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java @@ -44,7 +44,7 @@ public final class DefaultLockRegistry implements LockRegistry { * mask 0xFF with 256 locks. */ public DefaultLockRegistry() { - this(0xFF); + this(0xFF); // NOSONAR magic number } /** @@ -60,7 +60,7 @@ public final class DefaultLockRegistry implements LockRegistry { */ public DefaultLockRegistry(int mask) { String bits = Integer.toBinaryString(mask); - Assert.isTrue(bits.length() < 32 && (mask == 0 || bits.lastIndexOf('0') < bits.indexOf('1')), "Mask must be a power of 2 - 1"); + Assert.isTrue(bits.length() < 32 && (mask == 0 || bits.lastIndexOf('0') < bits.indexOf('1')), "Mask must be a power of 2 - 1"); // NOSONAR magic number this.mask = mask; int arraySize = this.mask + 1; this.lockTable = new ReentrantLock[arraySize]; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java index a25b1067f8..c035926182 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java @@ -55,7 +55,7 @@ public class ApplicationEventListeningMessageProducer extends ExpressionMessageP private volatile long stoppedAt; public ApplicationEventListeningMessageProducer() { - setPhase(Integer.MAX_VALUE / 2 - 1000); + setPhase(Integer.MAX_VALUE / 2 - 1000); // NOSONAR magic number } /** @@ -131,7 +131,7 @@ public class ApplicationEventListeningMessageProducer extends ExpressionMessageP } private boolean stoppedRecently() { - return this.stoppedAt > System.currentTimeMillis() - 5000; + return this.stoppedAt > System.currentTimeMillis() - 5000; // NOSONAR magic number } @Override diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/ApacheCommonsFileTailingMessageProducer.java b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/ApacheCommonsFileTailingMessageProducer.java index da5b374ca2..b2db668638 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/ApacheCommonsFileTailingMessageProducer.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/ApacheCommonsFileTailingMessageProducer.java @@ -31,7 +31,7 @@ import org.apache.commons.io.input.TailerListener; public class ApacheCommonsFileTailingMessageProducer extends FileTailingMessageProducerSupport implements TailerListener { - private long pollingDelay = 1000; + private long pollingDelay = 1000; // NOSONAR magic number private boolean end = true; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java index 189239a085..b11e0f907c 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java @@ -52,7 +52,7 @@ public abstract class AbstractFtpSessionFactory implements private int port = FTP.DEFAULT_PORT; - private int bufferSize = 2048; //see https://issues.apache.org/jira/browse/NET-207 + private int bufferSize = 2048; // NOSONAR magic number. See https://issues.apache.org/jira/browse/NET-207 private int clientMode = FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java index d8580879c5..d1ef08e0dd 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java @@ -44,7 +44,7 @@ public class CrossOrigin { private Boolean allowCredentials = true; - private long maxAge = 1800; + private long maxAge = 1800; // NOSONAR magic number public void setOrigin(String... origin) { this.origin = Arrays.copyOf(origin, origin.length); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java index b4af6c5ea1..bea28742a1 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java @@ -47,7 +47,7 @@ public abstract class AbstractInternetProtocolReceivingChannelAdapter private int soReceiveBufferSize = -1; - private int receiveBufferSize = 2048; + private int receiveBufferSize = 2048; // NOSONAR magic number private String localAddress; @@ -55,7 +55,7 @@ public abstract class AbstractInternetProtocolReceivingChannelAdapter private boolean taskExecutorSet; - private int poolSize = 5; + private int poolSize = 5; // NOSONAR magic number private volatile boolean listening; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java index e848130d16..1c89844511 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java @@ -96,7 +96,7 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean(DEFAULT_REMOTE_TIMEOUT); - private long requestTimeout = 10000; + private long requestTimeout = 10000; // NOSONAR magic number private EvaluationContext evaluationContext = new StandardEvaluationContext(); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java index 843fc3f8ae..8a865c730f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java @@ -57,7 +57,7 @@ public class TcpReceivingChannelAdapter private volatile boolean isClientMode; - private volatile long retryInterval = 60000; + private volatile long retryInterval = 60000; // NOSONAR magic number private volatile ScheduledFuture scheduledFuture; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java index 6d7c01853c..b7defc78e8 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java @@ -107,7 +107,7 @@ public class TcpNetConnection extends TcpConnectionSupport implements Scheduling if (this.socketOutputStream == null) { int writeBufferSize = this.socket.getSendBufferSize(); this.socketOutputStream = new BufferedOutputStream(this.socket.getOutputStream(), - writeBufferSize > 0 ? writeBufferSize : 8192); + writeBufferSize > 0 ? writeBufferSize : 8192); // NOSONAR magic number } Object object = getMapper().fromMessage(message); Assert.state(object != null, "Mapper mapped the message to 'null'."); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java index 3137e63095..86def19d3e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java @@ -271,8 +271,8 @@ public class TcpNioSSLConnection extends TcpNioConnection { */ public void init() { if (this.decoded == null) { - this.decoded = allocateEncryptionBuffer(2048); - this.encoded = allocateEncryptionBuffer(2048); + this.decoded = allocateEncryptionBuffer(2048); // NOSONAR magic number + this.encoded = allocateEncryptionBuffer(2048); // NOSONAR magic number initializeEngine(); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java index 314afea43f..98e38e85f7 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java @@ -63,7 +63,7 @@ public class ByteArraySingleTerminatorSerializer extends AbstractPooledBufferByt buffer[n++] = (byte) bite; int maxMessageSize = getMaxMessageSize(); if (n >= maxMessageSize) { - throw new IOException("Terminator '0x" + Integer.toHexString(this.terminator & 0xff) + throw new IOException("Terminator '0x" + Integer.toHexString(this.terminator & 0xff) // NOSONAR magic number + "' not found before max message length: " + maxMessageSize); } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java index 569cab7cd5..965ae95145 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java @@ -141,7 +141,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper message) { Assert.state(StringUtils.hasText(this.ackAddress), "'ackAddress' must not be empty"); byte[] bytes = getPayloadAsBytes(message); - ByteBuffer buffer = ByteBuffer.allocate(100 + bytes.length); + ByteBuffer buffer = ByteBuffer.allocate(100 + bytes.length); // NOSONAR magic number if (this.lengthCheck) { buffer.putInt(0); // placeholder for length } @@ -177,7 +177,7 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper message = null; if (this.lengthCheck) { int declaredLength = buffer.getInt(); - if (declaredLength != (length - 4)) { - throw new MessageMappingException("Incorrect length; expected " + (declaredLength + 4) + if (declaredLength != (length - 4)) { // NOSONAR magic number + throw new MessageMappingException("Incorrect length; expected " + (declaredLength + 4) // NOSONAR magic number + ", received " + length); } - offset += 4; - length -= 4; + offset += 4; // NOSONAR magic number + length -= 4; // NOSONAR magic number } String hostAddress = packet.getAddress().getHostAddress(); String hostName; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java index ddc2d516fe..2ede34f675 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java @@ -518,7 +518,7 @@ public class UnicastSendingMessageHandler extends try { this.ackThreadRunning = true; this.ackLatch.countDown(); - DatagramPacket ackPack = new DatagramPacket(new byte[100], 100); + DatagramPacket ackPack = new DatagramPacket(new byte[100], 100); // NOSONAR magic number while (true) { getSocket().receive(ackPack); String id = new String(ackPack.getData(), ackPack.getOffset(), ackPack.getLength()); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/TestingUtilities.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/TestingUtilities.java index 7ca72039c6..e9236c7e3b 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/TestingUtilities.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/TestingUtilities.java @@ -48,15 +48,15 @@ public final class TestingUtilities { Long delay = delayArg; if (delay == null) { - delay = 100L; + delay = 100L; // NOSONAR magic number } else { - delay = delay / 100; + delay = delay / 100; // NOSONAR magic number } int n = 0; while (!serverConnectionFactory.isListening()) { try { - Thread.sleep(100); + Thread.sleep(100); // NOSONAR magic number } catch (InterruptedException e1) { Thread.currentThread().interrupt(); @@ -81,15 +81,15 @@ public final class TestingUtilities { Long delay = delayArg; if (delay == null) { - delay = 100L; + delay = 100L; // NOSONAR magic number } else { - delay = delay / 100; + delay = delay / 100; // NOSONAR magic number } int n = 0; while (!adapter.isListening()) { try { - Thread.sleep(100); + Thread.sleep(100); // NOSONAR magic number } catch (InterruptedException e1) { Thread.currentThread().interrupt(); @@ -114,10 +114,10 @@ public final class TestingUtilities { Long delay = delayArg; if (delay == null) { - delay = 100L; + delay = 100L; // NOSONAR magic number } else { - delay = delay / 100; + delay = delay / 100; // NOSONAR magic number } int n = 0; while (serverConnectionFactory.isListening()) { @@ -128,7 +128,7 @@ public final class TestingUtilities { Thread.currentThread().interrupt(); throw new IllegalStateException(e); } - if (n++ > 200) { + if (n++ > 200) { // NOSONAR magic number throw new IllegalStateException("Server didn't stop listening."); } } @@ -146,12 +146,12 @@ public final class TestingUtilities { throws InterruptedException { int timer = 0; - while (timer < 10000) { + while (timer < 10000) { // NOSONAR magic number if (factory.getOpenConnectionIds().size() == n) { return; } - Thread.sleep(100); - timer += 100; + Thread.sleep(100); // NOSONAR magic number + timer += 100; // NOSONAR magic number } throw new IllegalStateException("Connections=" + factory.getOpenConnectionIds().size() + "wanted=" + n); } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStore.java index 18c0956fa0..bb4a063524 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStore.java @@ -168,9 +168,9 @@ public class JdbcMetadataStore implements ConcurrentMetadataStore, InitializingB ps -> { ps.setString(1, key); ps.setString(2, value); - ps.setString(3, this.region); - ps.setString(4, key); - ps.setString(5, this.region); + ps.setString(3, this.region); // NOSONAR magic number + ps.setString(4, key); // NOSONAR magic number + ps.setString(5, this.region); // NOSONAR magic number }); } catch (DuplicateKeyException ex) { @@ -188,8 +188,8 @@ public class JdbcMetadataStore implements ConcurrentMetadataStore, InitializingB ps -> { ps.setString(1, newValue); ps.setString(2, key); - ps.setString(3, oldValue); - ps.setString(4, this.region); + ps.setString(3, oldValue); // NOSONAR magic number + ps.setString(4, this.region); // NOSONAR magic number }); return affectedRows > 0; } @@ -217,7 +217,7 @@ public class JdbcMetadataStore implements ConcurrentMetadataStore, InitializingB ps -> { ps.setString(1, value); ps.setString(2, key); - ps.setString(3, this.region); + ps.setString(3, this.region); // NOSONAR magic number }); } return; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStorePreparedStatementSetter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStorePreparedStatementSetter.java index 197f2afb82..d98bc13f4f 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStorePreparedStatementSetter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStorePreparedStatementSetter.java @@ -112,21 +112,21 @@ public class ChannelMessageStorePreparedStatementSetter { preparedStatement.setString(1, messageId); preparedStatement.setString(2, groupKey); - preparedStatement.setString(3, region); - preparedStatement.setLong(4, createdDate); + preparedStatement.setString(3, region); // NOSONAR magic number + preparedStatement.setLong(4, createdDate); // NOSONAR magic number Integer priority = requestMessage.getHeaders().get(IntegrationMessageHeaderAccessor.PRIORITY, Integer.class); if (priorityEnabled && priority != null) { - preparedStatement.setInt(5, priority); + preparedStatement.setInt(5, priority); // NOSONAR magic number } else { - preparedStatement.setNull(5, Types.NUMERIC); + preparedStatement.setNull(5, Types.NUMERIC); // NOSONAR magic number } if (this.serializer != null) { byte[] messageBytes = this.serializer.convert(requestMessage); - this.lobHandler.getLobCreator().setBlobAsBytes(preparedStatement, 6, messageBytes); + this.lobHandler.getLobCreator().setBlobAsBytes(preparedStatement, 6, messageBytes); // NOSONAR magic number } } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DynamicJmsTemplate.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DynamicJmsTemplate.java index e4866d0e81..6435086926 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DynamicJmsTemplate.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DynamicJmsTemplate.java @@ -61,7 +61,7 @@ public class DynamicJmsTemplate extends JmsTemplate { if (priority == null) { return super.getPriority(); } - Assert.isTrue(priority >= 0 && priority <= 9, "JMS priority must be in the range of 0-9"); + Assert.isTrue(priority >= 0 && priority <= 9, "JMS priority must be in the range of 0-9"); // NOSONAR magic number return priority; } diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java index 965bdfd826..d9c12cc9a6 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java @@ -93,7 +93,7 @@ public class RedisChannelPriorityMessageStore extends RedisChannelMessageStore Assert.isInstanceOf(String.class, groupId); String key = (String) groupId; Integer priority = new IntegrationMessageHeaderAccessor(message).getPriority(); - if (priority != null && priority < 10 && priority >= 0) { + if (priority != null && priority < 10 && priority >= 0) { // NOSONAR magic number key = key + ":" + priority; } return super.addMessageToGroup(key, message); diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java index 202502a918..76ec16ccbb 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java @@ -374,7 +374,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl int result = 1; result = prime * result + getOuterType().hashCode(); result = prime * result + ((this.lockKey == null) ? 0 : this.lockKey.hashCode()); - result = prime * result + (int) (this.lockedAt ^ (this.lockedAt >>> 32)); + result = prime * result + (int) (this.lockedAt ^ (this.lockedAt >>> 32)); // NOSONAR magic number result = prime * result + RedisLockRegistry.this.clientId.hashCode(); return result; } diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilter.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilter.java index 1b250bc2a8..9c1ccd5cc9 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilter.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilter.java @@ -39,7 +39,7 @@ public class SftpPersistentAcceptOnceFileListFilter extends AbstractPersistentAc @Override protected long modified(LsEntry file) { - return ((long) file.getAttrs().getMTime()) * 1000; + return ((long) file.getAttrs().getMTime()) * 1000; // NOSONAR magic number } @Override diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java index e92ba0e4fb..4aed4ae9a7 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java @@ -133,7 +133,7 @@ public class SftpOutboundGateway extends AbstractRemoteFileOutboundGateway, Share private String host; - private int port = 22; // the default + private int port = 22; // NOSONAR magic number. The default private String user; @@ -419,7 +419,7 @@ public class DefaultSftpSessionFactory implements SessionFactory, Share "either a password or a private key is required"); if (this.port <= 0) { - this.port = 22; + this.port = 22; // NOSONAR magic number } if (this.knownHosts != null) { this.jsch.setKnownHosts(this.knownHosts.getInputStream()); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java index 5d43e44914..02c5de1ab5 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java @@ -70,7 +70,7 @@ public class SftpFileInfo extends AbstractFileInfo { */ @Override public long getModified() { - return ((long) this.attrs.getMTime()) * 1000; + return ((long) this.attrs.getMTime()) * 1000; // NOSONAR magic number } /** diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java index 89181d7506..b5a15f814e 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java @@ -33,7 +33,7 @@ public class ByteStreamReadingMessageSource extends AbstractMessageSource> 3; + int severity = pri & 0x7; // NOSONAR magic number + int facility = pri >> 3; // NOSONAR magic number map.put(SyslogHeaders.FACILITY, facility); map.put(SyslogHeaders.SEVERITY, severity); map.put(SyslogHeaders.SEVERITY_TEXT, Severity.parseInt(severity).label()); @@ -239,7 +239,7 @@ public class RFC5424SyslogParser { public int readInt() { int val = 0; while (isDigit()) { - val = (val * 10) + getInt(); + val = (val * 10) + getInt(); // NOSONAR magic number } return val; } @@ -248,8 +248,8 @@ public class RFC5424SyslogParser { int val = 0; int order = 0; while (isDigit()) { - val = (val * 10) + getInt(); - order *= 10; + val = (val * 10) + getInt(); // NOSONAR magic number + order *= 10; // NOSONAR magic number } return (double) val / order; @@ -289,7 +289,7 @@ public class RFC5424SyslogParser { int c; while (true) { c = getc(); - if (c >= 33 && c <= 127) { + if (c >= 33 && c <= 127) { // NOSONAR magic number sb.append((char) c); } else { @@ -339,19 +339,19 @@ public class RFC5424SyslogParser { } public static Severity parseInt(int syslogSeverity) { - if (syslogSeverity == 7) { + if (syslogSeverity == 7) { // NOSONAR magic number return DEBUG; } - if (syslogSeverity == 6) { + if (syslogSeverity == 6) { // NOSONAR magic number return INFO; } - if (syslogSeverity == 5) { + if (syslogSeverity == 5) { // NOSONAR magic number return NOTICE; } - if (syslogSeverity == 4) { + if (syslogSeverity == 4) { // NOSONAR magic number return WARN; } - if (syslogSeverity == 3) { + if (syslogSeverity == 3) { // NOSONAR magic number return ERROR; } if (syslogSeverity == 2) { diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java index 71b6387997..49925bbec2 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java @@ -101,14 +101,14 @@ public class RFC6587SyslogDeserializer implements Deserializer> { } private boolean isDigit(int peek) { - return peek >= 0x30 && peek <= 0x39; + return peek >= 0x30 && peek <= 0x39; // NOSONAR magic number } private int calculateLength(DataInputStream stream, int peek) throws IOException { - int length = peek & 0xf; + int length = peek & 0xf; // NOSONAR magic number int c = stream.read(); while (isDigit(c)) { - length = length * 10 + (c & 0xf); + length = length * 10 + (c & 0xf); // NOSONAR magic number c = stream.read(); } return length; diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java index fe8f65ba93..f00016d535 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java @@ -83,7 +83,7 @@ public abstract class AbstractRequestResponseScenarioTests { .as(name + ": message not sent on " + scenario.getInputChannelName()).isTrue(); if (outputChannel instanceof PollableChannel) { - Message response = ((PollableChannel) outputChannel).receive(10000); + Message response = ((PollableChannel) outputChannel).receive(10000); // NOSONAR magic number assertThat(response).as(name + ": receive timeout on " + scenario.getOutputChannelName()).isNotNull(); scenario.getResponseValidator().handleMessage(response); } diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java index b720e31d50..a0a9c4ca9b 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java @@ -61,7 +61,7 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean