Include impacted changes for APPC-346,APPC-348

[appc.git] / appc-dispatcher / appc-request-handler / appc-request-handler-core / src / main / java / org / onap / appc / requesthandler / model / ActionIdentifierModel.java

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/workingstatemanager/objects/VnfWorkingStateDto.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/ActionIdentifierModel.java
similarity index 54%
rename from appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/workingstatemanager/objects/VnfWorkingStateDto.java
rename to appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/ActionIdentifierModel.java
index 948d4ca..9261abb 100644 (file)
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/workingstatemanager/objects/VnfWorkingStateDto.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/model/ActionIdentifierModel.java
@@ -22,22 +22,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.appc.workingstatemanager.objects;
+package org.onap.appc.requesthandler.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class VnfWorkingStateDto {
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ActionIdentifierModel {
+    @JsonProperty("service-instance-id")
+    private String serviceInstanceId;
+    @JsonProperty("vnf-id")
     private String vnfId;
-    private VNFWorkingState state;
-    private String ownerId;
-    private long updated;
-    private long ver;
+    @JsonProperty("vnfc-name")
+    private String vnfcName;
+    @JsonProperty("vf-module-id")
+    private String vfModuleId;
+    @JsonProperty("vserver-id")
+    private String vserverId;
 
-    public VnfWorkingStateDto() {
-    }
-
-    public VnfWorkingStateDto(String vnfId) {
-        this.vnfId = vnfId;
-    }
 
     public String getVnfId() {
         return vnfId;
@@ -47,47 +49,36 @@ public class VnfWorkingStateDto {
         this.vnfId = vnfId;
     }
 
-    public VNFWorkingState getState() {
-        return state;
+    public String getVnfcName() {
+        return vnfcName;
     }
 
-    public void setState(VNFWorkingState state) {
-        this.state = state;
+    public void setVnfcName(String vnfcName) {
+        this.vnfcName = vnfcName;
     }
 
-    public String getOwnerId() {
-        return ownerId;
+    public String getVfModuleId() {
+        return vfModuleId;
     }
 
-    public void setOwnerId(String ownerId) {
-        this.ownerId = ownerId;
+    public void setVfModuleId(String vfModuleId) {
+        this.vfModuleId = vfModuleId;
     }
 
-    public long getUpdated() {
-        return updated;
+    public String getVserverId() {
+        return vserverId;
     }
 
-    public void setUpdated(long updated) {
-        this.updated = updated;
+    public void setVserverId(String vserverId) {
+        this.vserverId = vserverId;
     }
-
-    public long getVer() {
-        return ver;
-    }
-
-    public void setVer(long ver) {
-        this.ver = ver;
+    public String getServiceInstanceId() {
+        return serviceInstanceId;
     }
 
-
-    @Override
-    public String toString() {
-        return "VnfWorkingStateDto{" +
-                "vnfId='" + vnfId + '\'' +
-                ", state=" + state +
-                ", ownerId='" + ownerId + '\'' +
-                ", updated=" + updated +
-                ", ver=" + ver +
-                '}';
+    public void setServiceInstanceId(String serviceInstanceId) {
+        this.serviceInstanceId = serviceInstanceId;
     }
+       
+    
 }