improved request-db test coverage

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

1 files changed, 222 insertions, 222 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/ResourceOperationStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/ResourceOperationStatus.java
index 2e91397d14..07650ac417 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/ResourceOperationStatus.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/ResourceOperationStatus.java
@@ -1,222 +1,222 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.

- * ================================================================================

- * 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.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.requestsdb;

-

-import java.io.Serializable;

-

-/**

- * The Resource operation status

- * <br>

- * <p>

- * </p>

- * 

- * @author

- * @version     ONAP Amsterdam Release  2017-08-28

- */

-public class ResourceOperationStatus implements Serializable{

-

-    /**

-     * 

-     */

-    private static final long serialVersionUID = 1L;

-

-    private String serviceId;

-    

-    private String operationId;

-    

-    private String resourceTemplateUUID;

-    

-    private String operType;

-    

-    private String resourceInstanceID;

-    

-    private String jobId;

-    

-    private String status;

-    

-    private String progress = "0";

-    

-    private String errorCode;

-    

-    private String statusDescription;

-

-    public ResourceOperationStatus(){

-        

-    }

-    

-    public ResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID)

-    {

-        this.serviceId = serviceId;

-        this.operationId = operationId;

-        this.resourceTemplateUUID = resourceTemplateUUID;

-    }

-    

-    public String getServiceId() {

-        return serviceId;

-    }

-

-    

-    public void setServiceId(String serviceId) {

-        this.serviceId = serviceId;

-    }

-

-    

-    public String getOperationId() {

-        return operationId;

-    }

-

-    

-    public void setOperationId(String operationId) {

-        this.operationId = operationId;

-    }

-

-    

-    public String getResourceTemplateUUID() {

-        return resourceTemplateUUID;

-    }

-

-    

-    public void setResourceTemplateUUID(String resourceTemplateUUId) {

-        this.resourceTemplateUUID = resourceTemplateUUId;

-    }

-

-    

-    public String getJobId() {

-        return jobId;

-    }

-

-    

-    public void setJobId(String jobId) {

-        this.jobId = jobId;

-    }

-

-    

-    public String getStatus() {

-        return status;

-    }

-

-    

-    public void setStatus(String status) {

-        this.status = status;

-    }

-

-    

-    public String getProgress() {

-        return progress;

-    }

-

-    

-    public void setProgress(String progress) {

-        this.progress = progress;

-    }

-

-    

-    public String getErrorCode() {

-        return errorCode;

-    }

-

-    

-    public void setErrorCode(String errorCode) {

-        this.errorCode = errorCode;

-    }

-

-    

-    public String getStatusDescription() {

-        return statusDescription;

-    }

-

-    

-    public void setStatusDescription(String statusDescription) {

-        this.statusDescription = statusDescription;

-    }

-

-

-    

-    public String getResourceInstanceID() {

-        return resourceInstanceID;

-    }

-

-

-    

-    public void setResourceInstanceID(String resourceInstanceID) {

-        this.resourceInstanceID = resourceInstanceID;

-    }

-

-    

-    public String getOperType() {

-        return operType;

-    }

-

-    

-    public void setOperType(String operType) {

-        this.operType = operType;

-    }

-

-    /**

-     * <br>

-     * 

-     * @return

-     * @since   ONAP Amsterdam Release 

-     */

-    @Override

-    public int hashCode() {

-        final int prime = 31;

-        int result = 1;

-        result = prime * result + ((operationId == null) ? 0 : operationId.hashCode());

-        result = prime * result + ((resourceTemplateUUID == null) ? 0 : resourceTemplateUUID.hashCode());

-        result = prime * result + ((serviceId == null) ? 0 : serviceId.hashCode());

-        return result;

-    }

-

-    /**

-     * <br>

-     * 

-     * @param obj

-     * @return

-     * @since   ONAP Amsterdam Release 

-     */

-    @Override

