Multiple Sonar Fixes

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / dmaap / DmaapService.java

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
index 65058c5..e3f6e58 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
@@ -15,7 +15,7 @@
  */
 package org.onap.holmes.common.dmaap;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +31,7 @@ import org.onap.holmes.common.dcae.DcaeConfigurationsCache;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg.EVENT_STATUS;
 import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.holmes.common.utils.JacksonUtil;
+import org.onap.holmes.common.utils.GsonUtil;
 
 @Slf4j
 @Service
@@ -39,8 +39,8 @@ public class DmaapService {
 
     @Inject
     private AaiQuery aaiQuery;
-    public static ConcurrentHashMap<String, String> loopControlNames = new ConcurrentHashMap<>();
-    public static ConcurrentHashMap<String, String> alarmUniqueRequestID = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, String> loopControlNames = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, String> alarmUniqueRequestID = new ConcurrentHashMap<>();
 
     public void publishPolicyMsg(PolicyMsg policyMsg, String dmaapConfigKey) {
         try {
@@ -48,11 +48,10 @@ public class DmaapService {
             publisher.setUrl(DcaeConfigurationsCache.getPubSecInfo(dmaapConfigKey).getDmaapInfo()
                     .getTopicUrl());
             publisher.publish(policyMsg);
-            log.info("send policyMsg: " + JacksonUtil.beanToJson(policyMsg));
+            deleteRequestId(policyMsg);
+            log.info("send policyMsg: " + GsonUtil.beanToJson(policyMsg));
         } catch (CorrelationException e) {
             log.error("Failed to publish the control loop event to DMaaP", e);
-        } catch (JsonProcessingException e) {
-            log.info("Failed to convert the control loop event to json");
         } catch (NullPointerException e) {
             log.error("DMaaP configurations do not exist!");
         }
@@ -72,14 +71,14 @@ public class DmaapService {
             enrichVnfInfo(vmEntity, childAlarm, policyMsg);
             policyMsg.setClosedLoopEventStatus(EVENT_STATUS.ONSET);
             try {
-                policyMsg.getAai().put("vserver.in-maint", Boolean.valueOf(vmEntity.getInMaint()).booleanValue());
+                policyMsg.getAai().put("vserver.in-maint", vmEntity.getInMaint());
             } catch (Exception e) {
                 log.error("Failed to parse the field \"in-maint\". A boolean string (\"true\"/\"false\")"
                         + " is expected but the actual value is " + vmEntity.getInMaint() + ".", e);
             }
             try {
                 policyMsg.getAai().put("vserver.is-closed-loop-disabled",
-                        Boolean.valueOf(vmEntity.getClosedLoopDisable()).booleanValue());
+                        vmEntity.getClosedLoopDisable());
             } catch (Exception e) {
                 log.error("Failed to parse the field \"is-closed-loop-disabled\". A boolean string (\"true\"/\"false\")"
                         + " is expected but the actual value is " + vmEntity.getClosedLoopDisable() + ".", e);
@@ -186,4 +185,18 @@ public class DmaapService {
         }
         return vmEntity;
     }
+
+    private void deleteRequestId(PolicyMsg policyMsg){
+       EVENT_STATUS status = policyMsg.getClosedLoopEventStatus();
+        if(EVENT_STATUS.ABATED.equals(status)) {
+            String requestId = policyMsg.getRequestID();
+            for(Entry<String, String> kv: alarmUniqueRequestID.entrySet()) {
+                if(kv.getValue().equals(requestId)) {
+                    alarmUniqueRequestID.remove(kv.getKey());
+                    break;
+                }
+            }
+            log.info("Clear alarm, requestId deleted successful");
+        }
+    }
 }