Change the name of the accessor method to match the database.

JumpMind · Nov 14, 2009 · 2d16bd6 · 2d16bd6
1 parent d0eef9f
commit 2d16bd6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/model/NodeGroupLink.java b/symmetric/src/main/java/org/jumpmind/symmetric/model/NodeGroupLink.java
@@ -24,9 +24,9 @@ public class NodeGroupLink {
 
     private static final long serialVersionUID = 1L;
 
-    private String sourceGroupId;
+    private String sourceNodeGroupId;
 
-    private String targetGroupId;
+    private String targetNodeGroupId;
 
     private DataEventAction dataEventAction = DataEventAction.WAIT_FOR_PULL;
 
@@ -38,19 +38,19 @@ public void setDataEventAction(DataEventAction dataEventAction) {
         this.dataEventAction = dataEventAction;
     }
 
-    public String getSourceGroupId() {
-        return sourceGroupId;
+    public String getSourceNodeGroupId() {
+        return sourceNodeGroupId;
     }
 
-    public void setSourceGroupId(String domainName) {
-        this.sourceGroupId = domainName;
+    public void setSourceNodeGroupId(String domainName) {
+        this.sourceNodeGroupId = domainName;
     }
 
-    public String getTargetGroupId() {
-        return targetGroupId;
+    public String getTargetNodeGroupId() {
+        return targetNodeGroupId;
     }
 
-    public void setTargetGroupId(String targetDomainName) {
-        this.targetGroupId = targetDomainName;
+    public void setTargetNodeGroupId(String targetDomainName) {
+        this.targetNodeGroupId = targetDomainName;
     }
 }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
@@ -395,8 +395,8 @@ public NodeGroupChannelWindow mapRow(ResultSet rs, int rowNum) throws SQLExcepti
     class NodeGroupLinkMapper implements RowMapper<NodeGroupLink> {
         public NodeGroupLink mapRow(ResultSet rs, int num) throws SQLException {
             NodeGroupLink node_groupTarget = new NodeGroupLink();
-            node_groupTarget.setSourceGroupId(rs.getString(1));
-            node_groupTarget.setTargetGroupId(rs.getString(2));
+            node_groupTarget.setSourceNodeGroupId(rs.getString(1));
+            node_groupTarget.setTargetNodeGroupId(rs.getString(2));
             node_groupTarget.setDataEventAction(DataEventAction.fromCode(rs.getString(3)));
             return node_groupTarget;
         }

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -132,12 +132,12 @@ protected List<TriggerRouter> getTriggerRoutersForRegistration(String sourceNode
         List<NodeGroupLink> links = configurationService.getGroupLinksFor(sourceNodeGroupId);
         for (NodeGroupLink nodeGroupLink : links) {
             if (nodeGroupLink.getDataEventAction().equals(DataEventAction.WAIT_FOR_PULL)) {
-                triggers.addAll(getTriggerRoutersForRegistration(nodeGroupLink.getSourceGroupId(), nodeGroupLink
-                        .getTargetGroupId()));
+                triggers.addAll(getTriggerRoutersForRegistration(nodeGroupLink.getSourceNodeGroupId(), nodeGroupLink
+                        .getTargetNodeGroupId()));
             } else if (nodeGroupLink.getDataEventAction().equals(DataEventAction.PUSH)) {
                 triggers.add(buildRegistrationTriggerRouter(TableConstants.getTableName(tablePrefix,
-                        TableConstants.SYM_NODE), false, nodeGroupLink.getSourceGroupId(), nodeGroupLink
-                        .getTargetGroupId()));
+                        TableConstants.SYM_NODE), false, nodeGroupLink.getSourceNodeGroupId(), nodeGroupLink
+                        .getTargetNodeGroupId()));
                 log.debug("TriggerHistCreating", TableConstants.getTableName(tablePrefix, TableConstants.SYM_NODE));
 
             } else {
@@ -623,8 +623,8 @@ protected TriggerHistory rebuildTriggerIfNecessary(StringBuilder sqlBuffer, bool
     class NodeGroupLinkMapper implements RowMapper<NodeGroupLink> {
         public NodeGroupLink mapRow(ResultSet rs, int num) throws SQLException {
             NodeGroupLink node_groupTarget = new NodeGroupLink();
-            node_groupTarget.setSourceGroupId(rs.getString(1));
-            node_groupTarget.setTargetGroupId(rs.getString(2));
+            node_groupTarget.setSourceNodeGroupId(rs.getString(1));
+            node_groupTarget.setTargetNodeGroupId(rs.getString(2));
             node_groupTarget.setDataEventAction(DataEventAction.fromCode(rs.getString(3)));
             return node_groupTarget;
         }