From 61153578c5cf6ab11235ff92f850271ee02fc6e3 Mon Sep 17 00:00:00 2001 From: trungPa Date: Tue, 27 Jul 2021 22:24:14 +0700 Subject: [PATCH] GH-3549: Clean up more SonarQube smells Fixes https://github.com/spring-projects/spring-integration/issues/3549 --- .../ip/tcp/connection/AbstractConnectionFactory.java | 4 ++-- .../integration/ip/udp/UnicastSendingMessageHandler.java | 2 +- .../integration/jdbc/store/JdbcMessageStore.java | 2 +- .../integration/stomp/AbstractStompSessionManager.java | 2 +- .../springframework/integration/test/mail/TestMailServer.java | 2 +- .../integration/test/util/OnlyOnceTrigger.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java index 409eea4e5e..ebaefa7255 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java @@ -573,10 +573,10 @@ public abstract class AbstractConnectionFactory extends IntegrationObjectSupport ExecutorService executorService = (ExecutorService) this.taskExecutor; executorService.shutdown(); try { - if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { + if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { // NOSONAR magic number logger.debug("Forcing executor shutdown"); executorService.shutdownNow(); - if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { + if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { // NOSONAR magic number logger.debug("Executor failed to shutdown"); } } 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 2ede34f675..a654784fe5 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 @@ -326,7 +326,7 @@ public class UnicastSendingMessageHandler extends this.ackLatch = new CountDownLatch(1); this.taskExecutor.execute(this); try { - this.ackLatch.await(10000, TimeUnit.MILLISECONDS); + this.ackLatch.await(10000, TimeUnit.MILLISECONDS); // NOSONAR magic number } catch (@SuppressWarnings("unused") InterruptedException e) { Thread.currentThread().interrupt(); diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java index b0f97a1373..afe3745505 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java @@ -347,7 +347,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa } this.jdbcTemplate.batchUpdate(getQuery(Query.CREATE_GROUP_TO_MESSAGE), Arrays.asList(messages), - 100, + 100, // NOSONAR magic number (ps, messageToAdd) -> { String messageId = getKey(messageToAdd.getHeaders().getId()); if (logger.isDebugEnabled()) { diff --git a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java index 8aa7b52a76..04d6c79297 100644 --- a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java +++ b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java @@ -201,7 +201,7 @@ public abstract class AbstractStompSessionManager implements StompSessionManager CountDownLatch connectLatch = addStompSessionCallback(currentEpoch); try { - if (!connectLatch.await(30, TimeUnit.SECONDS)) { + if (!connectLatch.await(30, TimeUnit.SECONDS)) { // NOSONAR magic number this.logger.error("No response to connection attempt"); if (currentEpoch == this.epoch.get()) { scheduleReconnect(null); diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/mail/TestMailServer.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/mail/TestMailServer.java index b57efdbe98..359ef43260 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/mail/TestMailServer.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/mail/TestMailServer.java @@ -394,7 +394,7 @@ public final class TestMailServer { LOGGER.error(IO_EXCEPTION, e); } } - } + } // NOSONAR void searchReply(String tag) throws IOException { if (seen) { diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java index e60b65407d..06bbe33deb 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java @@ -86,7 +86,7 @@ public class OnlyOnceTrigger implements Trigger { public void await() { try { - if (!this.latch.await(10000, TimeUnit.MILLISECONDS)) { + if (!this.latch.await(10000, TimeUnit.MILLISECONDS)) { // NOSONAR magic number throw new IllegalStateException("test latch.await() did not count down"); } }