Tests coverage up and some minor bug fixes

[portal.git] / portal-BE / src / main / java / org / onap / portal / domain / db / ep / EpMicroserviceParameter.java

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 51ca6f2..36c073a 100644 (file)
--- 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
@@ -40,8 +40,8 @@
 
 package org.onap.portal.domain.db.ep;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.Serializable;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -59,10 +59,10 @@ 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;
-import lombok.ToString;
 import org.hibernate.validator.constraints.SafeHtml;
 
 /*
@@ -80,7 +80,10 @@ CREATE TABLE `ep_microservice_parameter` (
 @NamedQueries({
         @NamedQuery(
                 name = "EpMicroserviceParameter.deleteByServiceId",
-                query = "FROM EpMicroserviceParameter WHERE service_id =:serviceId")
+                query = "DELETE FROM EpMicroserviceParameter WHERE service_id =:SERVICEID"),
+        @NamedQuery(
+                name = "EpMicroserviceParameter.getParametersById",
+                query = "FROM EpMicroserviceParameter WHERE service_id =:SERVICEID")
 })
 
 @Table(name = "ep_microservice_parameter", indexes = {
@@ -88,14 +91,14 @@ CREATE TABLE `ep_microservice_parameter` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@ToString
+@Builder
 @Getter
 @Setter
 @Entity
-public class EpMicroserviceParameter {
+public class EpMicroserviceParameter implements Serializable {
 
        @Id
-       @GeneratedValue(strategy = GenerationType.AUTO)
+       @GeneratedValue(strategy = GenerationType.IDENTITY)
        @Column(name = "id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
        private Long id;
@@ -116,6 +119,6 @@ public class EpMicroserviceParameter {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogParameter> epWidgetCatalogParameters = new ArrayList<>();
+       private Set<EpWidgetCatalogParameter> epWidgetCatalogParameter;
 
 }