NIFI-15928 Added support for the localizationEngineID in UsmUserDeserializer

Author: dan-s1

nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/utils/UsmUserDeserializer.java

@@ -73,12 +73,19 @@ public UsmUser deserialize(JsonParser jp, DeserializationContext ctxt) throws IO
                     "authentication protocol is specified.");
         }
 
+        OctetString localizationEngineID = null;
+        final JsonNode localizationEngineIDNode = node.get("localizationEngineID");
+        if (localizationEngineIDNode != null) {
+            localizationEngineID = new OctetString(localizationEngineIDNode.asText());
+        }
+
         return new UsmUser(
                 new OctetString(securityName),
                 authProtocol,
                 authPassphrase,
                 privProtocol,
-                privPassphrase
+                privPassphrase,
+                localizationEngineID
         );
     }
 }

nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/utils/JsonUsmReaderTest.java

@@ -56,8 +56,7 @@ void testReadInvalidJsonThrowsException() {
     }
 
     static String readFile(String path) throws IOException {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, StandardCharsets.UTF_8);
+        return Files.readString(Paths.get(path), StandardCharsets.UTF_8);
     }
 
 }

nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/utils/JsonUsmReaderTestBase.java

@@ -39,14 +39,17 @@ public class JsonUsmReaderTestBase {
                 new OID("1.3.6.1.6.3.10.1.1.7"),
                 new OctetString("abc12345"),
                 new OID("1.3.6.1.4.1.4976.2.2.1.1.1"),
-                new OctetString("abc12345")
+                new OctetString("abc12345"),
+                new OctetString("8000000001020304")
+
         ));
         expectedUsmUsers.add(new UsmUser(
                 new OctetString("user2"),
                 new OID("1.3.6.1.6.3.10.1.1.5"),
                 new OctetString("abc12345"),
                 new OID("1.3.6.1.4.1.4976.2.2.1.1.2"),
-                new OctetString("abc12345")
+                new OctetString("abc12345"),
+                new OctetString("8000000001020308")
         ));
     }
 

nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/resources/usm_users.json

@@ -4,13 +4,15 @@
     "authProtocol":"HMAC384SHA512",
     "authPassphrase":"abc12345",
     "privProtocol":"AES192",
-    "privPassphrase":"abc12345"
+    "privPassphrase":"abc12345",
+    "localizationEngineID":"8000000001020304"
   },
   {
     "securityName":"user2",
     "authProtocol":"HMAC192SHA256",
     "authPassphrase":"abc12345",
     "privProtocol":"AES256",
-    "privPassphrase":"abc12345"
+    "privPassphrase":"abc12345",
+    "localizationEngineID":"8000000001020308"
   }
 ]