From 50a98f3cfd5429b5fda5d73183c857a75c3b2a78 Mon Sep 17 00:00:00 2001 From: sajid riaz Date: Thu, 5 Sep 2024 09:31:01 +0200 Subject: [PATCH] increased checkstyle line length --- .../application/spring/BeanConfigurator.java | 4 ++-- .../spring/RetrySchedulerService.java | 22 ++++++++++++------- check_style.xml | 2 +- .../impl/builders/DistributedJmxBuilder.java | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/BeanConfigurator.java b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/BeanConfigurator.java index d40401fd2..d0a8ef5d5 100644 --- a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/BeanConfigurator.java +++ b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/BeanConfigurator.java @@ -212,9 +212,9 @@ public DistributedJmxConnectionProvider distributedJmxConnectionProvider( public RetrySchedulerService retrySchedulerService(final Config config, final DistributedJmxConnectionProvider jmxConnectionProvider, final EccNodesSync eccNodesSync, - final DistributedNativeConnectionProvider distributedNativeConnectionProvider) + final DistributedNativeConnectionProvider nativeConnectionProvider) { - return new RetrySchedulerService(eccNodesSync, config, jmxConnectionProvider, distributedNativeConnectionProvider); + return new RetrySchedulerService(eccNodesSync, config, jmxConnectionProvider, nativeConnectionProvider); } private Security getSecurityConfig() throws ConfigurationException diff --git a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/RetrySchedulerService.java b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/RetrySchedulerService.java index 5aab6fbc6..44eb29aeb 100644 --- a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/RetrySchedulerService.java +++ b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/RetrySchedulerService.java @@ -32,7 +32,11 @@ import javax.management.remote.JMXConnector; import java.io.IOException; -import java.util.*; +import java.util.Map; +import java.util.List; +import java.util.Objects; +import java.util.UUID; +import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -61,10 +65,11 @@ public final class RetrySchedulerService implements DisposableBean { private static final Logger LOG = LoggerFactory.getLogger(RetrySchedulerService.class); - private static final String COLUMN_DC_NAME = "datacenter_name"; private static final String COLUMN_NODE_ID = "node_id"; - private static final String COLUMN_NODE_ENDPOINT = "node_endpoint"; private static final String COLUMN_NODE_STATUS = "node_status"; + private static final int PERCENTAGE_OF_DELAY = 10; + private static final int MINIMUM_DELAY_LIMIT_MS = 5000; + private static final int SCHEDULER_AWAIT_TERMINATION = 60; private final EccNodesSync myEccNodesSync; private final DistributedJmxConnectionProvider myJmxConnectionProvider; private final DistributedNativeConnectionProvider myDistributedNativeConnectionProvider; @@ -143,7 +148,7 @@ public void retryNodes() long nextRetryTime = retryAttempt.lastAttemptTime() + delayMillis; // Buffer to handle execution delays, minimum of 5000 ms or 10% of delay - long retryBufferMillis = Math.max(delayMillis / 10, 5000); + long retryBufferMillis = Math.max(delayMillis / PERCENTAGE_OF_DELAY, MINIMUM_DELAY_LIMIT_MS); if (currentTime >= (nextRetryTime - retryBufferMillis)) { @@ -194,11 +199,11 @@ public void destroy() myScheduler.shutdown(); try { - if (!myScheduler.awaitTermination(60, TimeUnit.SECONDS)) + if (!myScheduler.awaitTermination(SCHEDULER_AWAIT_TERMINATION, TimeUnit.SECONDS)) { LOG.warn("Scheduler did not terminate within the timeout. Attempting to force shutdown..."); myScheduler.shutdownNow(); - if (!myScheduler.awaitTermination(60, TimeUnit.SECONDS)) + if (!myScheduler.awaitTermination(SCHEDULER_AWAIT_TERMINATION, TimeUnit.SECONDS)) { LOG.error("Scheduler did not terminate after force shutdown."); } @@ -225,7 +230,7 @@ ScheduledExecutorService getMyScheduler() return myScheduler; } - private long calculateDelay(int attempt) + private long calculateDelay(final int attempt) { long baseDelay = myRetryPolicyConfig.getDelay(); long calculatedDelay = baseDelay * (attempt + 1) * 2; @@ -267,6 +272,7 @@ private boolean isConnected(final JMXConnector jmxConnector) } // Helper class to track retry attempts and last attempt time - record RetryAttempt(int attempt, long lastAttemptTime) { + record RetryAttempt(int attempt, long lastAttemptTime) + { } } diff --git a/check_style.xml b/check_style.xml index c6cd70e7e..7ea324ee1 100644 --- a/check_style.xml +++ b/check_style.xml @@ -61,7 +61,7 @@ - + diff --git a/connection.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/connection/impl/builders/DistributedJmxBuilder.java b/connection.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/connection/impl/builders/DistributedJmxBuilder.java index 2089c91cb..948d2395d 100644 --- a/connection.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/connection/impl/builders/DistributedJmxBuilder.java +++ b/connection.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/connection/impl/builders/DistributedJmxBuilder.java @@ -245,7 +245,7 @@ private Integer getJMXPort(final Node node) .builder("SELECT value FROM system_views.system_properties WHERE name = 'cassandra.jmx.remote.port';") .setNode(node) .build(); - Row row = null;// mySession.execute(simpleStatement).one(); + Row row = mySession.execute(simpleStatement).one(); if (row != null) { return Integer.parseInt(Objects.requireNonNull(row.getString("value")));