-    public boolean equals(Object obj) {

-        if(this == obj)

-            return true;

-        if(obj == null)

-            return false;

-        if(getClass() != obj.getClass())

-            return false;

-        ResourceOperationStatus other = (ResourceOperationStatus)obj;

-        if(operationId == null) {

-            if(other.operationId != null)

-                return false;

-        } else if(!operationId.equals(other.operationId))

-            return false;

-        if(resourceTemplateUUID == null) {

-            if(other.resourceTemplateUUID != null)

-                return false;

-        } else if(!resourceTemplateUUID.equals(other.resourceTemplateUUID))

-            return false;

-        if(serviceId == null) {

-            if(other.serviceId != null)

-                return false;

-        } else if(!serviceId.equals(other.serviceId))

-            return false;

-        return true;

-    }   

-    

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.requestsdb;
+
+import java.io.Serializable;
+
+/**
+ * The Resource operation status
+ * <br>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version     ONAP Amsterdam Release  2017-08-28
+ */
+public class ResourceOperationStatus implements Serializable{
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String serviceId = null;
+    
+    private String operationId = null;
+    
+    private String resourceTemplateUUID = null;
+    
+    private String operType = null;
+    
+    private String resourceInstanceID = null;
+    
+    private String jobId = null;
+    
+    private String status = null;
+    
+    private String progress = "0";
+    
+    private String errorCode = null;
+    
+    private String statusDescription = null;
+
+    public ResourceOperationStatus(){
+        
+    }
+    
+    public ResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID)
+    {
+        this.serviceId = serviceId;
+        this.operationId = operationId;
+        this.resourceTemplateUUID = resourceTemplateUUID;
+    }
+    
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    
+    public String getOperationId() {
+        return operationId;
+    }
+
+    
+    public void setOperationId(String operationId) {
+        this.operationId = operationId;
+    }
+
+    
+    public String getResourceTemplateUUID() {
+        return resourceTemplateUUID;
+    }
+
+    
+    public void setResourceTemplateUUID(String resourceTemplateUUId) {
+        this.resourceTemplateUUID = resourceTemplateUUId;
+    }
+
+    
+    public String getJobId() {
+        return jobId;
+    }
+
+    
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
+    
+    public String getStatus() {
+        return status;
+    }
+
+    
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    
+    public String getProgress() {
+        return progress;
+    }
+
+    
+    public void setProgress(String progress) {
+        this.progress = progress;
+    }
+
+    
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    
+    public String getStatusDescription() {
+        return statusDescription;
+    }
+
+    
+    public void setStatusDescription(String statusDescription) {
+        this.statusDescription = statusDescription;
+    }
+
+
+    
+    public String getResourceInstanceID() {
+        return resourceInstanceID;
+    }
+
+
+    
+    public void setResourceInstanceID(String resourceInstanceID) {
+        this.resourceInstanceID = resourceInstanceID;
+    }
+
+    
+    public String getOperType() {
+        return operType;
+    }
+
+    
+    public void setOperType(String operType) {
+        this.operType = operType;
+    }
+
+    /**
+     * <br>
+     * 
+     * @return
+     * @since   ONAP Amsterdam Release 
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((operationId == null) ? 0 : operationId.hashCode());
+        result = prime * result + ((resourceTemplateUUID == null) ? 0 : resourceTemplateUUID.hashCode());
+        result = prime * result + ((serviceId == null) ? 0 : serviceId.hashCode());
+        return result;
+    }
+
+    /**
+     * <br>
+     * 
+     * @param obj
+     * @return
+     * @since   ONAP Amsterdam Release 
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if(this == obj)
+            return true;
+        if(obj == null)
+            return false;
+        if(getClass() != obj.getClass())
+            return false;
+        ResourceOperationStatus other = (ResourceOperationStatus)obj;
+        if(operationId == null) {
+            if(other.operationId != null)
+                return false;
+        } else if(!operationId.equals(other.operationId))
+            return false;
+        if(resourceTemplateUUID == null) {
+            if(other.resourceTemplateUUID != null)
+                return false;
+        } else if(!resourceTemplateUUID.equals(other.resourceTemplateUUID))
+            return false;
+        if(serviceId == null) {
+            if(other.serviceId != null)
+                return false;
+        } else if(!serviceId.equals(other.serviceId))
+            return false;
+        return true;
+    }   
+    
+}