Merge "Hibernate db fix"

49 files changed, 165 insertions, 186 deletions

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFavoriteReports.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFavoriteReports.java
index 2fab70e1..a1d4a9a0 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFavoriteReports.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFavoriteReports.java
@@ -69,7 +69,7 @@ CREATE TABLE `cr_favorite_reports` (
 @Table(name = "cr_favorite_reports")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @IdClass(CrFavoriteReportsId.class)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolder.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolder.java
index a2c4240e..1791eae7 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolder.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolder.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.cr;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -128,5 +127,5 @@ public class CrFolder {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrFolder> crFolders = new ArrayList<>();
+       private Set<CrFolder> crFolders;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java
index 46384602..83c28662 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java
@@ -41,13 +41,11 @@
 package org.onap.portal.domain.db.cr;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
@@ -106,6 +104,6 @@ public class CrLuFileType {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportFileHistory> crReportFileHistories = new ArrayList<>();
+       private Set<CrReportFileHistory> crReportFileHistories;
 
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java
index c25f8062..16b0512f 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java
@@ -42,8 +42,7 @@ package org.onap.portal.domain.db.cr;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
@@ -96,7 +95,7 @@ CREATE TABLE `cr_report` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
@@ -206,34 +205,34 @@ public class CrReport implements Serializable {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportSchedule> crReportSchedules = new ArrayList<>();
+       private Set<CrReportSchedule> crReportSchedules;
        @OneToMany(
                targetEntity = CrReportAccess.class,
                mappedBy = "repId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportAccess> crReportAccesses = new ArrayList<>();
+       private Set<CrReportAccess> crReportAccesses;
        @OneToMany(
                targetEntity = CrReportLog.class,
                mappedBy = "repId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportLog> crReportLogs = new ArrayList<>();
+       private Set<CrReportLog> crReportLogs;
        @OneToMany(
                targetEntity = CrReportEmailSentLog.class,
                mappedBy = "repId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportEmailSentLog> crReportEmailSentLogs = new ArrayList<>();
+       private Set<CrReportEmailSentLog> crReportEmailSentLogs;
        @OneToMany(
                targetEntity = CrReportFileHistory.class,
                mappedBy = "repId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportFileHistory> crReportFileHistories = new ArrayList<>();
+       private Set<CrReportFileHistory> crReportFileHistories;
 
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java
index 44a53d31..2eb50c74 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java
@@ -80,7 +80,7 @@ CREATE TABLE `cr_report_access` (
 @Table(name = "cr_report_access")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java
index 049057d2..53daa684 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java
@@ -43,6 +43,7 @@ package org.onap.portal.domain.db.cr;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -176,5 +177,5 @@ public class CrReportFileHistory {
                joinColumns = {@JoinColumn(name = "hist_id", referencedColumnName = "hist_id")},
                inverseJoinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "user_id")}
        )
-       private List<FnUser> fnUserList = new ArrayList<>();
+       private Set<FnUser> fnUserList;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportSchedule.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportSchedule.java
index f3935ffc..6d09aa40 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportSchedule.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportSchedule.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.cr;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -183,5 +182,5 @@ public class CrReportSchedule {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrReportScheduleUsers> crReportScheduleUsers = new ArrayList<>();
+       private Set<CrReportScheduleUsers> crReportScheduleUsers;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java
index 76c213c3..b607671f 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java
@@ -78,7 +78,7 @@ CREATE TABLE `cr_report_schedule_users` (
 @Table(name = "cr_report_schedule_users")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableRole.java
index 9487b97b..445e87aa 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableRole.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableRole.java
@@ -73,7 +73,7 @@ CREATE TABLE `cr_table_role` (
 @Table(name = "cr_table_role")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java
index a98999be..b37b2c08 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java
@@ -42,6 +42,7 @@ package org.onap.portal.domain.db.cr;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -116,19 +117,19 @@ public class CrTableSource {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrTableJoin> crTableJoins = new ArrayList<>();
+       private Set<CrTableJoin> crTableJoins;
        @OneToMany(
                targetEntity = CrTableJoin.class,
                mappedBy = "destTableName",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrTableJoin> crTableJoins1 = new ArrayList<>();
+       private Set<CrTableJoin> crTableJoins1;
        @OneToMany(
                targetEntity = CrTableRole.class,
                mappedBy = "tableName",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<CrTableRole> crTableRoles = new ArrayList<>();
+       private Set<CrTableRole> crTableRoles;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java
index cae3b3b1..0f2f9500 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.ep;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -78,7 +77,7 @@ CREATE TABLE `ep_app_function` (
 */
 
 @Table(name = "ep_app_function", indexes = {@Index(name = "fk_ep_app_function_app_id", columnList = "app_id")})
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
@@ -108,7 +107,7 @@ public class EpAppFunction {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpAppRoleFunction> epAppRoleFunctions = new ArrayList<>();
+       private Set<EpAppRoleFunction> epAppRoleFunctions;
 
        @Getter
        @Setter
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpBasicAuthAccount.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpBasicAuthAccount.java
index a8e08749..130e987f 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpBasicAuthAccount.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpBasicAuthAccount.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -110,5 +109,5 @@ public class EpBasicAuthAccount {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpEndpointsBasicAuthAccount> epEndpointsBasicAuthAccounts = new ArrayList<>();
+       private Set<EpEndpointsBasicAuthAccount> epEndpointsBasicAuthAccounts;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpoints.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpoints.java
index 5ab4cb9e..ed1fabdf 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpoints.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpoints.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -95,6 +94,6 @@ public class EpEndpoints {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpEndpointsBasicAuthAccount> epEndpointsBasicAuthAccounts = new ArrayList<>();
+       private Set<EpEndpointsBasicAuthAccount> epEndpointsBasicAuthAccounts;
 
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java
index 35e51be6..aa43fbe3 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -90,7 +89,7 @@ CREATE TABLE `ep_microservice` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@ToString
+
 @Getter
 @Setter
 @Entity
@@ -136,14 +135,14 @@ public class EpMicroservice {
        @SafeHtml
        private String active;
        @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-       private List<EpWidgetCatalog> epWidgetCatalogList = new ArrayList<>();
+       private Set<EpWidgetCatalog> epWidgetCatalogList;
        @OneToMany(
                targetEntity = EpMicroserviceParameter.class,
                mappedBy = "serviceId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpMicroserviceParameter> epMicroserviceParameters = new ArrayList<>();
+       private Set<EpMicroserviceParameter> epMicroserviceParameters;
 
        public void copyOf(final EpMicroservice epMicroservice) {
               this.id = epMicroservice.getId();
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 51ca6f2b..c66ca723 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
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -88,7 +87,7 @@ CREATE TABLE `ep_microservice_parameter` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@ToString
+
 @Getter
 @Setter
 @Entity
@@ -116,6 +115,6 @@ public class EpMicroserviceParameter {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogParameter> epWidgetCatalogParameters = new ArrayList<>();
+       private Set<EpWidgetCatalogParameter> epWidgetCatalogParameter;
 
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlModel.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlModel.java
index 270c9927..d865fa41 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlModel.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlModel.java
@@ -69,7 +69,7 @@ CREATE TABLE `ep_ml_model` (
 @Table(name = "ep_ml_model")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java
index 2ed3f13b..190405cd 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java
@@ -70,7 +70,7 @@ CREATE TABLE `ep_ml_rec` (
 @Table(name = "ep_ml_rec")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java
index 0f17d25d..59ff5608 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java
@@ -72,7 +72,7 @@ CREATE TABLE `ep_ml_user` (
 @Table(name = "ep_ml_user")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpNotification.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpNotification.java
index 4fe24bd7..12c161f6 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpNotification.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpNotification.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.ep;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -148,12 +147,12 @@ public class EpNotification {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpRoleNotification> epRoleNotifications = new ArrayList<>();
+       private Set<EpRoleNotification> epRoleNotifications;
        @OneToMany(
                targetEntity = EpUserNotification.class,
                mappedBy = "notificationId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpUserNotification> epUserNotifications = new ArrayList<>();
+       private Set<EpUserNotification> epUserNotifications;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java
index 0d8bfc88..13d26f71 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.ep;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -122,5 +121,5 @@ public class EpUserRolesRequest {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpUserRolesRequestDet> epUserRolesRequestDets = new ArrayList<>();
+       private Set<EpUserRolesRequestDet> epUserRolesRequestDets;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalog.java
index 7bfbee8c..a125e1d1 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalog.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -122,40 +121,40 @@ public class EpWidgetCatalog {
                        @Index(name = "FK_EP_WIDGET_MICROSERVICE_EP_WIDGET", columnList = "widget_id")
                }
        )
-       private List<EpMicroservice> epMicroservices = new ArrayList<>();
+       private Set<EpMicroservice> epMicroservices;
        @OneToMany(
                targetEntity = EpWidgetCatalogRole.class,
                mappedBy = "widgetId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogRole> widgetCatalogRoles = new ArrayList<>();
+       private Set<EpWidgetCatalogRole> widgetCatalogRoles;
        @OneToMany(
                targetEntity = EpPersUserWidgetSel.class,
                mappedBy = "widgetId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpPersUserWidgetSel> epPersUserWidgetSels = new ArrayList<>();
+       private Set<EpPersUserWidgetSel> epPersUserWidgetSels;
        @OneToMany(
                targetEntity = EpPersUserWidgetSel.class,
                mappedBy = "widgetId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpPersUserWidgetSel> persUserWidgetSels = new ArrayList<>();
+       private Set<EpPersUserWidgetSel> persUserWidgetSels;
        @OneToMany(
                targetEntity = EpPersUserWidgetPlacement.class,
                mappedBy = "widgetId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpPersUserWidgetPlacement> epPersUserWidgetPlacements = new ArrayList<>();
+       private Set<EpPersUserWidgetPlacement> epPersUserWidgetPlacements;
        @OneToMany(
                targetEntity = EpWidgetCatalogParameter.class,
                mappedBy = "widgetId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogParameter> epWidgetCatalogParameters = new ArrayList<>();
+       private Set<EpWidgetCatalogParameter> epWidgetCatalogParameters;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java
index 84f6aea0..cdc20897 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.fn;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
@@ -227,61 +226,61 @@ public class FnApp extends DomainVo implements Serializable {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenuFunctionalRoles> fnMenuFunctionalRoles = new ArrayList<>();
+       private Set<FnMenuFunctionalRoles> fnMenuFunctionalRoles;
        @OneToMany(
                targetEntity = EpUserRolesRequest.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpUserRolesRequest> epUserRolesRequests = new ArrayList<>();
+       private Set<EpUserRolesRequest> epUserRolesRequests;
        @OneToMany(
                targetEntity = EpAppFunction.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpAppFunction> epAppFunctions = new ArrayList<>();
+       private Set<EpAppFunction> epAppFunctions;
        @OneToMany(
                targetEntity = EpAppRoleFunction.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpAppRoleFunction> epAppRoleFunctions = new ArrayList<>();
+       private Set<EpAppRoleFunction> epAppRoleFunctions;
        @OneToMany(
                targetEntity = FnUserRole.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUserRole> fnUserRoles = new ArrayList<>();
+       private Set<FnUserRole> fnUserRoles;
        @OneToMany(
                targetEntity = EpWebAnalyticsSource.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWebAnalyticsSource> epWebAnalyticsSources = new ArrayList<>();
+       private Set<EpWebAnalyticsSource> epWebAnalyticsSources;
        @OneToMany(
                targetEntity = EpWidgetCatalogRole.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogRole> epWidgetCatalogRoles = new ArrayList<>();
+       private Set<EpWidgetCatalogRole> epWidgetCatalogRoles;
        @OneToMany(
                targetEntity = EpMicroservice.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpMicroservice> epMicroservices = new ArrayList<>();
+       private Set<EpMicroservice> epMicroservices;
        @OneToMany(
                targetEntity = FnPersUserAppSel.class,
                mappedBy = "appId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnPersUserAppSel> fnPersUserAppSels = new ArrayList<>();
+       private Set<FnPersUserAppSel> fnPersUserAppSels;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditLog.java
index 8f5e5c0b..469fb74a 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditLog.java
@@ -94,7 +94,7 @@ public class FnAuditLog {
        @Column(name = "log_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
        @Digits(integer = 11, fraction = 0)
        private Integer logId;
-       @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+       @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
        @JoinColumn(name = "user_id", nullable = false)
        @NotNull
        @Valid
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
index 16353515..41ac1d6b 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -88,19 +87,19 @@ public class FnFunction {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnRestrictedUrl> fnRestrictedUrls = new ArrayList<>();
+       private Set<FnRestrictedUrl> fnRestrictedUrls;
        @OneToMany(
                targetEntity = FnRoleFunction.class,
                mappedBy = "functionCd",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnRoleFunction> fnRoleFunctions = new ArrayList<>();
+       private Set<FnRoleFunction> fnRoleFunctions;
        @OneToMany(
                targetEntity = FnTab.class,
                mappedBy = "functionCd",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnTab> fnTabs = new ArrayList<>();
+       private Set<FnTab> fnTabs;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
index d9aff94c..a5255f30 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.fn;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -74,7 +73,7 @@ CREATE TABLE `fn_language` (
 @Table(name = "fn_language")
 @NoArgsConstructor
 @AllArgsConstructor
-@ToString
+
 @Getter
 @Setter
 @Entity
@@ -101,8 +100,17 @@ public class FnLanguage {
                targetEntity = FnUser.class,
                mappedBy = "languageId",
                cascade = CascadeType.ALL,
-               fetch = FetchType.EAGER
+               fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsers = new ArrayList<>();
+       private Set<FnUser> fnUsers;
 
+       @Override
+       public String toString() {
+              final StringBuilder sb = new StringBuilder("FnLanguage{");
+              sb.append("languageId=").append(languageId);
+              sb.append(", languageName='").append(languageName).append('\'');
+              sb.append(", languageAlias='").append(languageAlias).append('\'');
+              sb.append('}');
+              return sb.toString();
+       }
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuActivity.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuActivity.java
index dc5c7e27..6b0b47c5 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuActivity.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuActivity.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -89,5 +88,5 @@ public class FnLuActivity {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnAuditLog> fnAuditLogs = new ArrayList<>();
+       private Set<FnAuditLog> fnAuditLogs;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuAlertMethod.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuAlertMethod.java
index bc3ef682..6ee07167 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuAlertMethod.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuAlertMethod.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -89,5 +88,5 @@ public class FnLuAlertMethod {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsers = new ArrayList<>();
+       private Set<FnUser> fnUsers;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuMenuSet.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuMenuSet.java
index 5f3459d7..3ac88232 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuMenuSet.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuMenuSet.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -93,5 +92,5 @@ public class FnLuMenuSet {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenu> fnMenus = new ArrayList<>();
+       private Set<FnMenu> fnMenus;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTabSet.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTabSet.java
index 7c9743a3..c8c7be22 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTabSet.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTabSet.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -88,5 +87,5 @@ public class FnLuTabSet {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnTab> fnTabs = new ArrayList<>();
+       private Set<FnTab> fnTabs;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTimezone.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTimezone.java
index b43474fe..53b54f41 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTimezone.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuTimezone.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -78,7 +77,7 @@ public class FnLuTimezone {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "timezone_id", length = 11, nullable = false)
-       private Integer timezoneId;
+       private Long timezoneId;
        @Column(name = "timezone_name", length = 100, nullable = false)
        @Size(max = 100)
        @SafeHtml
@@ -96,6 +95,6 @@ public class FnLuTimezone {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsers = new ArrayList<>();
+       private Set<FnUser> fnUsers;
 
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenu.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenu.java
index 007d6edd..3ba60c78 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenu.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenu.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -112,7 +111,7 @@ public class FnMenu {
        @Size(max = 100)
        @SafeHtml
        private String label;
-       @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "parent_Id", columnDefinition = "int(11) DEFAULT NULL")
        @Valid
        private FnMenu parentId;
@@ -171,5 +170,5 @@ public class FnMenu {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenu> fnMenus = new ArrayList<>();
+       private Set<FnMenu> fnMenus;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctional.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctional.java
index bfdc673d..cd9a362d 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctional.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctional.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -134,26 +133,26 @@ public class FnMenuFunctional {
                        @Index(name = "sys_c0014619", columnList = "menu_id")
                }
        )
-       private List<FnUser> fnUsers = new ArrayList<>();
+       private Set<FnUser> fnUsers;
        @OneToMany(
                targetEntity = FnMenuFunctionalAncestors.class,
                mappedBy = "menuId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenuFunctionalAncestors> fnMenuFunctionalAncestorsMenuId = new ArrayList<>();
+       private Set<FnMenuFunctionalAncestors> fnMenuFunctionalAncestorsMenuId;
        @OneToMany(
                targetEntity = FnMenuFunctionalAncestors.class,
                mappedBy = "ancestorMenuId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenuFunctionalAncestors> fnMenuFunctionalsAncestorMenuId = new ArrayList<>();
+       private Set<FnMenuFunctionalAncestors> fnMenuFunctionalsAncestorMenuId;
        @OneToMany(
                targetEntity = FnMenuFunctionalRoles.class,
                mappedBy = "menuId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenuFunctionalRoles> fnMenuFunctionalRoles = new ArrayList<>();
+       private Set<FnMenuFunctionalRoles> fnMenuFunctionalRoles;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java
index 44a5e848..14bd194a 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -77,7 +76,7 @@ CREATE TABLE `fn_org` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@ToString
+
 @Getter
 @Setter
 @Entity
@@ -86,7 +85,7 @@ public class FnOrg {
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "org_id", nullable = false, length = 11)
        @Digits(integer = 11, fraction = 0)
-       private Integer orgId;
+       private Long orgId;
        @Column(name = "org_name", length = 50, nullable = false)
        @Size(max = 50)
        @SafeHtml
@@ -103,5 +102,5 @@ public class FnOrg {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsers = new ArrayList<>();
+       private Set<FnUser> fnUsers;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java
index b817a19d..74765c06 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java
@@ -77,7 +77,7 @@ CREATE TABLE `fn_qz_blob_triggers` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCalendars.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCalendars.java
index f901474c..d13ac345 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCalendars.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCalendars.java
@@ -68,7 +68,7 @@ CREATE TABLE `fn_qz_calendars` (
 @Table(name = "fn_qz_calendars")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java
index 21ae8dd2..82968f40 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java
@@ -73,7 +73,7 @@ CREATE TABLE `fn_qz_cron_triggers` (
 @Table(name = "fn_qz_cron_triggers")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzFiredTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzFiredTriggers.java
index 7039437c..e4c15d28 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzFiredTriggers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzFiredTriggers.java
@@ -95,7 +95,7 @@ CREATE TABLE `fn_qz_fired_triggers` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzJobDetails.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzJobDetails.java
index 11ab5115..04426353 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzJobDetails.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzJobDetails.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.fn;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -86,7 +85,7 @@ CREATE TABLE `fn_qz_job_details` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
@@ -145,7 +144,7 @@ public class FnQzJobDetails {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnQzTriggers> selectedTabCd = new ArrayList<>();
+       private Set<FnQzTriggers> selectedTabCd;
 
        @Getter
        @Setter
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzLocks.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzLocks.java
index 1d9fc48a..cee0ebae 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzLocks.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzLocks.java
@@ -66,7 +66,7 @@ CREATE TABLE `fn_qz_locks` (
 @Table(name = "fn_qz_locks")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzPausedTriggerGrps.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzPausedTriggerGrps.java
index a7bcdb3b..38c65400 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzPausedTriggerGrps.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzPausedTriggerGrps.java
@@ -66,7 +66,7 @@ CREATE TABLE `fn_qz_paused_trigger_grps` (
 @Table(name = "fn_qz_paused_trigger_grps")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSchedulerState.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSchedulerState.java
index e19c2160..b9005a66 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSchedulerState.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSchedulerState.java
@@ -71,7 +71,7 @@ CREATE TABLE `fn_qz_scheduler_state` (
 @Table(name = "fn_qz_scheduler_state")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java
index f3f9a948..23ca4c31 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java
@@ -76,7 +76,7 @@ CREATE TABLE `fn_qz_simple_triggers` (
 @Table(name = "fn_qz_simple_triggers")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java
index cef8f481..23a3e06e 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java
@@ -83,7 +83,7 @@ CREATE TABLE `fn_qz_simprop_triggers` (
 @Table(name = "fn_qz_simprop_triggers")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java
index bbe64053..35b619cf 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRestrictedUrl.java
@@ -75,7 +75,7 @@ CREATE TABLE `fn_restricted_url` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
index dc457883..eda3fb26 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
@@ -40,8 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -154,7 +153,7 @@ public class FnRole {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnRoleFunction> fnRoleFunctions = new ArrayList<>();
+       private Set<FnRoleFunction> fnRoleFunctions;
        @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
        @JoinTable(
                name = "fn_user_pseudo_role",
@@ -164,7 +163,7 @@ public class FnRole {
                        @Index(name = "fk_pseudo_role_user_id", columnList = "user_id")
                }
        )
-       private List<FnUser> fnUsers = new ArrayList<>();
+       private Set<FnUser> fnUsers;
        @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
        @JoinTable(
                name = "fn_role_composite",
@@ -174,49 +173,50 @@ public class FnRole {
                        @Index(name = "fk_fn_role_composite_child", columnList = "child_role_id")
                }
        )
-       private List<FnRole> fnRoles = new ArrayList<>();
-       @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-       private List<FnRole> fnRoleList = new ArrayList<>();
+       private Set<FnRole> fnRoles;
+       @ManyToMany(cascade = CascadeType.ALL,
+               fetch = FetchType.LAZY)
+       private Set<FnRole> fnRoleList;
        @OneToMany(
                targetEntity = EpRoleNotification.class,
                mappedBy = "notificationID",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpRoleNotification> epRoleNotifications = new ArrayList<>();
+       private Set<EpRoleNotification> epRoleNotifications;
        @OneToMany(
                targetEntity = FnMenuFunctionalRoles.class,
                mappedBy = "roleId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnMenuFunctionalRoles> fnMenuFunctionalRoles = new ArrayList<>();
+       private Set<FnMenuFunctionalRoles> fnMenuFunctionalRoles;
        @OneToMany(
                targetEntity = EpWidgetCatalogRole.class,
                mappedBy = "roleId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogRole> epWidgetCatalogRoles = new ArrayList<>();
+       private Set<EpWidgetCatalogRole> epWidgetCatalogRoles;
        @OneToMany(
                targetEntity = EpAppRoleFunction.class,
                mappedBy = "fnRole",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpAppRoleFunction> epAppRoleFunctions = new ArrayList<>();
+       private Set<EpAppRoleFunction> epAppRoleFunctions;
        @OneToMany(
                targetEntity = EpUserRolesRequestDet.class,
                mappedBy = "requestedRoleId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpUserRolesRequestDet> epUserRolesRequestDets = new ArrayList<>();
+       private Set<EpUserRolesRequestDet> epUserRolesRequestDets;
        @OneToMany(
                targetEntity = FnUserRole.class,
                mappedBy = "roleId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUserRole> fnUserRoles = new ArrayList<>();
+       private Set<FnUserRole> fnUserRoles;
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java
index 020b3107..bfc7834c 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTab.java
@@ -41,8 +41,7 @@
 package org.onap.portal.domain.db.fn;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -142,6 +141,6 @@ public class FnTab {
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnTabSelected> selectedTabCd = new ArrayList<>();
+       private Set<FnTabSelected> selectedTabCd;
 
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTabSelected.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTabSelected.java
index 8f4c10b3..f62668e1 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTabSelected.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnTabSelected.java
@@ -73,7 +73,7 @@ CREATE TABLE `fn_tab_selected` (
 @Table(name = "fn_tab_selected")
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java
index 4747cdf8..cbca44c1 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java
@@ -41,9 +41,9 @@
 package org.onap.portal.domain.db.fn;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -59,22 +59,20 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedNativeQueries;
 import javax.persistence.NamedNativeQuery;
 import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.validation.Valid;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.PastOrPresent;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
-import lombok.Builder.Default;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.validator.constraints.SafeHtml;
 import org.onap.portal.domain.db.cr.CrReportFileHistory;
 import org.onap.portal.domain.db.ep.EpPersUserWidgetPlacement;
@@ -82,7 +80,6 @@ import org.onap.portal.domain.db.ep.EpPersUserWidgetSel;
 import org.onap.portal.domain.db.ep.EpUserNotification;
 import org.onap.portal.domain.db.ep.EpUserRolesRequest;
 import org.onap.portal.domain.db.ep.EpWidgetCatalogParameter;
-import org.onap.portal.domain.dto.DomainVo;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -170,13 +167,16 @@ CREATE TABLE `fn_user` (
         uniqueConstraints = {
                 @UniqueConstraint(name = "fn_user_hrid", columnNames = "hrid"),
                 @UniqueConstraint(name = "fn_user_login_id", columnNames = "login_id")
+
         })
-@NoArgsConstructor
-@AllArgsConstructor
+
 @Getter
 @Setter
 @Entity
-@SequenceGenerator(name="seq", initialValue=1000, allocationSize=100000)
+@NoArgsConstructor
+@AllArgsConstructor
+@DynamicUpdate
+@SequenceGenerator(name = "seq", initialValue = 1000, allocationSize = 100000)
 public class FnUser implements UserDetails {
 
        @Id
@@ -184,13 +184,11 @@ public class FnUser implements UserDetails {
        @Column(name = "user_id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
        private Long userId;
-       @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+       @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
        @JoinColumn(name = "org_id", columnDefinition = "int(11) DEFAULT NULL")
-       @Valid
        private FnOrg orgId;
        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
        @JoinColumn(name = "manager_id")
-       @Valid
        private FnUser managerId;
        @Column(name = "first_name", length = 50, columnDefinition = "varchar(50) DEFAULT NULL")
        @Size(max = 50)
@@ -253,18 +251,16 @@ public class FnUser implements UserDetails {
        @Column(name = "active_yn", length = 1, columnDefinition = "character varying(1) default 'y'", nullable = false)
        @Size(max = 1)
        @SafeHtml
-       //@NotNull(message = "activeYn must not be null")
+       @NotNull(message = "activeYn must not be null")
        private String activeYn;
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "created_id")
-       @Valid
        private FnUser createdId;
        @Column(name = "created_date", columnDefinition = "datetime DEFAULT current_timestamp()", nullable = false)
        @PastOrPresent
        protected LocalDateTime createdDate;
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "modified_id")
-       @Valid
        private FnUser modifiedId;
        @Column(name = "modified_date", nullable = false, columnDefinition = "datetime default now()")
        @PastOrPresent
@@ -272,7 +268,7 @@ public class FnUser implements UserDetails {
        @Column(name = "is_internal_yn", length = 1, columnDefinition = "character varying(1) default 'n'", nullable = false)
        @Size(max = 1)
        @SafeHtml
-       //@NotNull(message = "isInternalYn must not be null")
+       @NotNull(message = "isInternalYn must not be null")
        private String isInternalYn;
        @Column(name = "address_line_1", length = 100, columnDefinition = "varchar(100) DEFAULT NULL")
        @Size(max = 100)
@@ -320,7 +316,6 @@ public class FnUser implements UserDetails {
        private String jobTitle;
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "timezone", columnDefinition = "int(11) DEFAULT NULL")
-       @Valid
        private FnLuTimezone timezone;
        @Column(name = "department", length = 25, columnDefinition = "varchar(25) DEFAULT NULL")
        @Size(max = 25)
@@ -346,97 +341,96 @@ public class FnUser implements UserDetails {
        @Size(max = 10)
        @SafeHtml
        private String siloStatus;
-       @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "language_id", nullable = false, columnDefinition = "int(11) DEFAULT 1")
-       @Valid
-       //@NotNull(message = "languageId must not be null")
+       @NotNull(message = "languageId must not be null")
        private FnLanguage languageId;
        @Column(name = "is_guest", columnDefinition = "boolean default 0", nullable = false)
        @NotNull(message = "guest must not be null")
        private boolean guest;
        @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "fnUserList")
-       private List<CrReportFileHistory> crReportFileHistorie = new ArrayList<>();
-       @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-       private List<FnRole> fnRoles = new ArrayList<>();
+       private Set<CrReportFileHistory> crReportFileHistorie;
+       @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+       private Set<FnRole> fnRoles;
        @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-       private List<FnMenuFunctional> fnRoleList = new ArrayList<>();
+       private Set<FnMenuFunctional> fnRoleList;
        @OneToMany(
                targetEntity = FnAuditLog.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnAuditLog> fnAuditLogs = new ArrayList<>();
+       private Set<FnAuditLog> fnAuditLogs;
        @OneToMany(
                targetEntity = FnUser.class,
                mappedBy = "createdId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsersCreatedId = new ArrayList<>();
+       private Set<FnUser> fnUsersCreatedId;
        @OneToMany(
                targetEntity = FnUser.class,
                mappedBy = "managerId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsersManagerId = new ArrayList<>();
+       private Set<FnUser> fnUsersManagerId;
        @OneToMany(
                targetEntity = FnUser.class,
                mappedBy = "modifiedId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUser> fnUsersModifiedId = new ArrayList<>();
+       private Set<FnUser> fnUsersModifiedId;
        @OneToMany(
                targetEntity = EpUserRolesRequest.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpUserRolesRequest> epUserRolesRequests = new ArrayList<>();
+       private Set<EpUserRolesRequest> epUserRolesRequests;
        @OneToMany(
                targetEntity = FnPersUserAppSel.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnPersUserAppSel> persUserAppSels = new ArrayList<>();
+       private Set<FnPersUserAppSel> persUserAppSels;
        @OneToMany(
                targetEntity = EpWidgetCatalogParameter.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpWidgetCatalogParameter> epWidgetCatalogParameters = new ArrayList<>();
+       private Set<EpWidgetCatalogParameter> epWidgetCatalogParameters;
        @OneToMany(
                targetEntity = EpPersUserWidgetPlacement.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpPersUserWidgetPlacement> epPersUserWidgetPlacements = new ArrayList<>();
+       private Set<EpPersUserWidgetPlacement> epPersUserWidgetPlacements;
        @OneToMany(
                targetEntity = EpPersUserWidgetSel.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpPersUserWidgetSel> epPersUserWidgetSels = new ArrayList<>();
+       private Set<EpPersUserWidgetSel> epPersUserWidgetSels;
        @OneToMany(
                targetEntity = FnUserRole.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<FnUserRole> fnUserRoles = new ArrayList<>();
+       private Set<FnUserRole> fnUserRoles;
        @OneToMany(
                targetEntity = EpUserNotification.class,
                mappedBy = "userId",
                cascade = CascadeType.ALL,
                fetch = FetchType.LAZY
        )
-       private List<EpUserNotification> epUserNotifications = new ArrayList<>();
+       private Set<EpUserNotification> epUserNotifications;
 
        @Override
        public Collection<? extends GrantedAuthority> getAuthorities() {
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java
index 2eecd741..fb23405e 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java
@@ -103,7 +103,7 @@ CREATE TABLE `fn_user_role` (
         })
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
+
 @Getter
 @Setter
 @Entity
@@ -113,11 +113,11 @@ public class FnUserRole {
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", columnDefinition = "int(11) auto_increment")
        private Long id;
-       @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "user_id")
        @Valid
        private FnUser userId;
-       @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+       @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "role_id")
        @Valid
        private FnRole roleId;