Added findSourceNodesFor() and findTargetNodesFor

JumpMind · Oct 4, 2007 · ea3f1cf · ea3f1cf
1 parent 3883221
commit ea3f1cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/INodeService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/INodeService.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.jumpmind.symmetric.model.DataEventAction;
 import org.jumpmind.symmetric.model.Node;
 import org.jumpmind.symmetric.model.NodeSecurity;
 
@@ -19,6 +20,10 @@ public interface INodeService {
 
     public List<Node> findNodesToPushTo();
 
+    public List<Node> findSourceNodesFor(DataEventAction eventAction);
+
+    public List<Node> findTargetNodesFor(DataEventAction eventAction);
+
     public boolean updateNode(Node node);
 
 }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -87,22 +87,31 @@ public Node findIdentity() {
         return (Node) getFirstEntry(list);
     }
 
-    @SuppressWarnings("unchecked")
     public List<Node> findNodesToPull() {
+        return findSourceNodesFor(DataEventAction.WAIT_FOR_POLL);
+    }
+
+    public List<Node> findNodesToPushTo() {
+        return findTargetNodesFor(DataEventAction.PUSH);
+    }
+
+    @SuppressWarnings("unchecked")
+    public List<Node> findSourceNodesFor(DataEventAction eventAction) {
         Node node = findIdentity();
         return jdbcTemplate.query(findNodesWhoTargetMeSql, new Object[] {
-                node.getNodeGroupId(), DataEventAction.WAIT_FOR_POLL.getCode() },
+                node.getNodeGroupId(), eventAction.getCode() },
                 new NodeRowMapper());
     }
-
+    
     @SuppressWarnings("unchecked")
-    public List<Node> findNodesToPushTo() {
+    public List<Node> findTargetNodesFor(DataEventAction eventAction) {
         Node node = findIdentity();
         return jdbcTemplate.query(findNodesWhoITargetSql, new Object[] {
-                node.getNodeGroupId(), DataEventAction.PUSH.getCode() },
+                node.getNodeGroupId(), eventAction.getCode() },
                 new NodeRowMapper());
     }
 
+
     class NodeRowMapper implements RowMapper {
         public Object mapRow(ResultSet rs, int num) throws SQLException {
             Node node = new Node();