X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ves-nf-oam-adopter%2Fves-nf-oam-adopter-pm-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fo%2Fran%2Foam%2Fnf%2Foam%2Fadopter%2Fpm%2Frest%2Fmanager%2Fmapper%2FCommonEventHeaderHandler.java;h=920f9e2e45fbf6062b1aa0b017eb42cd9d5620cd;hb=8ba75af7767ed833cc600c6d15fc80d13c214c29;hp=7049285145af713e465112fb4d34457bdeda05f9;hpb=04d12d50d1d6144008b49f4484e879a3e145885c;p=oam%2Fnf-oam-adopter.git

diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/CommonEventHeaderHandler.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/CommonEventHeaderHandler.java
index 7049285..920f9e2 100644
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/CommonEventHeaderHandler.java
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-manager/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/rest/manager/mapper/CommonEventHeaderHandler.java
@@ -36,9 +36,9 @@ final class CommonEventHeaderHandler {
     private static final String PM_NOTIFICATIONS = "PM_Notification";
 
     static CommonEventHeader toCommonEventHeader(final VesMappingConfiguration config, final String hostIp,
-            final CsvConfiguration csv, final Map<String, String> record, final int sequence) {
-        final CommonEventHeader header = new CommonEventHeader();
-        setMandatoryFields(config, hostIp, csv, header, record, sequence);
+            final CsvConfiguration csv, final Map<String, String> recordMap, final int sequence) {
+        final var header = new CommonEventHeader();
+        setMandatoryFields(config, hostIp, csv, header, recordMap, sequence);
         setOptionalFields(config, header);
         return header;
     }
@@ -52,7 +52,7 @@ final class CommonEventHeaderHandler {
     }
 
     private static void setMandatoryFields(final VesMappingConfiguration config, final String hostIp,
-            final CsvConfiguration csv, final CommonEventHeader header, final Map<String, String> record,
+            final CsvConfiguration csv, final CommonEventHeader header, final Map<String, String> recordMap,
             final int sequence) {
         header.setDomain(CommonEventHeader.Domain.MEASUREMENT);
         header.setEventName(CommonEventHeader.Domain.FAULT.name()
@@ -64,7 +64,7 @@ final class CommonEventHeaderHandler {
         header.setReportingEntityName(config.getReportingEntityName());
         header.setSequence((long) sequence);
         final String sourceNameField = csv.getSourceName();
-        final String sourceNameRecordValue = Optional.ofNullable(sourceNameField).map(record::get).orElse(hostIp);
+        final String sourceNameRecordValue = Optional.ofNullable(sourceNameField).map(recordMap::get).orElse(hostIp);
         final Optional<String> optRegex = Optional.ofNullable(csv.getSourceNameRegex());
         header.setSourceName(optRegex.map(regex -> sourceNameRecordValue.replaceAll(regex, ""))
             .orElse(sourceNameRecordValue));
@@ -75,8 +75,8 @@ final class CommonEventHeaderHandler {
 
         final List<String> eventId = csv.getEventId();
         final String keyIdConcat =  eventId.stream()
-                .filter(record::containsKey)
-                .map(record::get)
+                .filter(recordMap::containsKey)
+                .map(recordMap::get)
                 .collect(Collectors.joining());
         header.setEventId(UUID.nameUUIDFromBytes(keyIdConcat.getBytes(StandardCharsets.UTF_8)).toString());
     }