Added Time agnostic Onset and Abated classes

[policy/models.git] / models-interactions / model-impl / events / src / main / java / org / onap / policy / controlloop / VirtualControlLoopEvent.java

diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
index 1223d56..3319105 100644 (file)
--- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
+++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
@@ -2,15 +2,15 @@
  * ============LICENSE_START=======================================================
  * controlloop
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,26 +26,28 @@ import com.google.gson.annotations.SerializedName;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@ToString(callSuper = true)
 public class VirtualControlLoopEvent extends ControlLoopEvent {
 
     private static final long serialVersionUID = -5752405682246066226L;
-    
-    @SerializedName("closedLoopAlarmStart")
-    private Instant closedLoopAlarmStart;
-    
-    @SerializedName("closedLoopAlarmEnd")
-    private Instant closedLoopAlarmEnd;
-    
-    @SerializedName("AAI")
-    private Map<String, String> aai = new HashMap<>();
-
-    public VirtualControlLoopEvent() {}
 
+    @SerializedName("AAI")
+    protected Map<String, String> aai = new HashMap<>();
+    protected String payload;
+    protected Instant closedLoopAlarmStart;
+    protected Instant closedLoopAlarmEnd;
 
     /**
      * Construct an instance from an existing instance.
-     * 
+     *
      * @param event the existing instance
      */
     public VirtualControlLoopEvent(VirtualControlLoopEvent event) {
@@ -56,31 +58,8 @@ public class VirtualControlLoopEvent extends ControlLoopEvent {
         if (event.aai != null) {
             this.aai = new HashMap<>(event.aai);
         }
+        this.payload = event.payload;
         this.closedLoopAlarmStart = event.closedLoopAlarmStart;
         this.closedLoopAlarmEnd = event.closedLoopAlarmEnd;
     }
-
-    public Instant getClosedLoopAlarmStart() {
-        return closedLoopAlarmStart;
-    }
-
-    public void setClosedLoopAlarmStart(Instant closedLoopAlarmStart) {
-        this.closedLoopAlarmStart = closedLoopAlarmStart;
-    }
-
-    public Instant getClosedLoopAlarmEnd() {
-        return closedLoopAlarmEnd;
-    }
-
-    public void setClosedLoopAlarmEnd(Instant closedLoopAlarmEnd) {
-        this.closedLoopAlarmEnd = closedLoopAlarmEnd;
-    }
-
-    public Map<String, String> getAai() {
-        return aai;
-    }
-
-    public void setAai(Map<String, String> aai) {
-        this.aai = aai;
-    }
 }