Merge branch 'space/14.1' of github.com:OpenNMS/opennms into space/14.1

OpenNMS · Apr 21, 2014 · dc37c2e · dc37c2e
2 parents 4273394 + abd1a5d
commit dc37c2e
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 51 deletions.
diff --git a/...jdbc-collector/src/main/java/org/opennms/netmgt/collectd/jdbc/JdbcCollectionResource.java b/...jdbc-collector/src/main/java/org/opennms/netmgt/collectd/jdbc/JdbcCollectionResource.java
@@ -53,10 +53,5 @@ public int getType() {
 
     @Override
     public abstract String getInstance();
-
-    @Override
-    public String getParent() {
-        return m_agent.getStorageDir().toString();
-    }
 
 }
diff --git a/...er-tca-collector/src/main/java/org/opennms/netmgt/collectd/tca/TcaCollectionResource.java b/...er-tca-collector/src/main/java/org/opennms/netmgt/collectd/tca/TcaCollectionResource.java
@@ -89,14 +89,6 @@ public String getResourceTypeName() {
 		return RESOURCE_TYPE_NAME;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.opennms.netmgt.config.collector.CollectionResource#getParent()
-	 */
-	@Override
-	public String getParent() {
-		return m_agent.getStorageDir().toString();
-	}
-
 	/* (non-Javadoc)
 	 * @see org.opennms.netmgt.config.collector.CollectionResource#getInstance()
 	 */

diff --git a/...are/src/main/java/org/opennms/netmgt/collectd/vmware/cim/VmwareCimCollectionResource.java b/...are/src/main/java/org/opennms/netmgt/collectd/vmware/cim/VmwareCimCollectionResource.java
@@ -54,8 +54,4 @@ public void setAttributeValue(final CollectionAttributeType type, final String v
     @Override
     public abstract String getInstance();
 
-    @Override
-    public String getParent() {
-        return m_agent.getStorageDir().toString();
-    }
 }
diff --git a/...are/src/main/java/org/opennms/netmgt/collectd/vmware/vijava/VmwareCollectionResource.java b/...are/src/main/java/org/opennms/netmgt/collectd/vmware/vijava/VmwareCollectionResource.java
@@ -54,8 +54,4 @@ public void setAttributeValue(final CollectionAttributeType type, final String v
     @Override
     public abstract String getInstance();
 
-    @Override
-    public String getParent() {
-        return m_agent.getStorageDir().toString();
-    }
 }
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/collectd/AbstractCollectionResource.java b/opennms-services/src/main/java/org/opennms/netmgt/collectd/AbstractCollectionResource.java
@@ -128,6 +128,11 @@ public void visit(CollectionSetVisitor visitor) {
     @Override
     public abstract int getType();
 
+    @Override
+    public final String getParent() {
+        return m_agent.getStorageDir().toString();
+    }
+
     /**
      * <p>rescanNeeded</p>
      *

diff --git a/opennms-services/src/main/java/org/opennms/netmgt/collectd/JMXCollector.java b/opennms-services/src/main/java/org/opennms/netmgt/collectd/JMXCollector.java
@@ -807,11 +807,6 @@ public String getResourceTypeName() {
         public String getInstance() {
             return null; //For node type resources, use the default instance
         }
-
-        @Override
-        public String getParent() {
-            return m_agent.getStorageDir().toString();
-        }
     }
 
     public static class JMXCollectionSet extends AbstractCollectionSet {

diff --git a/opennms-wmi/src/main/java/org/opennms/netmgt/collectd/wmi/WmiCollectionResource.java b/opennms-wmi/src/main/java/org/opennms/netmgt/collectd/wmi/WmiCollectionResource.java
@@ -91,9 +91,5 @@ public void setAttributeValue(final CollectionAttributeType type, final String v
      */
     @Override
     public abstract String getInstance();
-
-    @Override
-    public String getParent() {
-        return m_agent.getStorageDir().toString();
-    }
+
 }
diff --git a/...ls/nsclient/src/main/java/org/opennms/protocols/nsclient/collector/NSClientCollector.java b/...ls/nsclient/src/main/java/org/opennms/protocols/nsclient/collector/NSClientCollector.java
@@ -199,11 +199,6 @@ public String getResourceTypeName() {
         public String getInstance() {
             return null; //For node type resources, use the default instance
         }
-
-        @Override
-        public String getParent() {
-            return m_agent.getStorageDir().toString();
-        }
     }
 
     private static class NSClientCollectionSet extends AbstractCollectionSet {

diff --git a/protocols/xml/src/main/java/org/opennms/protocols/xml/collector/XmlCollectionResource.java b/protocols/xml/src/main/java/org/opennms/protocols/xml/collector/XmlCollectionResource.java
@@ -83,14 +83,6 @@ public int getType() {
     @Override
     public abstract String getInstance();
 
-    /* (non-Javadoc)
-     * @see org.opennms.netmgt.config.collector.CollectionResource#getParent()
-     */
-    @Override
-    public String getParent() {
-        return m_agent.getStorageDir().toString();
-    }
-
     /* (non-Javadoc)
      * @see org.opennms.netmgt.collectd.AbstractCollectionResource#getTimeKeeper()
      */

diff --git a/...s/xmp/src/main/java/org/opennms/netmgt/protocols/xmp/collector/XmpCollectionResource.java b/...s/xmp/src/main/java/org/opennms/netmgt/protocols/xmp/collector/XmpCollectionResource.java
@@ -76,7 +76,6 @@ public class XmpCollectionResource extends AbstractCollectionResource
     private final String m_resourceType;
     private final int m_nodeType;
     private final Set<AttributeGroup> m_listOfGroups;
-    private final CollectionAgent m_agent;
 
     /* constructors  ************************************* */
     public XmpCollectionResource(CollectionAgent agent, String resourceType, String nodeTypeName, String instance) 
@@ -91,7 +90,6 @@ public XmpCollectionResource(CollectionAgent agent, String resourceType, String
         // resourceType tells us if we are writing under a separate RRD
         // subdir
 
-        this.m_agent = agent;
         this.m_nodeTypeName = nodeTypeName;
         if ((resourceType == null) || (resourceType.length() == 0)) {
             this.m_resourceType = null;
@@ -244,9 +242,4 @@ public void visit(CollectionSetVisitor visitor)
 
     } /* visit */
 
-    @Override
-    public String getParent() {
-        return m_agent.getStorageDir().toString();
-    }
-
 } /* class XmpCollectionResource */