Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

rename the NodeEventType to NodeEventTypeEnum

Browse Source
This commit is contained in:
DigitalSonic
2020-01-22 16:51:16 +08:00
parent 82adaad442
commit e03511cdaa
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/ha/node/NodeEvent.java
+6 -6
View File
@@ -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<NodeEvent> list = new ArrayList<NodeEvent>();
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<NodeEvent> generateEvents(Properties properties, List<String> names, NodeEventType type) {
private static List<NodeEvent> generateEvents(Properties properties, List<String> names, NodeEventTypeEnum type) {
List<NodeEvent> list = new ArrayList<NodeEvent>();
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;
}
src/main/java/com/alibaba/druid/pool/ha/node/NodeEventType.java → src/main/java/com/alibaba/druid/pool/ha/node/NodeEventTypeEnum.java
+1 -1
View File
@@ -20,6 +20,6 @@ package com.alibaba.druid.pool.ha.node;
*
* @author DigitalSonic
*/
public enum NodeEventType {
public enum NodeEventTypeEnum {
ADD, DELETE
}
src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java
+2 -2
View File
@@ -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);
}
}
src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java
+2 -3
View File
@@ -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());
}
src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java
+2 -2
View File
@@ -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());
src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java
+5 -6
View File
@@ -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);
}
}