simplify agent manager

Author: Yang Guo

platform-agent/src/main/java/com/flow/platform/agent/AgentManager.java

@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.ChildData;
@@ -40,41 +41,25 @@ public class AgentManager implements Runnable, TreeCacheListener, AutoCloseable
     private final static Object STATUS_LOCKER = new Object();
 
     private final static int ZK_RECONNECT_TIME = 1;
-    private final static int ZK_RETRY_PERIOD = 500;
 
-    private String zkHost;
-    private int zkTimeout;
-    private ZKClient zkClient;
+    private final static int ZK_RETRY_PERIOD = 500;
 
-    private String zone; // agent running zone
-    private String name; // agent name, can be machine name
+    @Getter
+    private final ZKClient zkClient;
 
-    private String zonePath;    // zone path, /flow-agents/{zone}
-    private String nodePath;    // zk node path, /flow-agents/{zone}/{name}
+    @Getter
+    private final String zonePath;    // zone path, /flow-agents/{zone}
 
-    private List<Cmd> cmdHistory = new LinkedList<>();
+    @Getter
+    private final String nodePath;    // zk node path, /flow-agents/{zone}/{name}
 
-    public AgentManager(String zkHost, int zkTimeout, String zone, String name) throws IOException {
-        this.zkHost = zkHost;
-        this.zkTimeout = zkTimeout;
+    @Getter
+    private final List<Cmd> cmdHistory = new LinkedList<>();
 
+    public AgentManager(String zkHost, int zkTimeout, String zone, String name) {
         this.zkClient = new ZKClient(zkHost, ZK_RETRY_PERIOD, ZK_RECONNECT_TIME);
-        this.zone = zone;
-        this.name = name;
-        this.zonePath = ZKPaths.makePath(Config.ZK_ROOT, this.zone);
-        this.nodePath = ZKPaths.makePath(this.zonePath, this.name);
-    }
-
-    public ZKClient getZkClient() {
-        return zkClient;
-    }
-
-    public String getNodePath() {
-        return nodePath;
-    }
-
-    public List<Cmd> getCmdHistory() {
-        return cmdHistory;
+        this.zonePath = ZKPaths.makePath(Config.ZK_ROOT, zone);
+        this.nodePath = ZKPaths.makePath(this.zonePath, name);
     }
 
     /**
@@ -108,38 +93,21 @@ private void exit() {
     }
 
     @Override
-    public void childEvent(CuratorFramework client, TreeCacheEvent event) throws Exception {
+    public void childEvent(CuratorFramework client, TreeCacheEvent event) {
         ChildData eventData = event.getData();
+        log.trace("========= Event: {} =========", event.getType());
 
         if (event.getType() == Type.CONNECTION_RECONNECTED) {
-            log.trace("========= Reconnect =========");
             registerZkNodeAndWatch();
             return;
         }
 
-        if (event.getType() == Type.CONNECTION_LOST) {
-            log.trace("========= Lost =========");
-            return;
-        }
-
-        if (event.getType() == Type.INITIALIZED) {
-            log.trace("========= Initialized =========");
-            return;
-        }
-
-        if (event.getType() == Type.NODE_ADDED) {
-            log.trace("========= Node Added: {} =========", eventData.getPath());
-            return;
-        }
-
         if (event.getType() == Type.NODE_UPDATED) {
-            log.trace("========= Node Updated: {} =========", eventData.getPath());
             onDataChanged(eventData.getPath());
             return;
         }
 
         if (event.getType() == Type.NODE_REMOVED) {
-            log.trace("========= Node Removed: {} =========", eventData.getPath());
             close();
         }
     }

platform-agent/src/test/java/com/flow/platform/agent/test/AgentManagerTest.java

@@ -21,15 +21,8 @@
 import com.flow.platform.domain.Cmd;
 import com.flow.platform.domain.CmdType;
 import com.flow.platform.util.zk.ZKClient;
-import com.flow.platform.util.zk.ZkException;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.curator.test.TestingServer;
 import org.apache.curator.utils.ZKPaths;
-import org.apache.zookeeper.ZKUtil;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -89,13 +82,13 @@ public void should_agent_registered() throws Throwable {
     public void should_receive_command() throws Throwable {
         AgentManager agent = new AgentManager(server.getConnectString(), 20000, ZONE, MACHINE);
         new Thread(agent).start();
-        Thread.sleep(5000); // waitting for node created
+        Thread.sleep(5000); // waiting for node created
 
         // when: send command to agent
         Cmd cmd = new Cmd(ZONE, MACHINE, CmdType.RUN_SHELL, "echo hello");
         cmd.setId("mock-cmd-id");
         zkClient.setData(agent.getNodePath(), cmd.toBytes());
-        Thread.sleep(2000); // waitting for cmd recieved
+        Thread.sleep(2000); // waiting for cmd received
 
         // then: check agent status when command received
         Assert.assertEquals(1, agent.getCmdHistory().size());