Removed MSB Invocation During AAI Calling

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

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java
index 4462474..d8d4678 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/entity/PolicyMsg.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright 2017 ZTE Corporation.\r
+ * Copyright 2017-2023 ZTE Corporation.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -16,12 +16,13 @@
 \r
 package org.onap.holmes.common.dmaap.entity;\r
 \r
-import com.fasterxml.jackson.annotation.JsonProperty;\r
-import java.util.HashMap;\r
-import java.util.Map;\r
+import com.google.gson.annotations.SerializedName;\r
 import lombok.Getter;\r
 import lombok.Setter;\r
 \r
+import java.util.HashMap;\r
+import java.util.Map;\r
+\r
 @Getter\r
 @Setter\r
 public class PolicyMsg {\r
@@ -32,15 +33,16 @@ public class PolicyMsg {
     private EVENT_STATUS closedLoopEventStatus = EVENT_STATUS.ONSET;\r
     private long closedLoopAlarmStart;\r
     private long closedLoopAlarmEnd;\r
-    private String closedLoopEventClient;\r
+    private String closedLoopEventClient = "DCAE.HolmesInstance";\r
     private String policyVersion;\r
     private String policyName;\r
     private String policyScope;\r
-    private String from = "HOLMES";\r
-    @JsonProperty(value = "target_type")\r
+    private String from = "DCAE";\r
+    @SerializedName(value = "target_type")\r
     private String targetType = "VM";\r
     private String target;\r
-    private Map<String, String> AAI = new HashMap<>();\r
+    @SerializedName(value = "AAI")\r
+    private Map<String, Object> aai = new HashMap<>();\r
 \r
     public static enum EVENT_STATUS {\r
         ONSET, ABATED;\r