aboutsummaryrefslogtreecommitdiffstats
path: root/so-etsi-nfvo/so-etsi-nfvo-ns-lcm
diff options
context:
space:
mode:
authorwaqas.ikram <waqas.ikram@est.tech>2020-10-09 09:58:55 +0100
committerwaqas.ikram <waqas.ikram@est.tech>2020-10-09 10:40:46 +0100
commitca8ce25a837bf75de48337538d06824dab3531be (patch)
tree82a4b169b644fa01822bfb01fbe1f0e40e030053 /so-etsi-nfvo/so-etsi-nfvo-ns-lcm
parentb11c71fc467ea09e2e2d4d379d934f58cc533689 (diff)
Adding nullable values to columns
and removing duplicate dependencies Change-Id: Iddd8ed1e405c1f348b42b39e8c93504ba527864b Issue-ID: SO-3159 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
Diffstat (limited to 'so-etsi-nfvo/so-etsi-nfvo-ns-lcm')
-rw-r--r--so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml6
-rw-r--r--so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJob.java10
-rw-r--r--so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJobStatus.java6
-rw-r--r--so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNfInst.java6
-rw-r--r--so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNsInst.java12
-rw-r--r--so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NsLcmOpOcc.java14
6 files changed, 24 insertions, 30 deletions
diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml
index a541117c93..272ac0c11a 100644
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml
@@ -166,14 +166,8 @@
<version>${okhttp-version}</version>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp</groupId>
- <artifactId>logging-interceptor</artifactId>
- <version>${okhttp-version}</version>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb-api}</version>
</dependency>
</dependencies>
diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJob.java b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJob.java
index ce2487ea9d..60b06e1061 100644
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJob.java
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJob.java
@@ -42,24 +42,24 @@ import org.onap.so.etsi.nfvo.ns.lcm.database.beans.utils.Utils;
public class NfvoJob {
@Id
- @Column(name = "JOB_ID")
+ @Column(name = "JOB_ID", nullable = false)
private String jobId;
- @Column(name = "JOB_TYPE")
+ @Column(name = "JOB_TYPE", nullable = false)
private String jobType;
@Enumerated(EnumType.STRING)
- @Column(name = "JOB_ACTION")
+ @Column(name = "JOB_ACTION", nullable = false)
private JobAction jobAction;
- @Column(name = "RESOURCE_ID")
+ @Column(name = "RESOURCE_ID", nullable = false)
private String resourceId;
@Column(name = "RESOURCE_NAME")
private String resourceName;
@Enumerated(EnumType.STRING)
- @Column(name = "STATUS")
+ @Column(name = "STATUS", nullable = false)
private JobStatusEnum status;
@Column(name = "START_TIME")
diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJobStatus.java b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJobStatus.java
index be673b47fa..66ae0e503c 100644
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJobStatus.java
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoJobStatus.java
@@ -44,17 +44,17 @@ public class NfvoJobStatus {
private int id;
@Enumerated(EnumType.STRING)
- @Column(name = "STATUS")
+ @Column(name = "STATUS", nullable = false)
private JobStatusEnum status;
@Column(name = "DESCRIPTION", columnDefinition = "LONGTEXT")
private String description;
- @Column(name = "UPDATED_TIME")
+ @Column(name = "UPDATED_TIME", nullable = false)
private LocalDateTime updatedTime;
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "JOB_ID")
+ @JoinColumn(name = "JOB_ID", nullable = false)
private NfvoJob nfvoJob;
public int getId() {
diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNfInst.java b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNfInst.java
index e685781308..570355fb37 100644
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNfInst.java
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNfInst.java
@@ -41,7 +41,7 @@ import javax.persistence.Table;
public class NfvoNfInst {
@Id
- @Column(name = "NF_INST_ID")
+ @Column(name = "NF_INST_ID", nullable = false)
private String nfInstId;
@Column(name = "NAME")
@@ -54,11 +54,11 @@ public class NfvoNfInst {
private String packageId;
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "NS_INST_ID")
+ @JoinColumn(name = "NS_INST_ID", nullable = false)
private NfvoNsInst nsInst;
@Enumerated(EnumType.STRING)
- @Column(name = "STATUS")
+ @Column(name = "STATUS", nullable = false)
private State status;
@Column(name = "CREATE_TIME")
diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNsInst.java b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNsInst.java
index 146e5512fc..04f988c2fc 100644
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNsInst.java
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NfvoNsInst.java
@@ -44,29 +44,29 @@ import static org.onap.so.etsi.nfvo.ns.lcm.database.beans.utils.Utils.toIndented
public class NfvoNsInst {
@Id
- @Column(name = "NS_INST_ID")
+ @Column(name = "NS_INST_ID", nullable = false)
private String nsInstId;
- @Column(name = "NAME")
+ @Column(name = "NAME", nullable = false)
private String name;
@Column(name = "NS_PACKAGE_ID")
private String nsPackageId;
- @Column(name = "NSD_ID")
+ @Column(name = "NSD_ID", nullable = false)
private String nsdId;
- @Column(name = "NSD_INVARIANT_ID")
+ @Column(name = "NSD_INVARIANT_ID", nullable = false)
private String nsdInvariantId;
@Column(name = "DESCRIPTION", columnDefinition = "LONGTEXT")
private String description;
@Enumerated(EnumType.STRING)
- @Column(name = "STATUS")
+ @Column(name = "STATUS", nullable = false)
private State status;
- @Column(name = "STATUS_UPDATED_TIME")
+ @Column(name = "STATUS_UPDATED_TIME", nullable = false)
private LocalDateTime statusUpdatedTime;
@Column(name = "GLOBAL_CUSTOMER_ID")
diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NsLcmOpOcc.java b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NsLcmOpOcc.java
index 7668ed272d..19fe969366 100644
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NsLcmOpOcc.java
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/database/beans/NsLcmOpOcc.java
@@ -41,11 +41,11 @@ import javax.persistence.Table;
public class NsLcmOpOcc {
@Id
- @Column(name = "ID")
+ @Column(name = "ID", nullable = false)
private String id;
@Enumerated(EnumType.STRING)
- @Column(name = "OPERATION_STATE")
+ @Column(name = "OPERATION_STATE", nullable = false)
private OperationStateEnum operationState;
@Column(name = "STATE_ENTERED_TIME")
@@ -55,20 +55,20 @@ public class NsLcmOpOcc {
private LocalDateTime startTime;
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "NS_INST_ID")
+ @JoinColumn(name = "NS_INST_ID", nullable = false)
private NfvoNsInst nfvoNsInst;
@Enumerated(EnumType.STRING)
- @Column(name = "OPERATION")
+ @Column(name = "OPERATION", nullable = false)
private NsLcmOpType operation;
- @Column(name = "IS_AUTO_INNOVATION")
+ @Column(name = "IS_AUTO_INNOVATION", nullable = false)
private boolean isAutoInnovation;
- @Column(name = "OPERATION_PARAMS", columnDefinition = "LONGTEXT")
+ @Column(name = "OPERATION_PARAMS", columnDefinition = "LONGTEXT", nullable = false)
private String operationParams;
- @Column(name = "IS_CANCEL_PENDING")
+ @Column(name = "IS_CANCEL_PENDING", nullable = false)
private boolean isCancelPending;
public NsLcmOpOcc() {