remove unused columns infra active requests

Removed unused columns in db across codebase

Issue-ID: SO-2516
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ieedb61ed371bc3626ef94df0bf88b7a9cf139c82

4 files changed, 34 insertions, 112 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java
index 2cf442406e..2d44eebacd 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java
@@ -35,7 +35,6 @@ public class ArchivedInfraRequests extends InfraRequests {
 
     public ArchivedInfraRequests(String requestId, String action) {
         setRequestId(requestId);
-        setAction(action);
     }
 
     public ArchivedInfraRequests(String requestId) {
@@ -61,22 +60,19 @@ public class ArchivedInfraRequests extends InfraRequests {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this).append("requestId", getRequestId())
-                .append("clientRequestId", getClientRequestId()).append("action", getAction())
-                .append("requestStatus", getRequestStatus()).append("statusMessage", getStatusMessage())
-                .append("progress", getProgress()).append("startTime", getStartTime()).append("endTime", getEndTime())
-                .append("source", getSource()).append("vnfId", getVnfId()).append("vnfName", getVnfName())
-                .append("vnfType", getVnfType()).append("serviceType", getServiceType())
-                .append("aicNodeClli", getAicNodeClli()).append("tenantId", getTenantId())
-                .append("provStatus", getProvStatus()).append("vnfParams", getVnfParams())
-                .append("vnfOutputs", getVnfOutputs()).append("requestBody", getRequestBody())
-                .append("responseBody", getResponseBody()).append("lastModifiedBy", getLastModifiedBy())
-                .append("modifyTime", getModifyTime()).append("requestType", getRequestType())
+        return new ToStringBuilder(this).append("requestId", getRequestId()).append("requestStatus", getRequestStatus())
+                .append("statusMessage", getStatusMessage()).append("progress", getProgress())
+                .append("startTime", getStartTime()).append("endTime", getEndTime()).append("source", getSource())
+                .append("vnfId", getVnfId()).append("vnfName", getVnfName()).append("vnfType", getVnfType())
+                .append("serviceType", getServiceType()).append("tenantId", getTenantId())
+                .append("vnfParams", getVnfParams()).append("vnfOutputs", getVnfOutputs())
+                .append("requestBody", getRequestBody()).append("responseBody", getResponseBody())
+                .append("lastModifiedBy", getLastModifiedBy()).append("modifyTime", getModifyTime())
                 .append("volumeGroupId", getVolumeGroupId()).append("volumeGroupName", getVolumeGroupName())
                 .append("vfModuleId", getVfModuleId()).append("vfModuleName", getVfModuleName())
-                .append("vfModuleModelName", getVfModuleModelName()).append("aaiServiceId", getAaiServiceId())
-                .append("aicCloudRegion", getAicCloudRegion()).append("callBackUrl", getCallBackUrl())
-                .append("correlator", getCorrelator()).append("serviceInstanceId", getServiceInstanceId())
+                .append("vfModuleModelName", getVfModuleModelName()).append("aicCloudRegion", getAicCloudRegion())
+                .append("callBackUrl", getCallBackUrl()).append("correlator", getCorrelator())
+                .append("serviceInstanceId", getServiceInstanceId())
                 .append("serviceInstanceName", getServiceInstanceName()).append("requestScope", getRequestScope())
                 .append("requestAction", getRequestAction()).append("networkId", getNetworkId())
                 .append("networkName", getNetworkName()).append("networkType", getNetworkType())
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java
index 84eaf38da7..9d76e289ab 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java
@@ -43,7 +43,6 @@ public class InfraActiveRequests extends InfraRequests {
 
     public InfraActiveRequests(final String requestId, final String action) {
         setRequestId(requestId);
-        setAction(action);
     }
 
     public InfraActiveRequests(final String requestId) {
@@ -69,22 +68,19 @@ public class InfraActiveRequests extends InfraRequests {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this).append("requestId", getRequestId())
-                .append("clientRequestId", getClientRequestId()).append("action", getAction())
-                .append("requestStatus", getRequestStatus()).append("statusMessage", getStatusMessage())
-                .append("progress", getProgress()).append("startTime", getStartTime()).append("endTime", getEndTime())
-                .append("source", getSource()).append("vnfId", getVnfId()).append("vnfName", getVnfName())
-                .append("vnfType", getVnfType()).append("serviceType", getServiceType())
-                .append("aicNodeClli", getAicNodeClli()).append("tenantId", getTenantId())
-                .append("provStatus", getProvStatus()).append("vnfParams", getVnfParams())
-                .append("vnfOutputs", getVnfOutputs()).append("requestBody", getRequestBody())
-                .append("responseBody", getResponseBody()).append("lastModifiedBy", getLastModifiedBy())
-                .append("modifyTime", getModifyTime()).append("requestType", getRequestType())
+        return new ToStringBuilder(this).append("requestId", getRequestId()).append("requestStatus", getRequestStatus())
+                .append("statusMessage", getStatusMessage()).append("progress", getProgress())
+                .append("startTime", getStartTime()).append("endTime", getEndTime()).append("source", getSource())
+                .append("vnfId", getVnfId()).append("vnfName", getVnfName()).append("vnfType", getVnfType())
+                .append("serviceType", getServiceType()).append("tenantId", getTenantId())
+                .append("vnfParams", getVnfParams()).append("vnfOutputs", getVnfOutputs())
+                .append("requestBody", getRequestBody()).append("responseBody", getResponseBody())
+                .append("lastModifiedBy", getLastModifiedBy()).append("modifyTime", getModifyTime())
                 .append("volumeGroupId", getVolumeGroupId()).append("volumeGroupName", getVolumeGroupName())
                 .append("vfModuleId", getVfModuleId()).append("vfModuleName", getVfModuleName())
-                .append("vfModuleModelName", getVfModuleModelName()).append("aaiServiceId", getAaiServiceId())
-                .append("aicCloudRegion", getAicCloudRegion()).append("callBackUrl", getCallBackUrl())
-                .append("correlator", getCorrelator()).append("serviceInstanceId", getServiceInstanceId())
+                .append("vfModuleModelName", getVfModuleModelName()).append("aicCloudRegion", getAicCloudRegion())
+                .append("callBackUrl", getCallBackUrl()).append("correlator", getCorrelator())
+                .append("serviceInstanceId", getServiceInstanceId())
                 .append("serviceInstanceName", getServiceInstanceName()).append("requestScope", getRequestScope())
                 .append("requestAction", getRequestAction()).append("networkId", getNetworkId())
                 .append("networkName", getNetworkName()).append("networkType", getNetworkType())
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
index 73e5e16324..f36bf9058c 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
@@ -53,10 +53,6 @@ public abstract class InfraRequests implements java.io.Serializable {
     @Id
     @Column(name = "REQUEST_ID", length = 45)
     private String requestId;
-    @Column(name = "CLIENT_REQUEST_ID", length = 45, unique = true)
-    private String clientRequestId;
-    @Column(name = "ACTION", length = 45)
-    private String action;
     @Column(name = "REQUEST_STATUS", length = 20)
     private String requestStatus;
     @Column(name = "STATUS_MESSAGE", length = 2000)
@@ -84,12 +80,8 @@ public abstract class InfraRequests implements java.io.Serializable {
     private String vnfType;
     @Column(name = "SERVICE_TYPE", length = 45)
     private String serviceType;
-    @Column(name = "AIC_NODE_CLLI", length = 11)
-    private String aicNodeClli;
     @Column(name = "TENANT_ID", length = 45)
     private String tenantId;
-    @Column(name = "PROV_STATUS", length = 20)
-    private String provStatus;
     @Column(name = "VNF_PARAMS")
     private String vnfParams;
     @Column(name = "VNF_OUTPUTS")
@@ -103,8 +95,6 @@ public abstract class InfraRequests implements java.io.Serializable {
     @Column(name = "MODIFY_TIME")
     @Temporal(TemporalType.TIMESTAMP)
     private Date modifyTime;
-    @Column(name = "REQUEST_TYPE", length = 20)
-    private String requestType;
     @Column(name = "VOLUME_GROUP_ID", length = 45)
     private String volumeGroupId;
     @Column(name = "VOLUME_GROUP_NAME", length = 45)
@@ -115,8 +105,6 @@ public abstract class InfraRequests implements java.io.Serializable {
     private String vfModuleName;
     @Column(name = "VF_MODULE_MODEL_NAME", length = 200)
     private String vfModuleModelName;
-    @Column(name = "AAI_SERVICE_ID", length = 50)
-    private String aaiServiceId;
     @Column(name = "CLOUD_REGION", length = 11)
     private String aicCloudRegion;
     @Column(name = "CALLBACK_URL", length = 200)
@@ -177,22 +165,6 @@ public abstract class InfraRequests implements java.io.Serializable {
         this.requestId = requestId;
     }
 
-    public String getClientRequestId() {
-        return clientRequestId;
-    }
-
-    public void setClientRequestId(String clientRequestId) {
-        this.clientRequestId = clientRequestId;
-    }
-
-    public String getAction() {
-        return this.action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
     public String getRequestStatus() {
         return this.requestStatus;
     }
@@ -299,14 +271,6 @@ public abstract class InfraRequests implements java.io.Serializable {
         this.serviceType = serviceType;
     }
 
-    public String getAicNodeClli() {
-        return this.aicNodeClli;
-    }
-
-    public void setAicNodeClli(String aicNodeClli) {
-        this.aicNodeClli = aicNodeClli;
-    }
-
     public String getTenantId() {
         return this.tenantId;
     }
@@ -315,14 +279,6 @@ public abstract class InfraRequests implements java.io.Serializable {
         this.tenantId = tenantId;
     }
 
-    public String getProvStatus() {
-        return this.provStatus;
-    }
-
-    public void setProvStatus(String provStatus) {
-        this.provStatus = provStatus;
-    }
-
     public String getVnfParams() {
         return this.vnfParams;
     }
@@ -367,14 +323,6 @@ public abstract class InfraRequests implements java.io.Serializable {
         return this.modifyTime;
     }
 
-    public String getRequestType() {
-        return this.requestType;
-    }
-
-    public void setRequestType(String requestType) {
-        this.requestType = requestType;
-    }
-
     public String getVolumeGroupId() {
         return this.volumeGroupId;
     }
@@ -415,14 +363,6 @@ public abstract class InfraRequests implements java.io.Serializable {
         this.vfModuleModelName = vfModuleModelName;
     }
 
-    public String getAaiServiceId() {
-        return this.aaiServiceId;
-    }
-
-    public void setAaiServiceId(String aaiServiceId) {
-        this.aaiServiceId = aaiServiceId;
-    }
-
     public String getAicCloudRegion() {
         return this.aicCloudRegion;
     }
@@ -637,24 +577,20 @@ public abstract class InfraRequests implements java.io.Serializable {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this).append("requestId", getRequestId())
-                .append("clientRequestId", getClientRequestId()).append("action", getAction())
-                .append("requestStatus", getRequestStatus()).append("statusMessage", getStatusMessage())
-                .append("rollbackStatusMessage", getRollbackStatusMessage()).append("flowStatus", getFlowStatus())
-                .append("retryStatusMessage", getRetryStatusMessage()).append("progress", getProgress())
-                .append("startTime", getStartTime()).append("endTime", getEndTime()).append("source", getSource())
-                .append("vnfId", getVnfId()).append("vnfName", getVnfName()).append("vnfType", getVnfType())
-                .append("serviceType", getServiceType()).append("aicNodeClli", getAicNodeClli())
-                .append("tenantId", getTenantId()).append("provStatus", getProvStatus())
-                .append("vnfParams", getVnfParams()).append("vnfOutputs", getVnfOutputs())
-                .append("requestBody", getRequestBody()).append("responseBody", getResponseBody())
-                .append("lastModifiedBy", getLastModifiedBy()).append("modifyTime", getModifyTime())
-                .append("requestType", getRequestType()).append("volumeGroupId", getVolumeGroupId())
+        return new ToStringBuilder(this).append("requestId", getRequestId()).append("requestStatus", getRequestStatus())
+                .append("statusMessage", getStatusMessage()).append("rollbackStatusMessage", getRollbackStatusMessage())
+                .append("flowStatus", getFlowStatus()).append("retryStatusMessage", getRetryStatusMessage())
+                .append("progress", getProgress()).append("startTime", getStartTime()).append("endTime", getEndTime())
+                .append("source", getSource()).append("vnfId", getVnfId()).append("vnfName", getVnfName())
+                .append("vnfType", getVnfType()).append("serviceType", getServiceType())
+                .append("tenantId", getTenantId()).append("vnfParams", getVnfParams())
+                .append("vnfOutputs", getVnfOutputs()).append("requestBody", getRequestBody())
+                .append("responseBody", getResponseBody()).append("lastModifiedBy", getLastModifiedBy())
+                .append("modifyTime", getModifyTime()).append("volumeGroupId", getVolumeGroupId())
                 .append("volumeGroupName", getVolumeGroupName()).append("vfModuleId", getVfModuleId())
                 .append("vfModuleName", getVfModuleName()).append("vfModuleModelName", getVfModuleModelName())
-                .append("aaiServiceId", getAaiServiceId()).append("aicCloudRegion", getAicCloudRegion())
-                .append("callBackUrl", getCallBackUrl()).append("correlator", getCorrelator())
-                .append("serviceInstanceId", getServiceInstanceId())
+                .append("aicCloudRegion", getAicCloudRegion()).append("callBackUrl", getCallBackUrl())
+                .append("correlator", getCorrelator()).append("serviceInstanceId", getServiceInstanceId())
                 .append("serviceInstanceName", getServiceInstanceName()).append("requestScope", getRequestScope())
                 .append("requestAction", getRequestAction()).append("networkId", getNetworkId())
                 .append("networkName", getNetworkName()).append("networkType", getNetworkType())
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/requestsdb/RequestsDBHelper.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/requestsdb/RequestsDBHelper.java
index e4464450ea..21dea7577e 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/requestsdb/RequestsDBHelper.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/requestsdb/RequestsDBHelper.java
@@ -65,9 +65,6 @@ public class RequestsDBHelper {
         request.setProgress(100L);
         request.setLastModifiedBy("APIH");
         request.setOperationalEnvId(operationalEnvironmentId);
-        if (request.getAction() == null) {
-            request.setRequestAction(UNKNOWN);
-        }
         if (request.getRequestScope() == null) {
             request.setRequestScope(UNKNOWN);
         }
@@ -100,9 +97,6 @@ public class RequestsDBHelper {
         request.setProgress(100L);
         request.setLastModifiedBy("APIH");
         request.setOperationalEnvId(operationalEnvironmentId);
-        if (request.getAction() == null) {
-            request.setRequestAction(UNKNOWN);
-        }
         if (request.getRequestScope() == null) {
             request.setRequestScope(UNKNOWN);
         }