From e03511cdaaf2fde085e044bf8e1e38b169dad753 Mon Sep 17 00:00:00 2001 From: DigitalSonic Date: Wed, 22 Jan 2020 16:51:16 +0800 Subject: [PATCH] rename the NodeEventType to NodeEventTypeEnum --- .../com/alibaba/druid/pool/ha/node/NodeEvent.java | 12 ++++++------ .../{NodeEventType.java => NodeEventTypeEnum.java} | 2 +- .../com/alibaba/druid/pool/ha/node/PoolUpdater.java | 4 ++-- .../druid/pool/ha/node/FileNodeListenerTest.java | 5 ++--- .../alibaba/druid/pool/ha/node/NodeEventTest.java | 4 ++-- .../alibaba/druid/pool/ha/node/PoolUpdaterTest.java | 11 +++++------ 6 files changed, 18 insertions(+), 20 deletions(-) rename src/main/java/com/alibaba/druid/pool/ha/node/{NodeEventType.java => NodeEventTypeEnum.java} (95%) diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/NodeEvent.java b/src/main/java/com/alibaba/druid/pool/ha/node/NodeEvent.java index eaac382bf1..78edb08e65 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/NodeEvent.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/NodeEvent.java @@ -27,7 +27,7 @@ import java.util.Properties; * @author DigitalSonic */ public class NodeEvent { - private NodeEventType type; + private NodeEventTypeEnum type; private String nodeName; private String url; private String username; @@ -56,13 +56,13 @@ public class NodeEvent { } List list = new ArrayList(); - list.addAll(generateEvents(next, namesToAdd, NodeEventType.ADD)); - list.addAll(generateEvents(previous, namesToDel, NodeEventType.DELETE)); + list.addAll(generateEvents(next, namesToAdd, NodeEventTypeEnum.ADD)); + list.addAll(generateEvents(previous, namesToDel, NodeEventTypeEnum.DELETE)); return list; } - private static List generateEvents(Properties properties, List names, NodeEventType type) { + private static List generateEvents(Properties properties, List names, NodeEventTypeEnum type) { List list = new ArrayList(); for (String n : names) { NodeEvent event = new NodeEvent(); @@ -76,11 +76,11 @@ public class NodeEvent { return list; } - public NodeEventType getType() { + public NodeEventTypeEnum getType() { return type; } - public void setType(NodeEventType type) { + public void setType(NodeEventTypeEnum type) { this.type = type; } diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/NodeEventType.java b/src/main/java/com/alibaba/druid/pool/ha/node/NodeEventTypeEnum.java similarity index 95% rename from src/main/java/com/alibaba/druid/pool/ha/node/NodeEventType.java rename to src/main/java/com/alibaba/druid/pool/ha/node/NodeEventTypeEnum.java index 078d1f45a6..a8bab281e3 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/NodeEventType.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/NodeEventTypeEnum.java @@ -20,6 +20,6 @@ package com.alibaba.druid.pool.ha.node; * * @author DigitalSonic */ -public enum NodeEventType { +public enum NodeEventTypeEnum { ADD, DELETE } diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java b/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java index dde3946929..80c79670ea 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java @@ -86,9 +86,9 @@ public class PoolUpdater implements Observer { lock.lock(); LOG.info("Start processing the NodeEvent[" + events.length + "]."); for (NodeEvent e : events) { - if (e.getType() == NodeEventType.ADD) { + if (e.getType() == NodeEventTypeEnum.ADD) { addNode(e); - } else if (e.getType() == NodeEventType.DELETE) { + } else if (e.getType() == NodeEventTypeEnum.DELETE) { deleteNode(e); } } diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java index cc9decf9dd..5a9c7e6a9d 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.pool.ha.node; import org.junit.Test; -import sun.java2d.SurfaceDataProxy; import java.util.List; import java.util.Observable; @@ -28,7 +27,7 @@ public class FileNodeListenerTest { assertTrue(arg instanceof NodeEvent[]); NodeEvent[] events = (NodeEvent[]) arg; assertEquals(1, events.length); - assertEquals(NodeEventType.ADD, events[0].getType()); + assertEquals(NodeEventTypeEnum.ADD, events[0].getType()); assertEquals("prefix1.foo", events[0].getNodeName()); assertEquals("jdbc:derby:memory:foo1;create=true", events[0].getUrl()); } @@ -64,7 +63,7 @@ public class FileNodeListenerTest { assertEquals(1, list.size()); NodeEvent event = list.get(0); - assertEquals(NodeEventType.ADD, event.getType()); + assertEquals(NodeEventTypeEnum.ADD, event.getType()); assertEquals("prefix1.foo", event.getNodeName()); assertEquals("jdbc:derby:memory:foo1;create=true", event.getUrl()); } diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java index cf61193049..1ad4bf03aa 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java @@ -24,7 +24,7 @@ public class NodeEventTest { list = NodeEvent.getEventListFromProperties(p1, p2); assertEquals(1, list.size()); NodeEvent event = list.get(0); - assertEquals(NodeEventType.DELETE, event.getType()); + assertEquals(NodeEventTypeEnum.DELETE, event.getType()); assertEquals("foo", event.getNodeName()); assertEquals("foo_url", event.getUrl()); assertEquals("foo_username", event.getUsername()); @@ -33,7 +33,7 @@ public class NodeEventTest { list = NodeEvent.getEventListFromProperties(p2, p1); assertEquals(1, list.size()); event = list.get(0); - assertEquals(NodeEventType.ADD, event.getType()); + assertEquals(NodeEventTypeEnum.ADD, event.getType()); assertEquals("foo", event.getNodeName()); assertEquals("foo_url", event.getUrl()); assertEquals("foo_username", event.getUsername()); diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java index 82022e38c4..b41e021923 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import javax.sql.DataSource; import java.util.HashMap; import java.util.Map; -import java.util.Set; import static org.junit.Assert.*; @@ -39,14 +38,14 @@ public class PoolUpdaterTest { NodeEvent event = new NodeEvent(); event.setNodeName("foo"); - event.setType(NodeEventType.DELETE); + event.setType(NodeEventTypeEnum.DELETE); updater.update(new FileNodeListener(), new NodeEvent[] { event }); validateDeleteNode(); event = new NodeEvent(); event.setNodeName("foo"); - event.setType(NodeEventType.ADD); + event.setType(NodeEventTypeEnum.ADD); updater.update(new FileNodeListener(), new NodeEvent[] { event }); assertFalse(updater.getNodesToDel().contains("foo")); assertFalse(haDataSource.isInBlackList("foo")); @@ -115,7 +114,7 @@ public class PoolUpdaterTest { public void testDeleteNode_notExisted() { NodeEvent event = new NodeEvent(); event.setNodeName("foo"); - event.setType(NodeEventType.DELETE); + event.setType(NodeEventTypeEnum.DELETE); updater.deleteNode(event); assertTrue(updater.getNodesToDel().isEmpty()); assertFalse(haDataSource.isInBlackList("foo")); @@ -127,7 +126,7 @@ public class PoolUpdaterTest { NodeEvent event = new NodeEvent(); event.setNodeName("foo"); - event.setType(NodeEventType.DELETE); + event.setType(NodeEventTypeEnum.DELETE); updater.deleteNode(event); validateDeleteNode(); } @@ -142,7 +141,7 @@ public class PoolUpdaterTest { NodeEvent event = new NodeEvent(); event.setNodeName(name); event.setUrl(url); - event.setType(NodeEventType.ADD); + event.setType(NodeEventTypeEnum.ADD); updater.addNode(event); } } \ No newline at end of file