Ericsson#699 Reload nodes

paulchandler · Oct 21, 2024 · 1cb0609 · 1cb0609
1 parent a44fe4a
commit 1cb0609
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 27 deletions.
diff --git a/...ericsson/bss/cassandra/ecchronos/application/providers/AgentNativeConnectionProvider.java b/...ericsson/bss/cassandra/ecchronos/application/providers/AgentNativeConnectionProvider.java
@@ -311,20 +311,24 @@ public void close() throws IOException
      * @param myNode
      */
     @Override
-    public void addNode(Node myNode)
+    public void addNode(final Node myNode)
     {
         myDistributedNativeConnectionProviderImpl.addNode(myNode);
     }
     /**
      * Remove node for the list of nodes.
-     * @param node
+     * @param myNode
      */
     @Override
-    public void removeNode(Node myNode)
+    public void removeNode(final Node myNode)
     {
         myDistributedNativeConnectionProviderImpl.removeNode(myNode);
     }
 
+    /**
+     * getter for the NodeStateListener.
+     * @return
+     */
     public EccNodeStateListener getNodeStateListener()
     {
         return myNodeStateListener;

diff --git a/...in/java/com/ericsson/bss/cassandra/ecchronos/application/spring/EccNodeStateListener.java b/...in/java/com/ericsson/bss/cassandra/ecchronos/application/spring/EccNodeStateListener.java
@@ -28,7 +28,7 @@
 
 public class EccNodeStateListener implements NodeStateListener
 {
-    private final Integer NO_OF_THREADS= 4;
+    private static Integer NO_OF_THREADS = 4;
     private EccNodesSync myEccNodesSync;
     private DistributedJmxConnectionProvider myJmxConnectionProvider;
     private ExecutorService service;
@@ -44,7 +44,7 @@ public EccNodeStateListener()
      * @param node
      */
     @Override
-    public void onAdd(Node node)
+    public void onAdd(final Node node)
     {
 
         LOG.info("Node added {}", node.getHostId());
@@ -58,7 +58,7 @@ public void onAdd(Node node)
      * @param node
      */
     @Override
-    public void onUp(Node node)
+    public void onUp(final Node node)
     {
         LOG.info("Node up {}", node.getHostId());
     }
@@ -68,7 +68,7 @@ public void onUp(Node node)
      * @param node
      */
     @Override
-    public void onDown(Node node)
+    public void onDown(final Node node)
     {
         LOG.info("Node Down {}", node.getHostId());
     }
@@ -78,10 +78,10 @@ public void onDown(Node node)
      * @param node
      */
     @Override
-    public void onRemove(Node node)
+    public void onRemove(final Node node)
     {
         LOG.info("Node removed {}", node.getHostId());
-        NodeRemovedAction callable = new NodeRemovedAction(myEccNodesSync, myJmxConnectionProvider, myAgentNativeConnectionProvider, node );
+        NodeRemovedAction callable = new NodeRemovedAction(myEccNodesSync, myJmxConnectionProvider, myAgentNativeConnectionProvider, node);
         service.submit(callable);
     }
 
@@ -94,7 +94,7 @@ public void close() throws Exception
      * jmxConnectionProvider setter.
      * @param myJmxConnectionProvider
      */
-    public void setJmxConnectionProvider(DistributedJmxConnectionProvider myJmxConnectionProvider)
+    public void setJmxConnectionProvider(final DistributedJmxConnectionProvider myJmxConnectionProvider)
     {
         this.myJmxConnectionProvider = myJmxConnectionProvider;
     }
@@ -104,7 +104,7 @@ public void setJmxConnectionProvider(DistributedJmxConnectionProvider myJmxConne
      * @param myAgentNativeConnectionProvider
      */
 
-    public void setAgentNativeConnectionProvider(AgentNativeConnectionProvider myAgentNativeConnectionProvider)
+    public void setAgentNativeConnectionProvider(final AgentNativeConnectionProvider myAgentNativeConnectionProvider)
     {
         this.myAgentNativeConnectionProvider = myAgentNativeConnectionProvider;
     }
@@ -113,7 +113,8 @@ public void setAgentNativeConnectionProvider(AgentNativeConnectionProvider myAge
      * eccNodesSync setter.
      * @param eccNodesSync
      */
-    public void setEccNodesSync(EccNodesSync eccNodesSync) {
+    public void setEccNodesSync(final EccNodesSync eccNodesSync)
+    {
         this.myEccNodesSync = eccNodesSync;
     }
 

diff --git a/...rc/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/NodeAddedAction.java b/...rc/main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/NodeAddedAction.java
@@ -19,18 +19,14 @@
 import com.ericsson.bss.cassandra.ecchronos.data.sync.EccNodesSync;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Async;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
 import com.datastax.oss.driver.api.core.metadata.Node;
 
 
-public class NodeAddedAction implements Callable<Boolean> {
-
-
+public class NodeAddedAction implements Callable<Boolean>
+{
     private static final Logger LOG = LoggerFactory.getLogger(com.ericsson.bss.cassandra.ecchronos.application.spring.NodeAddedAction.class);
 
     private final EccNodesSync myEccNodesSync;
@@ -41,15 +37,18 @@ public class NodeAddedAction implements Callable<Boolean> {
     private final Node myNode;
 
 
-    public NodeAddedAction(EccNodesSync eccNodesSync, DistributedJmxConnectionProvider jmxConnectionProvider, DistributedNativeConnectionProvider distributedNativeConnectionProvider, Node node)
+    public NodeAddedAction(final EccNodesSync eccNodesSync, final DistributedJmxConnectionProvider jmxConnectionProvider, final DistributedNativeConnectionProvider distributedNativeConnectionProvider, final Node node)
     {
         myEccNodesSync = eccNodesSync;
         myJmxConnectionProvider = jmxConnectionProvider;
         myDistributedNativeConnectionProvider = distributedNativeConnectionProvider;
         myNode = node;
     }
 
-
+    /**
+     * Adds the node.
+     * @return
+     */
     @Override
     public Boolean call()
     {

diff --git a/.../main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/NodeRemovedAction.java b/.../main/java/com/ericsson/bss/cassandra/ecchronos/application/spring/NodeRemovedAction.java
@@ -19,26 +19,23 @@
 import com.ericsson.bss.cassandra.ecchronos.data.sync.EccNodesSync;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Async;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
 import com.datastax.oss.driver.api.core.metadata.Node;
 
 
-public class NodeRemovedAction implements Callable<Boolean> {
-
-
+public class NodeRemovedAction implements Callable<Boolean>
+{
     private static final Logger LOG = LoggerFactory.getLogger(NodeRemovedAction.class);
 
     private final EccNodesSync myEccNodesSync;
     private final DistributedJmxConnectionProvider myJmxConnectionProvider;
     private final DistributedNativeConnectionProvider myDistributedNativeConnectionProvider;
     private final Node myNode;
 
-    public NodeRemovedAction(EccNodesSync eccNodesSync, DistributedJmxConnectionProvider jmxConnectionProvider,DistributedNativeConnectionProvider distributedNativeConnectionProvider, Node node)
+    public NodeRemovedAction(final EccNodesSync eccNodesSync, final DistributedJmxConnectionProvider jmxConnectionProvider, final DistributedNativeConnectionProvider distributedNativeConnectionProvider, final Node node)
     {
         myEccNodesSync = eccNodesSync;
         myJmxConnectionProvider = jmxConnectionProvider;
@@ -47,6 +44,10 @@ public NodeRemovedAction(EccNodesSync eccNodesSync, DistributedJmxConnectionProv
 
     }
 
+    /**
+     * Removes the node.
+     * @return
+     */
     @Override
     public Boolean call()
     {
@@ -71,4 +72,4 @@ public Boolean call()
         myDistributedNativeConnectionProvider.setNodes(list);
         return result;
     }
-}
+}