X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdb%2Fep%2FEpMicroserviceParameter.java;h=74b051fe68e4c9c50e2d9f776d1e1a8391b197ff;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=554dd7b50f774ff68e459e1ce98480406d3bfdb8;hpb=672b45b653ef0e88b13c337e598307ad66931390;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java
index 554dd7b5..74b051fe 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java
@@ -59,6 +59,7 @@ import javax.persistence.Table;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -82,11 +83,7 @@ CREATE TABLE `ep_microservice_parameter` (
                 query = "DELETE FROM EpMicroserviceParameter WHERE service_id =:SERVICEID"),
         @NamedQuery(
                 name = "EpMicroserviceParameter.getParametersById",
-                query = "FROM EpMicroserviceParameter WHERE service_id =:SERVICEID"),
-        @NamedQuery(
-                name = "EpMicroserviceParameter.deleteMicroserviceParameterById",
-                query = "DELETE FROM EpMicroserviceParameter WHERE id =:PARAMID"
-        )
+                query = "FROM EpMicroserviceParameter WHERE service_id =:SERVICEID")
 })
 
 @Table(name = "ep_microservice_parameter", indexes = {
@@ -94,6 +91,7 @@ CREATE TABLE `ep_microservice_parameter` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 @Getter
 @Setter
 @Entity
@@ -104,7 +102,7 @@ public class EpMicroserviceParameter implements Serializable {
        @Column(name = "id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
        private Long id;
-       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
        @JoinColumn(name = "service_id")
        private EpMicroservice serviceId;
        @Column(name = "para_key", length = 50)
@@ -118,7 +116,7 @@ public class EpMicroserviceParameter implements Serializable {
        @OneToMany(
                targetEntity = EpWidgetCatalogParameter.class,
                mappedBy = "paramId",
-               cascade = CascadeType.ALL,
+               cascade = CascadeType.MERGE,
                fetch = FetchType.LAZY
        )
        private Set<EpWidgetCatalogParameter> epWidgetCatalogParameter;