Merge "Improved the UT coverage"

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / api / entity / AlarmsCorrelation.java

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmsCorrelation.java b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmsCorrelation.java
index ee32be2..e21f97d 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmsCorrelation.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/api/entity/AlarmsCorrelation.java
@@ -15,39 +15,53 @@
  */\r
 package org.onap.holmes.common.api.entity;\r
 \r
-import com.fasterxml.jackson.annotation.JsonProperty;\r
+import com.google.gson.annotations.SerializedName;\r
 import java.util.Date;\r
 import lombok.Data;\r
+import lombok.Getter;\r
 import lombok.NoArgsConstructor;\r
+import lombok.Setter;\r
 \r
-@Data\r
+@Getter\r
+@Setter\r
 @NoArgsConstructor\r
 public class AlarmsCorrelation {\r
 \r
-    @JsonProperty(value = "ruleid")\r
+    @SerializedName(value = "ruleid")\r
     private String ruleId;\r
 \r
-    @JsonProperty(value = "ruleinfo")\r
+    @SerializedName(value = "ruleinfo")\r
     private String ruleInfo;\r
 \r
-    @JsonProperty(value = "resulttype")\r
+    @SerializedName(value = "resulttype")\r
     private byte resultType;\r
 \r
-    @JsonProperty(value = "createtime")\r
+    @SerializedName(value = "createtime")\r
     private Date createTime;\r
 \r
-    @JsonProperty(value = "parentalarmid")\r
+    @SerializedName(value = "parentalarmid")\r
     private long parentAlarmId;\r
 \r
-    @JsonProperty(value = "childalarmid")\r
+    @SerializedName(value = "childalarmid")\r
     private long childAlarmId;\r
 \r
-    @JsonProperty(defaultValue = "-1")\r
     private long reserve1 = -1;\r
 \r
-    @JsonProperty(defaultValue = "-1")\r
     private long reserve2 = -1;\r
 \r
-    @JsonProperty(defaultValue = "-1")\r
     private long reserve3 = -1;\r
+\r
+    @Override\r
+    public String toString() {\r
+        StringBuilder sb = new StringBuilder("[");\r
+        sb.append("ruleId=").append(ruleId).append(",");\r
+        sb.append("ruleInfo=").append(ruleInfo).append(",");\r
+        sb.append("createTime=").append(createTime == null ? null : createTime.toString()).append(",");\r
+        sb.append("parentAlarmId=").append(parentAlarmId).append(",");\r
+        sb.append("childAlarmId=").append(childAlarmId).append(",");\r
+        sb.append("reserve1=").append(reserve1).append(",");\r
+        sb.append("reserve2=").append(reserve2).append(",");\r
+        sb.append("reserve3=").append(reserve3).append("]");\r
+        return sb.toString();\r
+    }\r
 }\r