Merge pull request #16 from sentrysoftware/feature/issue-14-update-co…

…nstant-references Issue #14: Update-constant-references
sentrysoftware · Feb 9, 2024 · e058534 · e058534
2 parents 16630ff + ec1dcec
commit e058534
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/sentrysoftware/maven/metricshub/connector/parser/ConstantsProcessor.java b/src/main/java/org/sentrysoftware/maven/metricshub/connector/parser/ConstantsProcessor.java
@@ -35,6 +35,11 @@
  */
 public class ConstantsProcessor extends AbstractNodeProcessor {
 
+	/**
+	 * Constants Pattern
+	 */
+	private static final String CONSTANTS_REFERENCE_PATTERN = "${constant::%s}";
+
 	/**
 	 * Constructs a ConstantsProcessor without a next processor.
 	 */
@@ -53,7 +58,7 @@ public JsonNode processNode(final JsonNode node) {
 			final Map<String, String> replacements = new HashMap<>();
 			for (String key : constantKeys) {
 				final JsonNode child = constantsNode.get(key);
-				replacements.put(key, child.asText());
+				replacements.put(String.format(CONSTANTS_REFERENCE_PATTERN, key), child.asText());
 			}
 
 			final UnaryOperator<String> updater = value -> performReplacements(replacements, value);

diff --git a/src/test/resources/connector/MIB2-header/MIB2-header.yaml b/src/test/resources/connector/MIB2-header/MIB2-header.yaml
@@ -13,7 +13,7 @@ connector:
     criteria:
     # Criteria(1): there must be something in the ifTable SNMP Table
     - type: snmpGetNext
-      oid: _OID
+      oid: ${constant::_OID}
 
 monitors:
   network:
@@ -23,7 +23,7 @@ monitors:
           # Source(1) = ifTable SNMP Table
           # PortID;Description;TypeCode;MacAddress;AdminStatus;
           type: snmpTable
-          oid: _OID
+          oid: ${constant::_OID}
           selectColumns: "ID,2,3,6,7"
           computes:
             # Keep only ports whose administrative status is 'up'
@@ -66,7 +66,7 @@ monitors:
           # Source(1) = ifTable SNMP Table
           # PortID;Description;Speed;OperationalStatus;ReceivedBytes;ReceivedUnicastPackets;ReceivedNonUnicastPackets;ReceivedErrors;TransmittedBytes;TransmittedUnicastPackets;TransmittedNonUnicastPackets;TransmittedErrors;
           type: snmpTable
-          oid: _OID
+          oid: ${constant::_OID}
           selectColumns: "ID,2,5,8,10,11,12,14,16,17,18,20"
           computes:
             # Duplicate Status twice