From a073dc8c7d5e5e389ba7900da4646e0d4070f78d Mon Sep 17 00:00:00 2001
From: Seth Leger <seth@opennms.org>
Date: Wed, 7 May 2014 13:53:22 -0400
Subject: [PATCH] Minor cleanup.

---
 .../collection/support/AbstractCollectionResource.java |  2 +-
 .../config/internal/collection/ResourceTypeImpl.java   |  6 +++---
 .../main/java/org/opennms/netmgt/collectd/IfInfo.java  | 10 +++++-----
 .../netmgt/threshd/CollectionResourceWrapper.java      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/features/collection/api/src/main/java/org/opennms/netmgt/collection/support/AbstractCollectionResource.java b/features/collection/api/src/main/java/org/opennms/netmgt/collection/support/AbstractCollectionResource.java
index ef60507538d1..f422bdf8396b 100644
--- a/features/collection/api/src/main/java/org/opennms/netmgt/collection/support/AbstractCollectionResource.java
+++ b/features/collection/api/src/main/java/org/opennms/netmgt/collection/support/AbstractCollectionResource.java
@@ -144,7 +144,7 @@ public boolean shouldPersist(ServiceParameters params) {
     }
 
     /**
-     * <p>getLabel</p>
+     * <p>getInterfaceLabel</p>
      *
      * @return a {@link java.lang.String} object.
      */
diff --git a/opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/internal/collection/ResourceTypeImpl.java b/opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/internal/collection/ResourceTypeImpl.java
index 3f82e9cc343d..7a355961da99 100644
--- a/opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/internal/collection/ResourceTypeImpl.java
+++ b/opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/internal/collection/ResourceTypeImpl.java
@@ -16,10 +16,10 @@
 /**
  *  &lt;resourceType name="hrStorageIndex" label="Storage (MIB-2 Host Resources)"&gt;
  *    &lt;resourceName&gt;
- *      &lt;m_template&gt;${hrStorageDescr}&lt;/m_template&gt;
+ *      &lt;template&gt;${hrStorageDescr}&lt;/template&gt;
  *    &lt;/resourceName&gt;
- *    &lt;resourceLabel&gt;&lt;m_template&gt;${hrStorageDescr}&lt;/m_template&gt;&lt;/resourceLabel&gt;
- *    &lt;resourceKind&gt;&lt;m_template&gt;${hrStorageType}&lt;/m_template&gt;&lt;/resourceKind&gt;
+ *    &lt;resourceLabel&gt;&lt;template&gt;${hrStorageDescr}&lt;/template&gt;&lt;/resourceLabel&gt;
+ *    &lt;resourceKind&gt;&lt;template&gt;${hrStorageType}&lt;/template&gt;&lt;/resourceKind&gt;
  *    &lt;column oid=".1.3.6.1.2.1.25.2.3.1.2" alias="hrStorageType"  type="string" /&gt;
  *    &lt;column oid=".1.3.6.1.2.1.25.2.3.1.3" alias="hrStorageDescr" type="string" /&gt;
  *  &lt;/resourceType&gt;
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/collectd/IfInfo.java b/opennms-services/src/main/java/org/opennms/netmgt/collectd/IfInfo.java
index 94905788398c..c0f8164dc96e 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/collectd/IfInfo.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/collectd/IfInfo.java
@@ -221,11 +221,11 @@ private OnmsSnmpCollection getCollection() {
     @Override
     public File getResourceDir(RrdRepository repository) throws FileNotFoundException {
         String label = getInterfaceLabel();
-        File rrdBaseDir = repository.getRrdBaseDir();
-        File dir = new File(rrdBaseDir, getCollectionAgent().getStorageDir().toString());
         if (label == null || "".equals(label)) {
-            throw new FileNotFoundException("Could not construct resource directory because label is null or blank: nodeId: " + getNodeId() + ", rrdRepository: " + repository.toString());
+            throw new FileNotFoundException("Could not construct resource directory because interface label is null or blank: nodeId: " + getNodeId() + ", rrdRepository: " + repository.toString());
         } else {
+            File rrdBaseDir = repository.getRrdBaseDir();
+            File dir = new File(rrdBaseDir, getCollectionAgent().getStorageDir().toString());
             return new File(dir, label);
         }
     }
@@ -241,10 +241,10 @@ public String toString() {
     }
 
     boolean shouldStore(ServiceParameters serviceParameters) {
-        if (serviceParameters.getStoreByNodeID().equals("normal")) {
+        if ("normal".equalsIgnoreCase(serviceParameters.getStoreByNodeID())) {
             return isScheduledForCollection();
         } else {
-            return serviceParameters.getStoreByNodeID().equals("true");
+            return "true".equalsIgnoreCase(serviceParameters.getStoreByNodeID());
         }
     }
 
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectionResourceWrapper.java b/opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectionResourceWrapper.java
index 90852412c886..a66992a9a98e 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectionResourceWrapper.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectionResourceWrapper.java
@@ -324,7 +324,7 @@ protected String getIfInfoValue(String attribute) {
      * @return a boolean.
      */
     public boolean isAnInterfaceResource() {
-        return getResourceTypeName() != null && getResourceTypeName().equals("if");
+        return getResourceTypeName() != null && CollectionResource.RESOURCE_TYPE_IF.equals(getResourceTypeName());
     }
 
     /**