From 2153f867baa6966a04493fa1e11fcf9a0c260035 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Wed, 28 Mar 2018 15:49:21 -0400 Subject: improved request-db test coverage Change-Id: I790517aaa524189c09fcc59d23dd301758f0145c Issue-ID: SO-544 Signed-off-by: Benjamin, Max (mb388a) --- .../openecomp/mso/requestsdb/InfraRequests.java | 86 ++-- .../openecomp/mso/requestsdb/OperationStatus.java | 456 ++++++++++----------- .../OperationalEnvDistributionStatus.java | 16 +- .../OperationalEnvServiceModelStatus.java | 16 +- .../mso/requestsdb/ResourceOperationStatus.java | 444 ++++++++++---------- .../org/openecomp/mso/requestsdb/SiteStatus.java | 4 +- .../WatchdogComponentDistributionStatus.java | 10 +- .../mso/requestsdb/WatchdogDistributionStatus.java | 8 +- .../requestsdb/WatchdogServiceModVerIdLookup.java | 6 +- 9 files changed, 523 insertions(+), 523 deletions(-) (limited to 'mso-api-handlers/mso-requests-db/src/main/java/org') diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/InfraRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/InfraRequests.java index 5089b36573..d2db8fb35b 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/InfraRequests.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/InfraRequests.java @@ -38,50 +38,50 @@ public class InfraRequests implements java.io.Serializable { */ private static final long serialVersionUID = -661307666798018192L; - private String requestId; - private String clientRequestId; - private String action; - private String requestStatus; - private String statusMessage; + private String requestId = null; + private String clientRequestId = null; + private String action = null; + private String requestStatus = null; + private String statusMessage = null; private Long progress; - private Timestamp startTime; - private Timestamp endTime; - private String source; - private String vnfId; - private String vnfName; - private String vnfType; - private String serviceType; - private String aicNodeClli; - private String tenantId; - private String provStatus; - private String vnfParams; - private String vnfOutputs; - private String requestBody; - private String responseBody; - private String lastModifiedBy; - private Timestamp modifyTime; - private String requestType; - private String volumeGroupId; - private String volumeGroupName; - private String vfModuleId; - private String vfModuleName; - private String vfModuleModelName; - private String aaiServiceId; - private String aicCloudRegion; - private String callBackUrl; - private String correlator; - private String serviceInstanceId; - private String serviceInstanceName; - private String requestScope; - private String requestAction; - private String networkId; - private String networkName; - private String networkType; - private String requestorId; - private String configurationId; - private String configurationName; - private String operationalEnvId; - private String operationalEnvName; + private Timestamp startTime = null; + private Timestamp endTime = null; + private String source = null; + private String vnfId = null; + private String vnfName = null; + private String vnfType = null; + private String serviceType = null; + private String aicNodeClli = null; + private String tenantId = null; + private String provStatus = null; + private String vnfParams = null; + private String vnfOutputs = null; + private String requestBody = null; + private String responseBody = null; + private String lastModifiedBy = null; + private Timestamp modifyTime = null; + private String requestType = null; + private String volumeGroupId = null; + private String volumeGroupName = null; + private String vfModuleId = null; + private String vfModuleName = null; + private String vfModuleModelName = null; + private String aaiServiceId = null; + private String aicCloudRegion = null; + private String callBackUrl = null; + private String correlator = null; + private String serviceInstanceId = null; + private String serviceInstanceName = null; + private String requestScope = null; + private String requestAction = null; + private String networkId = null; + private String networkName = null; + private String networkType = null; + private String requestorId = null; + private String configurationId = null; + private String configurationName = null; + private String operationalEnvId = null; + private String operationalEnvName = null; public InfraRequests() { } diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationStatus.java index ddf6b44cc2..f61b2729e8 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationStatus.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationStatus.java @@ -1,228 +1,228 @@ -/*- - * ============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; -import java.sql.Timestamp; - -/** - * The service operation status - *
- *

- *

- * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -public class OperationStatus implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 1L; - - private String serviceId; - - private String operationId; - - private String serviceName; - - private String operation; - - private String userId; - - private String result; - - private String operationContent; - - private String progress = "0"; - - private String reason; - - private Timestamp operateAt; - - private Timestamp finishedAt; - - - 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 getOperation() { - return operation; - } - - - public void setOperation(String operation) { - this.operation = operation; - } - - - public String getUserId() { - return userId; - } - - - public void setUserId(String userId) { - this.userId = userId; - } - - - public String getResult() { - return result; - } - - - public void setResult(String result) { - this.result = result; - } - - - public String getOperationContent() { - return operationContent; - } - - - public void setOperationContent(String operationContent) { - this.operationContent = operationContent; - } - - - public String getProgress() { - return progress; - } - - - public void setProgress(String progress) { - this.progress = progress; - } - - - public String getReason() { - return reason; - } - - - public void setReason(String reason) { - this.reason = reason; - } - - - public Timestamp getOperateAt() { - return operateAt; - } - - - public void setOperateAt(Timestamp operateAt) { - this.operateAt = operateAt; - } - - - public Timestamp getFinishedAt() { - return finishedAt; - } - - - public void setFinishedAt(Timestamp finishedAt) { - this.finishedAt = finishedAt; - } - - - - /** - * @return Returns the serviceName. - */ - public String getServiceName() { - return serviceName; - } - - - - /** - * @param serviceName The serviceName to set. - */ - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - - /** - *
- * - * @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 + ((serviceId == null) ? 0 : serviceId.hashCode()); - return result; - } - - - /** - *
- * - * @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; - OperationStatus other = (OperationStatus)obj; - if(operationId == null) { - if(other.operationId != null) - return false; - } else if(!operationId.equals(other.operationId)) - 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; +import java.sql.Timestamp; + +/** + * The service operation status + *
+ *

+ *

+ * + * @author + * @version ONAP Amsterdam Release 2017-08-28 + */ +public class OperationStatus implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1L; + + private String serviceId = null; + + private String operationId = null; + + private String serviceName = null; + + private String operation = null; + + private String userId = null; + + private String result = null; + + private String operationContent = null; + + private String progress = "0"; + + private String reason = null; + + private Timestamp operateAt = null; + + private Timestamp finishedAt = null; + + + 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 getOperation() { + return operation; + } + + + public void setOperation(String operation) { + this.operation = operation; + } + + + public String getUserId() { + return userId; + } + + + public void setUserId(String userId) { + this.userId = userId; + } + + + public String getResult() { + return result; + } + + + public void setResult(String result) { + this.result = result; + } + + + public String getOperationContent() { + return operationContent; + } + + + public void setOperationContent(String operationContent) { + this.operationContent = operationContent; + } + + + public String getProgress() { + return progress; + } + + + public void setProgress(String progress) { + this.progress = progress; + } + + + public String getReason() { + return reason; + } + + + public void setReason(String reason) { + this.reason = reason; + } + + + public Timestamp getOperateAt() { + return operateAt; + } + + + public void setOperateAt(Timestamp operateAt) { + this.operateAt = operateAt; + } + + + public Timestamp getFinishedAt() { + return finishedAt; + } + + + public void setFinishedAt(Timestamp finishedAt) { + this.finishedAt = finishedAt; + } + + + + /** + * @return Returns the serviceName. + */ + public String getServiceName() { + return serviceName; + } + + + + /** + * @param serviceName The serviceName to set. + */ + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + + /** + *
+ * + * @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 + ((serviceId == null) ? 0 : serviceId.hashCode()); + return result; + } + + + /** + *
+ * + * @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; + OperationStatus other = (OperationStatus)obj; + if(operationId == null) { + if(other.operationId != null) + return false; + } else if(!operationId.equals(other.operationId)) + return false; + if(serviceId == null) { + if(other.serviceId != null) + return false; + } else if(!serviceId.equals(other.serviceId)) + return false; + return true; + } + + +} diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatus.java index 2818a85020..c5df122816 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatus.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatus.java @@ -30,14 +30,14 @@ public class OperationalEnvDistributionStatus implements Serializable { */ private static final long serialVersionUID = 7398393659281364650L; - private String distributionId; - private String operationalEnvId; - private String serviceModelVersionId; - private String requestId; - private String distributionIdStatus; - private String distributionIdErrorReason; - private Timestamp createTime; - private Timestamp modifyTime; + private String distributionId = null; + private String operationalEnvId = null; + private String serviceModelVersionId = null; + private String requestId = null; + private String distributionIdStatus = null; + private String distributionIdErrorReason = null; + private Timestamp createTime = null; + private Timestamp modifyTime = null; public String getDistributionId() { return distributionId; diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatus.java index 27b90ae549..fe581de71b 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatus.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatus.java @@ -37,15 +37,15 @@ public class OperationalEnvServiceModelStatus implements Serializable { */ private static final long serialVersionUID = 8197084996598869656L; - private String requestId; - private String operationalEnvId; - private String serviceModelVersionId; - private String serviceModelVersionDistrStatus; - private String recoveryAction; + private String requestId = null; + private String operationalEnvId = null; + private String serviceModelVersionId = null; + private String serviceModelVersionDistrStatus = null; + private String recoveryAction = null; private int retryCount; - private String workloadContext; - private Timestamp createTime; - private Timestamp modifyTime; + private String workloadContext = null; + private Timestamp createTime = null; + private Timestamp modifyTime = null; public String getRequestId() { return requestId; 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 - *
- *

- *

- * - * @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; - } - - /** - *
- * - * @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; - } - - /** - *
- * - * @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 + *
+ *

+ *

+ * + * @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; + } + + /** + *
+ * + * @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; + } + + /** + *
+ * + * @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; + } + +} diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/SiteStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/SiteStatus.java index 1551ab08c2..3685093740 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/SiteStatus.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/SiteStatus.java @@ -31,8 +31,8 @@ public class SiteStatus { private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL); private boolean status; - private String siteName; - private Timestamp created; + private String siteName = null; + private Timestamp created = null; public SiteStatus() { } diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatus.java index c52fe5013c..8f2bda3728 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatus.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatus.java @@ -31,11 +31,11 @@ public class WatchdogComponentDistributionStatus implements Serializable { */ private static final long serialVersionUID = -4344508954204488669L; - private String distributionId; - private String componentName; - private String componentDistributionStatus; - private Timestamp createTime; - private Timestamp modifyTime; + private String distributionId = null; + private String componentName = null; + private String componentDistributionStatus = null; + private Timestamp createTime = null; + private Timestamp modifyTime = null; public String getDistributionId() { diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatus.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatus.java index 60f123a781..deb2b6824d 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatus.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatus.java @@ -31,10 +31,10 @@ public class WatchdogDistributionStatus implements Serializable { private static final long serialVersionUID = -4449711060885719079L; - private String distributionId; - private String distributionIdStatus; - private Timestamp createTime; - private Timestamp modifyTime; + private String distributionId = null; + private String distributionIdStatus = null; + private Timestamp createTime = null; + private Timestamp modifyTime = null; public String getDistributionId() { diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookup.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookup.java index a19b2db942..ced4f4f0a5 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookup.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookup.java @@ -30,9 +30,9 @@ public class WatchdogServiceModVerIdLookup implements Serializable { */ private static final long serialVersionUID = 7783869906430250355L; - private String distributionId; - private String serviceModelVersionId; - private Timestamp createTime; + private String distributionId = null; + private String serviceModelVersionId = null; + private Timestamp createTime = null; public String getDistributionId() { -- cgit 1.2.3-korg