Coverity Scan issues fix

Coverity Scan issues fix

Issue-ID: PORTAL-710
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
Change-Id: I61649f1c5da83ee6e01745fc636be6de46a66c45
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>

105 files changed, 501 insertions, 343 deletions

diff --git a/portal-BE/Dockerfile b/portal-BE/Dockerfile
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/portal-BE/Dockerfile
diff --git a/portal-BE/src/main/java/org/onap/portal/configuration/SecurityConfig.java b/portal-BE/src/main/java/org/onap/portal/configuration/SecurityConfig.java
index b9e60334..3fae09cf 100644
--- a/portal-BE/src/main/java/org/onap/portal/configuration/SecurityConfig.java
+++ b/portal-BE/src/main/java/org/onap/portal/configuration/SecurityConfig.java
@@ -75,7 +75,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
        protected void configure(HttpSecurity http) throws Exception {
               http
                       .authorizeRequests()
-                      .antMatchers("/static/img/**").permitAll()
+                      .antMatchers("/img/**").permitAll()
                       .anyRequest().authenticated()
                       .and()
                       .formLogin()
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/SchemaInfo.java b/portal-BE/src/main/java/org/onap/portal/domain/db/SchemaInfo.java
index dee9aa5f..32e99ac6 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/SchemaInfo.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/SchemaInfo.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -73,7 +74,7 @@ CREATE TABLE `schema_info` (
 @Getter
 @Setter
 @Entity
-public class SchemaInfo {
+public class SchemaInfo implements Serializable {
        @Id
        @Column(name = "SCHEMA_ID", length = 25, nullable = false)
        @Size(max = 25)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/VUrlAccess.java b/portal-BE/src/main/java/org/onap/portal/domain/db/VUrlAccess.java
index 1638d4ed..9f50f3bd 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/VUrlAccess.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/VUrlAccess.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -66,7 +67,7 @@ import org.hibernate.annotations.Subselect;
         + " from fn_restricted_url r")
 @Getter
 @NoArgsConstructor
-public class VUrlAccess {
+public class VUrlAccess implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", nullable = false)
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 a1d4a9a0..6c8296a7 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
@@ -74,7 +74,7 @@ CREATE TABLE `cr_favorite_reports` (
 @Setter
 @IdClass(CrFavoriteReportsId.class)
 @Entity
-public class CrFavoriteReports {
+public class CrFavoriteReports implements Serializable{
        @Id
        @Column(name = "user_id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFilehistLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFilehistLog.java
index c96806a2..41e7a91c 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFilehistLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFilehistLog.java
@@ -76,7 +76,6 @@ public class CrFilehistLog {
        @Id
        @Column(name = "schedule_id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
-       @Positive
        private Long scheduledId;
        //TODO URL @URL
        @URL
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 1791eae7..44e3902f 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.CascadeType;
@@ -90,7 +91,7 @@ CREATE TABLE `cr_folder` (
 @Getter
 @Setter
 @Entity
-public class CrFolder {
+public class CrFolder implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "folder_id", length = 11, nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolderAccess.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolderAccess.java
index 44507ac2..05ec2465 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolderAccess.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrFolderAccess.java
@@ -41,6 +41,7 @@
 package org.onap.portal.domain.db.cr;
 
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -77,7 +78,7 @@ CREATE TABLE `cr_folder_access` (
 @Getter
 @Setter
 @Entity
-public class CrFolderAccess {
+public class CrFolderAccess implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "folder_access_id", length = 11, nullable = false)
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 21ac92b0..94201c58 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -77,7 +78,7 @@ CREATE TABLE `cr_lu_file_type` (
 @Getter
 @Setter
 @Entity
-public class CrLuFileType {
+public class CrLuFileType implements Serializable {
        @Id
        @Column(name = "lookup_id", length = 2, nullable = false)
        @Digits(integer = 2, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorActionImg.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorActionImg.java
index ed153b42..b81fc3ac 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorActionImg.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorActionImg.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -68,7 +69,7 @@ CREATE TABLE `cr_raptor_action_img` (
 @Getter
 @Setter
 @Entity
-public class CrRaptorActionImg {
+public class CrRaptorActionImg implements Serializable {
        @Id
        @Column(name = "image_id", length = 100, nullable = false)
        @Size(max = 100)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorPdfImg.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorPdfImg.java
index 129e6e09..c75733e6 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorPdfImg.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRaptorPdfImg.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -66,7 +67,7 @@ CREATE TABLE `cr_raptor_pdf_img` (
 @Getter
 @Setter
 @Entity
-public class CrRaptorPdfImg {
+public class CrRaptorPdfImg implements Serializable {
        @Id
        @Column(name = "image_id", length = 100, nullable = false)
        @Size(max = 100)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRemoteSchemaInfo.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRemoteSchemaInfo.java
index 95d991f8..fe6e77ad 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRemoteSchemaInfo.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrRemoteSchemaInfo.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -68,7 +69,7 @@ CREATE TABLE `cr_remote_schema_info` (
 @Getter
 @Setter
 @Entity
-public class CrRemoteSchemaInfo {
+public class CrRemoteSchemaInfo implements Serializable {
        @Id
        @Column(name = "schema_prefix", length = 5, nullable = false)
        @Size(max = 5)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportDwnldLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportDwnldLog.java
index 368bd0ff..5c3a21af 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportDwnldLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportDwnldLog.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -74,7 +75,7 @@ CREATE TABLE `cr_report_dwnld_log` (
 @Getter
 @Setter
 @Entity
-public class CrReportDwnldLog {
+public class CrReportDwnldLog implements Serializable {
        @Id
        @Column(name = "user_id", nullable = false)
        @Digits(integer = 11, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java
index da87cf75..e43c5c76 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -87,7 +88,7 @@ CREATE TABLE `cr_report_email_sent_log` (
 @Getter
 @Setter
 @Entity
-public class CrReportEmailSentLog {
+public class CrReportEmailSentLog implements Serializable {
        @Id
        @Column(name = "log_id", nullable = false)
        @Digits(integer = 11, fraction = 0)
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 510e1958..05696ab6 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.CascadeType;
@@ -104,7 +105,7 @@ CREATE TABLE `cr_report_file_history` (
 @Getter
 @Setter
 @Entity
-public class CrReportFileHistory {
+public class CrReportFileHistory implements Serializable {
        @Id
        @Column(name = "hist_id", nullable = false, length = 11)
        @Digits(integer = 11, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportLog.java
index 95088b62..30a0b27f 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportLog.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -84,7 +85,7 @@ CREATE TABLE `cr_report_log` (
 @Getter
 @Setter
 @Entity
-public class CrReportLog {
+public class CrReportLog implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @JoinColumn(name = "id")
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 6d09aa40..611dd194 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.CascadeType;
@@ -99,7 +100,7 @@ CREATE TABLE `cr_report_schedule` (
 @Getter
 @Setter
 @Entity
-public class CrReportSchedule {
+public class CrReportSchedule implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "schedule_id", length = 11, nullable = false)
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 fe8e4b11..237956c1 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
@@ -82,7 +82,7 @@ CREATE TABLE `cr_report_schedule_users` (
 @Setter
 @Entity
 @IdClass(CrReportScheduleUsersId.class)
-public class CrReportScheduleUsers {
+public class CrReportScheduleUsers implements Serializable{
        @Id
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "schedule_id", nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java
index 88f056bf..a886bfd4 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -67,7 +68,7 @@ CREATE TABLE `cr_report_template_map` (
 @Getter
 @Setter
 @Entity
-public class CrReportTemplateMap {
+public class CrReportTemplateMap implements Serializable {
        @Id
        @Column(name = "report_id", nullable = false)
        @NotNull
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java
index d6f8ac6e..015a4771 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -69,7 +70,7 @@ CREATE TABLE `cr_schedule_activity_log` (
 @Getter
 @Setter
 @Entity
-public class CrScheduleActivityLog {
+public class CrScheduleActivityLog implements Serializable {
        @Id
        @Column(name = "schedule_id", nullable = false)
        @Digits(integer = 11, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableJoin.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableJoin.java
index b4881ca6..eb1117cb 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableJoin.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableJoin.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -82,7 +83,7 @@ CREATE TABLE `cr_table_join` (
 @Getter
 @Setter
 @Entity
-public class CrTableJoin {
+public class CrTableJoin implements Serializable {
        //TODO Unique constrains {srcTableName, destTableName}?
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
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 445e87aa..7b6a3013 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
@@ -78,7 +78,7 @@ CREATE TABLE `cr_table_role` (
 @Setter
 @Entity
 @IdClass(CrTableRoleId.class)
-public class CrTableRole {
+public class CrTableRole implements Serializable{
        @Id
        @Valid
        @JoinColumn(name = "table_name", nullable = false)
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 ebe15c40..791e5617 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.cr;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -76,7 +77,7 @@ CREATE TABLE `cr_table_source` (
 @Getter
 @Setter
 @Entity
-public class CrTableSource {
+public class CrTableSource implements Serializable {
        @Id
        @Column(name = "table_name", length = 30, nullable = false)
        @Size(max = 30)
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 0f2f9500..d37c71ec 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
@@ -84,7 +84,7 @@ CREATE TABLE `ep_app_function` (
 @IdClass(EpAppFunctionId.class)
 @NoArgsConstructor
 @AllArgsConstructor
-public class EpAppFunction {
+public class EpAppFunction implements Serializable{
        @Id
        @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
        @JoinColumn(name = "app_id")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java
index c41c55f4..8a60688b 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java
@@ -41,6 +41,7 @@
 package org.onap.portal.domain.db.ep;
 
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -91,7 +92,7 @@ CREATE TABLE `ep_app_role_function` (
 @Getter
 @Setter
 @Entity
-public class EpAppRoleFunction {
+public class EpAppRoleFunction implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) NOT NULL AUTO_INCREMENT")
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 130e987f..c65c0d34 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -77,7 +78,7 @@ CREATE TABLE `ep_basic_auth_account` (
 @Getter
 @Setter
 @Entity
-public class EpBasicAuthAccount {
+public class EpBasicAuthAccount implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
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 ed1fabdf..ccb1bb29 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -74,7 +75,7 @@ CREATE TABLE `ep_endpoints` (
 @Getter
 @Setter
 @Entity
-public class EpEndpoints {
+public class EpEndpoints implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpointsBasicAuthAccount.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpointsBasicAuthAccount.java
index 63411860..9cf7d36b 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpointsBasicAuthAccount.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpEndpointsBasicAuthAccount.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -92,7 +93,7 @@ CREATE TABLE `ep_endpoints_basic_auth_account` (
 @Getter
 @Setter
 @Entity
-public class EpEndpointsBasicAuthAccount {
+public class EpEndpointsBasicAuthAccount implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
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 2388c53e..6c6b39cc 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -88,11 +89,10 @@ CREATE TABLE `ep_microservice` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-
 @Getter
 @Setter
 @Entity
-public class EpMicroservice {
+public class EpMicroservice implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false)
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 30de49a5..1c73d962 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -86,11 +87,10 @@ CREATE TABLE `ep_microservice_parameter` (
 })
 @NoArgsConstructor
 @AllArgsConstructor
-
 @Getter
 @Setter
 @Entity
-public class EpMicroserviceParameter {
+public class EpMicroserviceParameter implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
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 d865fa41..3d929d84 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,12 +69,11 @@ CREATE TABLE `ep_ml_model` (
 @Table(name = "ep_ml_model")
 @NoArgsConstructor
 @AllArgsConstructor
-
 @Getter
 @Setter
 @Entity
 @IdClass(EpMlModelId.class)
-public class EpMlModel {
+public class EpMlModel implements Serializable{
        @Id
        @Digits(integer = 11, fraction = 0)
        @Column(name = "group_id", length = 11, nullable = false)
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 08c5fdf7..6422a27a 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
@@ -69,12 +69,11 @@ CREATE TABLE `ep_ml_rec` (
 @Table(name = "ep_ml_rec")
 @NoArgsConstructor
 @AllArgsConstructor
-
 @Getter
 @Setter
 @Entity
 @IdClass(EpMlRecId.class)
-public class EpMlRec {
+public class EpMlRec implements Serializable{
        @Id
        @Column(name = "time_stamp", nullable = false, columnDefinition = "datetime DEFAULT current_timestamp()")
        private LocalDateTime timeStamp;
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 c47f3d31..7febda8f 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
@@ -71,12 +71,11 @@ CREATE TABLE `ep_ml_user` (
 @Table(name = "ep_ml_user")
 @NoArgsConstructor
 @AllArgsConstructor
-
 @Getter
 @Setter
 @Entity
 @IdClass(EpMlUserId.class)
-public class EpMlUser {
+public class EpMlUser implements Serializable{
        @Id
        @Column(name = "time_stamp", nullable = false, columnDefinition = "datetime DEFAULT current_timestamp()")
        private LocalDateTime timeStamp;
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 12c161f6..424f61b8 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.CascadeType;
@@ -88,7 +89,7 @@ CREATE TABLE `ep_notification` (
 @Getter
 @Setter
 @Entity
-public class EpNotification {
+public class EpNotification implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "notification_ID", length = 11, nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java
index 5f6e9799..1976533e 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -90,7 +91,7 @@ CREATE TABLE `ep_pers_user_app_sort` (
 @Getter
 @Setter
 @Entity
-public class EpPersUserAppSort {
+public class EpPersUserAppSort implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java
index 060ca425..b1e472f8 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -95,7 +96,7 @@ CREATE TABLE `ep_pers_user_widget_placement` (
 @Getter
 @Setter
 @Entity
-public class EpPersUserWidgetPlacement {
+public class EpPersUserWidgetPlacement implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java
index 6c439c8b..a8bc7e9c 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -84,7 +85,7 @@ CREATE TABLE `ep_pers_user_widget_sel` (
 @Getter
 @Setter
 @Entity
-public class EpPersUserWidgetSel {
+public class EpPersUserWidgetSel implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java
index 80f8676b..94df52d5 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -84,7 +85,7 @@ CREATE TABLE `ep_role_notification` (
 @Getter
 @Setter
 @Entity
-public class EpRoleNotification {
+public class EpRoleNotification implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "ID", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java
index 47e195a4..15bb2b9a 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -88,7 +89,7 @@ CREATE TABLE `ep_user_notification` (
 @Getter
 @Setter
 @Entity
-public class EpUserNotification {
+public class EpUserNotification implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "ID", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
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 13d26f71..52d06b2a 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.CascadeType;
@@ -88,7 +89,7 @@ CREATE TABLE `ep_user_roles_request` (
 @Getter
 @Setter
 @Entity
-public class EpUserRolesRequest {
+public class EpUserRolesRequest implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "req_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java
index 1b27ee7b..76044530 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -86,7 +87,7 @@ CREATE TABLE `ep_user_roles_request_det` (
 @Getter
 @Setter
 @Entity
-public class EpUserRolesRequestDet {
+public class EpUserRolesRequestDet implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java
index 1a15518f..429bac1b 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -82,7 +83,7 @@ CREATE TABLE `ep_web_analytics_source` (
 @Getter
 @Setter
 @Entity
-public class EpWebAnalyticsSource {
+public class EpWebAnalyticsSource implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "resource_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
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 a125e1d1..a19af285 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -82,7 +83,7 @@ CREATE TABLE `ep_widget_catalog` (
 @Getter
 @Setter
 @Entity
-public class EpWidgetCatalog {
+public class EpWidgetCatalog implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "widget_id", length = 11, nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogFiles.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogFiles.java
index db9fc152..fe91d235 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogFiles.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogFiles.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -74,7 +75,7 @@ CREATE TABLE `ep_widget_catalog_files` (
 @Getter
 @Setter
 @Entity
-public class EpWidgetCatalogFiles {
+public class EpWidgetCatalogFiles implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "file_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java
index c63245cc..3e6e1c6c 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -89,7 +90,7 @@ CREATE TABLE `ep_widget_catalog_parameter` (
 @Getter
 @Setter
 @Entity
-public class EpWidgetCatalogParameter {
+public class EpWidgetCatalogParameter implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java
index d2191814..b226b92d 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -83,8 +84,7 @@ CREATE TABLE `ep_widget_catalog_role` (
 @Getter
 @Setter
 @Entity
-//TODO there is something wrong with "KEY"
-public class EpWidgetCatalogRole {
+public class EpWidgetCatalogRole implements Serializable {
        @Id
        @Column(name = "id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetPreviewFiles.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetPreviewFiles.java
index b66ef624..d96524e1 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetPreviewFiles.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetPreviewFiles.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.ep;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -69,7 +70,7 @@ CREATE TABLE `ep_widget_preview_files` (
 @Getter
 @Setter
 @Entity
-public class EpWidgetPreviewFiles {
+public class EpWidgetPreviewFiles implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "preview_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditAction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditAction.java
index d85ee2ae..da60049b 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditAction.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditAction.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -73,7 +74,7 @@ CREATE TABLE `fn_audit_action` (
 @Getter
 @Setter
 @Entity
-public class FnAuditAction {
+public class FnAuditAction implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "role_id", nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditActionLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditActionLog.java
index ccea932e..df73f42c 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditActionLog.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnAuditActionLog.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -76,7 +77,7 @@ CREATE TABLE `fn_audit_action_log` (
 @Getter
 @Setter
 @Entity
-public class FnAuditActionLog {
+public class FnAuditActionLog implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
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 469fb74a..911f32a2 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -88,7 +89,7 @@ CREATE TABLE `fn_audit_log` (
 @Getter
 @Setter
 @Entity
-public class FnAuditLog {
+public class FnAuditLog implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "log_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnBroadcastMessage.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnBroadcastMessage.java
index c863fcbd..e9cfc20d 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnBroadcastMessage.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnBroadcastMessage.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -77,7 +78,7 @@ CREATE TABLE `fn_broadcast_message` (
 @Getter
 @Setter
 @Entity
-public class FnBroadcastMessage {
+public class FnBroadcastMessage implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java
index 93a07f1c..d57bfd33 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -69,7 +70,7 @@ CREATE TABLE `fn_chat_logs` (
 @Getter
 @Setter
 @Entity
-public class FnChatLogs {
+public class FnChatLogs implements Serializable {
        @Id
        @Column(name = "chat_log_id", nullable = false)
        private Long chatLogId;
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatRoom.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatRoom.java
index c61d9f19..abf96539 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatRoom.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatRoom.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -74,7 +75,7 @@ CREATE TABLE `fn_chat_room` (
 @Getter
 @Setter
 @Entity
-public class FnChatRoom {
+public class FnChatRoom implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "chat_room_id", nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatUsers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatUsers.java
index 85e9b59a..c0e28143 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatUsers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatUsers.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -72,7 +73,7 @@ CREATE TABLE `fn_chat_users` (
 @Getter
 @Setter
 @Entity
-public class FnChatUsers {
+public class FnChatUsers implements Serializable {
        @Id
        @Column(name = "id", length = 11, nullable = false)
        @Digits(integer = 11, fraction = 0)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnCommonWidgetData.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnCommonWidgetData.java
index ac8f23c4..1255aa1d 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnCommonWidgetData.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnCommonWidgetData.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -73,7 +74,7 @@ CREATE TABLE `fn_common_widget_data` (
 @Getter
 @Setter
 @Entity
-public class FnCommonWidgetData {
+public class FnCommonWidgetData implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDatasource.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDatasource.java
index 73dfa8a0..87ee3592 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDatasource.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDatasource.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -81,7 +82,7 @@ CREATE TABLE `fn_datasource` (
 @Getter
 @Setter
 @Entity
-public class FnDatasource {
+public class FnDatasource implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "message_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDisplayText.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDisplayText.java
index e79126c4..348cf9ec 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDisplayText.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnDisplayText.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -71,7 +72,7 @@ CREATE TABLE `fn_display_text` (
 @Getter
 @Setter
 @Entity
-public class FnDisplayText {
+public class FnDisplayText implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
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 41ac1d6b..3375fd09 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -70,7 +71,7 @@ CREATE TABLE `fn_function` (
 @Getter
 @Setter
 @Entity
-public class FnFunction {
+public class FnFunction implements Serializable {
        @Id
        @Column(name = "function_cd", length = 30, nullable = false)
        @Size(max = 30)
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 57fd9993..2a81ea01 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,6 +41,7 @@
 package org.onap.portal.domain.db.fn;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -78,7 +79,7 @@ CREATE TABLE `fn_language` (
 @Entity
 @JsonInclude()
 @SequenceGenerator(name="seq", initialValue=1000, allocationSize=100000)
-public class FnLanguage {
+public class FnLanguage implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "seq")
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 6b0b47c5..f4d0d709 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -70,7 +71,7 @@ CREATE TABLE `fn_lu_activity` (
 @Getter
 @Setter
 @Entity
-public class FnLuActivity {
+public class FnLuActivity implements Serializable {
        @Id
        @Column(name = "activity_cd", length = 50, nullable = false)
        @Size(max = 50)
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 6ee07167..740f052b 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -70,7 +71,7 @@ CREATE TABLE `fn_lu_alert_method` (
 @Getter
 @Setter
 @Entity
-public class FnLuAlertMethod {
+public class FnLuAlertMethod implements Serializable {
        @Id
        @Column(name = "alert_method_cd", length = 10, nullable = false)
        @Size(max = 50)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuBroadcastSite.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuBroadcastSite.java
index 6d1c723e..b0d16e58 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuBroadcastSite.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuBroadcastSite.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -65,7 +66,7 @@ CREATE TABLE `fn_lu_broadcast_site` (
 @Getter
 @Setter
 @Entity
-public class FnLuBroadcastSite {
+public class FnLuBroadcastSite implements Serializable {
        @Id
        @Column(name = "broadcast_site_cd", length = 50, nullable = false)
        @Size(max = 50)
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 3ac88232..ff5e4736 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -72,7 +73,7 @@ CREATE TABLE `fn_lu_menu_set` (
 @Getter
 @Setter
 @Entity
-public class FnLuMenuSet {
+public class FnLuMenuSet implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuPriority.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuPriority.java
index 1c96abb7..4e5e2335 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuPriority.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuPriority.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -72,7 +73,7 @@ CREATE TABLE `fn_lu_priority` (
 @Getter
 @Setter
 @Entity
-public class FnLuPriority {
+public class FnLuPriority implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "priority_id", nullable = false, length = 11)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java
index 9f500219..525ba0de 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -67,7 +68,7 @@ CREATE TABLE `fn_lu_role_type` (
 @Getter
 @Setter
 @Entity
-public class FnLuRoleType {
+public class FnLuRoleType implements Serializable {
        @Id
        @Column(name = "role_type_id", nullable = false, length = 11)
        @Digits(integer = 11, fraction = 0)
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 c8c7be22..06e982ca 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -70,7 +71,7 @@ CREATE TABLE `fn_lu_tab_set` (
 @Getter
 @Setter
 @Entity
-public class FnLuTabSet {
+public class FnLuTabSet implements Serializable {
        @Id
        @Column(name = "tab_set_cd", length = 30, nullable = false)
        @Size(max = 30)
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 53b54f41..54b4bc5c 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -73,7 +74,7 @@ CREATE TABLE `fn_lu_timezone` (
 @Getter
 @Setter
 @Entity
-public class FnLuTimezone {
+public class FnLuTimezone implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "timezone_id", length = 11, nullable = false)
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 3ba60c78..7407213c 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -101,7 +102,7 @@ CREATE TABLE `fn_menu` (
 @Getter
 @Setter
 @Entity
-public class FnMenu {
+public class FnMenu implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "menu_id", nullable = false, length = 11, columnDefinition = "int(11) auto_increment")
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 cd9a362d..e348a01f 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -89,7 +90,7 @@ CREATE TABLE `fn_menu_functional` (
 @Getter
 @Setter
 @Entity
-public class FnMenuFunctional {
+public class FnMenuFunctional implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "menu_id", nullable = false, length = 11)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalAncestors.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalAncestors.java
index 5dd037f5..309f11ea 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalAncestors.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalAncestors.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -81,7 +82,7 @@ CREATE TABLE `fn_menu_functional_ancestors` (
 @Getter
 @Setter
 @Entity
-public class FnMenuFunctionalAncestors {
+public class FnMenuFunctionalAncestors implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", nullable = false, length = 11, columnDefinition = "int(11)  AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalRoles.java
index c1ed7514..3e9ae0e0 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalRoles.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnMenuFunctionalRoles.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -85,7 +86,7 @@ CREATE TABLE `fn_menu_functional_roles` (
 @Getter
 @Setter
 @Entity
-public class FnMenuFunctionalRoles {
+public class FnMenuFunctionalRoles implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", nullable = false, length = 11, columnDefinition = "int(11) AUTO_INCREMENT")
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 46f9dcc3..310c3619 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -79,7 +80,7 @@ CREATE TABLE `fn_org` (
 @Getter
 @Setter
 @Entity
-public class FnOrg {
+public class FnOrg implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "org_id", nullable = false, length = 11)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnPersUserAppSel.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnPersUserAppSel.java
index 8aead523..1da9c219 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnPersUserAppSel.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnPersUserAppSel.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -85,7 +86,7 @@ CREATE TABLE `fn_pers_user_app_sel` (
 @Getter
 @Setter
 @Entity
-public class FnPersUserAppSel extends DomainVo {
+public class FnPersUserAppSel extends DomainVo implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
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 c110fdc6..1c5c3b5d 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -81,7 +82,7 @@ CREATE TABLE `fn_qz_blob_triggers` (
 @Setter
 @Entity
 @IdClass(FnQzTriggersId.class)
-public class FnQzBlobTriggers {
+public class FnQzBlobTriggers implements Serializable {
        @Id
        @ManyToOne
        @JoinColumns(value = {
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 d13ac345..a3499247 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
@@ -73,7 +73,7 @@ CREATE TABLE `fn_qz_calendars` (
 @Setter
 @Entity
 @IdClass(FnQzCalendarsId.class)
-public class FnQzCalendars {
+public class FnQzCalendars implements Serializable{
        @Id
        @SafeHtml
        @Column(name = "SCHED_NAME", length = 120, insertable = false, updatable = false)
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 4013e4f6..84c11629 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -77,7 +78,7 @@ CREATE TABLE `fn_qz_cron_triggers` (
 @Setter
 @Entity
 @IdClass(FnQzTriggersId.class)
-public class FnQzCronTriggers {
+public class FnQzCronTriggers implements Serializable {
        @Id
        @ManyToOne
        @JoinColumns(value = {
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 e4c15d28..77583fd8 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
@@ -100,7 +100,7 @@ CREATE TABLE `fn_qz_fired_triggers` (
 @Setter
 @Entity
 @IdClass(FnQzFiredTriggersID.class)
-public class FnQzFiredTriggers {
+public class FnQzFiredTriggers implements Serializable{
        @Id
        @Size(max = 120)
        @SafeHtml
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 04426353..5da7b4fa 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
@@ -90,7 +90,7 @@ CREATE TABLE `fn_qz_job_details` (
 @Setter
 @Entity
 @IdClass(FnQzJobDetailsID.class)
-public class FnQzJobDetails {
+public class FnQzJobDetails implements Serializable{
        @Id
        @SafeHtml
        @Size(max = 120)
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 cee0ebae..72558b52 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
@@ -71,7 +71,7 @@ CREATE TABLE `fn_qz_locks` (
 @Setter
 @Entity
 @IdClass(FnQzLocksID.class)
-public class FnQzLocks {
+public class FnQzLocks implements Serializable{
        @Id
        @Size(max = 120)
        @SafeHtml
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 38c65400..4e515f6b 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
@@ -71,7 +71,7 @@ CREATE TABLE `fn_qz_paused_trigger_grps` (
 @Setter
 @Entity
 @IdClass(FnQzPausedTriggerGrpsID.class)
-public class FnQzPausedTriggerGrps {
+public class FnQzPausedTriggerGrps implements Serializable{
        @Id
        @Size(max = 120)
        @SafeHtml
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 b9005a66..3c00f959 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
@@ -76,7 +76,7 @@ CREATE TABLE `fn_qz_scheduler_state` (
 @Setter
 @Entity
 @IdClass(FnQzSchedulerStateID.class)
-public class FnQzSchedulerState {
+public class FnQzSchedulerState implements Serializable{
        @Id
        @Size(max = 120)
        @SafeHtml
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 6c1f355f..6f67381f 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -80,7 +81,7 @@ CREATE TABLE `fn_qz_simple_triggers` (
 @Setter
 @Entity
 @IdClass(FnQzTriggersId.class)
-public class FnQzSimpleTriggers {
+public class FnQzSimpleTriggers implements Serializable {
        @Id
        @ManyToOne
        @JoinColumns(value = {
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 378705c9..f1a42275 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -87,7 +88,7 @@ CREATE TABLE `fn_qz_simprop_triggers` (
 @Setter
 @Entity
 @IdClass(FnQzTriggersId.class)
-public class FnQzSimpropTriggers {
+public class FnQzSimpropTriggers implements Serializable {
        @Id
        @ManyToOne
        @JoinColumns(value = {
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java
index 526de117..35fb1307 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.math.BigInteger;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -116,7 +117,7 @@ CREATE TABLE `fn_qz_triggers` (
 @Setter
 @Entity
 @IdClass(FnQzTriggersId.class)
-public class FnQzTriggers {
+public class FnQzTriggers implements Serializable {
        @ManyToOne
        @JoinColumns(value = {
                @JoinColumn(name = "SCHED_NAME", referencedColumnName = "SCHED_NAME"),
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 35b619cf..74e81ebe 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
@@ -80,7 +80,7 @@ CREATE TABLE `fn_restricted_url` (
 @Setter
 @Entity
 @IdClass(FnRestrictedUrlId.class)
-public class FnRestrictedUrl {
+public class FnRestrictedUrl implements Serializable{
        @Column(name = "restricted_url", length = 250, nullable = false)
        @Size(max = 250)
        @SafeHtml
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 05c3cf08..57d90797 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,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -121,7 +122,7 @@ CREATE TABLE `fn_role` (
 @Getter
 @Setter
 @Entity
-public class FnRole extends DomainVo {
+public class FnRole extends DomainVo implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleFunction.java
index b62e8c22..944d7395 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleFunction.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleFunction.java
@@ -81,7 +81,7 @@ CREATE TABLE `fn_role_function` (
 @Setter
 @Entity
 @IdClass(FnRoleFunctionId.class)
-public class FnRoleFunction {
+public class FnRoleFunction implements Serializable{
 
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "role_Id", nullable = false)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleV.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleV.java
index 7eb96d6f..e1c4cded 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleV.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRoleV.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.math.BigInteger;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -62,7 +63,7 @@ import org.hibernate.annotations.Subselect;
         + " from fn_role where isnull(fn_role.app_id)")
 @Getter
 @NoArgsConstructor
-public class FnRoleV {
+public class FnRoleV implements Serializable {
        @Id
        @Column(name = "role_id")
        private Integer roleId;
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnScheduleWorkflows.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnScheduleWorkflows.java
index e361b113..620532ee 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnScheduleWorkflows.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnScheduleWorkflows.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
@@ -79,7 +80,7 @@ CREATE TABLE `fn_schedule_workflows` (
 @Getter
 @Setter
 @Entity
-public class FnScheduleWorkflows {
+public class FnScheduleWorkflows implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id_schedule_workflows", nullable = false, length = 25, columnDefinition = "bigint(25) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnSharedContext.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnSharedContext.java
index 48045701..7c021837 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnSharedContext.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnSharedContext.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -78,7 +79,7 @@ CREATE TABLE `fn_shared_context` (
 @Getter
 @Setter
 @Entity
-public class FnSharedContext {
+public class FnSharedContext implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", nullable = false, length = 11, columnDefinition = "int(11) AUTO_INCREMENT")
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 bfc7834c..634fb649 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Set;
 import javax.persistence.CascadeType;
@@ -91,7 +92,7 @@ CREATE TABLE `fn_tab` (
 @Getter
 @Setter
 @Entity
-public class FnTab {
+public class FnTab implements Serializable {
        @Id
        @Column(name = "tab_cd", length = 30, nullable = false)
        @Size(max = 30)
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 f62668e1..14b243dd 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
@@ -78,7 +78,7 @@ CREATE TABLE `fn_tab_selected` (
 @Setter
 @Entity
 @IdClass(FnTabSelectedId.class)
-public class FnTabSelected {
+public class FnTabSelected implements Serializable{
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "selected_tab_cd", nullable = false)
        @NotNull
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 1c3435df..029420d3 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.Set;
@@ -181,7 +182,7 @@ CREATE TABLE `fn_user` (
 @AllArgsConstructor
 @DynamicUpdate
 @SequenceGenerator(name = "seq", initialValue = 1000, allocationSize = 100000)
-public class FnUser extends DomainVo implements UserDetails {
+public class FnUser extends DomainVo implements UserDetails, Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "seq")
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 da709e31..390ef8b4 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
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -106,7 +107,7 @@ CREATE TABLE `fn_user_role` (
 @Getter
 @Setter
 @Entity
-public class FnUserRole {
+public class FnUserRole implements Serializable {
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnWorkflow.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnWorkflow.java
index da8619df..b5a4ecb6 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnWorkflow.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnWorkflow.java
@@ -40,6 +40,7 @@
 
 package org.onap.portal.domain.db.fn;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -82,7 +83,7 @@ CREATE TABLE `fn_workflow` (
 @Getter
 @Setter
 @Entity
-public class FnWorkflow {
+public class FnWorkflow implements Serializable {
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", nullable = false, length = 9, columnDefinition = "mediumint(9) AUTO_INCREMENT")
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java
index df99ed87..98a0d05b 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java
@@ -108,4 +108,22 @@ public class DomainVo extends FusionVo implements Serializable, Cloneable, Compa
        public Object clone() throws CloneNotSupportedException {
               return super.clone();
        }
+
+       public boolean equals(Object other) {
+              if (this == other) {
+                     return true;
+              } else if (other == null) {
+                     return false;
+              } else if (!(other instanceof DomainVo)) {
+                     return false;
+              } else {
+                     DomainVo castOther = (DomainVo)other;
+                     return this.getId().equals(castOther.getId())
+                             && this.getCreated().equals(castOther.getCreated())
+                             && this.getCreatedId().equals(castOther.getCreatedId())
+                             && this.getModified().equals(castOther.getModified())
+                             && this.getModifiedId() == castOther.getModifiedId();
+              }
+       }
+
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java
index 17f63823..438d3932 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java
@@ -46,7 +46,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.portal.domain.dto.DomainVo;
 
 @Getter
 @Setter
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java
index 8cc3a5a5..ed07408a 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java
@@ -60,14 +60,13 @@ public class CentralV2UserApp implements Serializable, Comparable {
     private CentralV2Role role;
     private Integer priority;
 
-    public int compareTo(Object other) {
-        CentralV2UserApp castOther = (CentralV2UserApp) other;
-
-        Long c1 = (this.getUserId() == null ? 0 : this.getUserId()) + (this.priority == null ? 0 : this.priority);
-        Long c2 = (castOther.getUserId() == null ? 0 : castOther.getUserId());
-        c2 += (castOther.getApp() == null || castOther.getApp().getId() == null ? 0 : castOther.getApp().getId());
-        c2 += (castOther.priority == null ? 0 : castOther.priority);
+	public int compareTo(Object other){
+		CentralV2UserApp castOther = (CentralV2UserApp) other;
 
+		Long c1 = (this.getUserId() == null ? 0 : this.getUserId()) + (this.priority == null ? 0 : this.priority);
+		Long c2 = (castOther.getUserId() == null ? 0 : castOther.getUserId());
+		c2 += (castOther.getApp() == null || castOther.getApp().getId() == null ? 0 : castOther.getApp().getId());
+		c2 += (castOther.priority == null ? 0 : castOther.priority);
         return c1.compareTo(c2);
     }
 
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java
index f06e517b..c9fce6d2 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java
@@ -50,7 +50,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.validator.constraints.SafeHtml;
-import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.portal.domain.dto.DomainVo;
 
 
 @Getter
@@ -59,7 +59,7 @@ import org.onap.portalsdk.core.domain.support.DomainVo;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class CommonWidget extends DomainVo{
+public class CommonWidget extends DomainVo {
 
 	private static final long serialVersionUID = 7897021982887364557L;
 
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java
index 2efc3dc2..a3f8af6e 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java
@@ -53,13 +53,13 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.validator.constraints.SafeHtml;
-import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.portal.domain.dto.DomainVo;
 
 @Getter
 @Setter
 @Builder
 @ToString
-@EqualsAndHashCode()
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @AllArgsConstructor
 public class EpNotificationItem extends DomainVo {
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java
index 6f36dd71..3c80e167 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java
@@ -45,7 +45,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.portal.domain.dto.DomainVo;
 
 @Getter
 @Setter
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java
index 248ad732..1f6f1619 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java
@@ -45,7 +45,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.portal.domain.dto.DomainVo;
 
 @Getter
 @Setter
diff --git a/portal-BE/src/main/java/org/onap/portal/logging/format/EPAppMessagesEnum.java b/portal-BE/src/main/java/org/onap/portal/logging/format/EPAppMessagesEnum.java
index d7fbe052..d4bd55f1 100644
--- a/portal-BE/src/main/java/org/onap/portal/logging/format/EPAppMessagesEnum.java
+++ b/portal-BE/src/main/java/org/onap/portal/logging/format/EPAppMessagesEnum.java
@@ -46,10 +46,8 @@ import org.onap.portalsdk.core.logging.format.ErrorSeverityEnum;
 import org.onap.portalsdk.core.logging.format.ErrorTypeEnum;
 
 /**
- * 
- * Add ONAP Portal Specific Error Code Enums here, for generic
- * ones (ones you think are useful not only Portal but also SDK), add it
- * to the enum class AppMessagesEnum defined in SDK.
+ * Add ONAP Portal Specific Error Code Enums here, for generic ones (ones you think are useful not only Portal but also
+ * SDK), add it to the enum class AppMessagesEnum defined in SDK.
  */
 public enum EPAppMessagesEnum implements EELFResolvableErrorEnum {
 	/*
@@ -81,227 +79,303 @@ public enum EPAppMessagesEnum implements EELFResolvableErrorEnum {
 	900-999 Unknown Errors 
 										- Unexpected exception
 										*/
-	
-	BeUebAuthenticationError(EPErrorCodesEnum.BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-								"ERR100E", "An Authentication failure occurred during access to UEB server", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
-	
-	BeRestApiAuthenticationError(EPErrorCodesEnum.BERESTAPIAUTHENTICATIONERROR, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-								"ERR101E", "Rejected an incoming REST API request due to invalid credentials", "", "Please check application credentials defined in Database or properties files."),
-
-	InternalAuthenticationInfo(EPErrorCodesEnum.INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-								"ERR199I", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
-	
-	InternalAuthenticationWarning(EPErrorCodesEnum.INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
-								"ERR199W", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
-	
-	InternalAuthenticationError(EPErrorCodesEnum.INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-								"ERR199E", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
-	
-	InternalAuthenticationFatal(EPErrorCodesEnum.INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
-								"ERR199F", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
-	
-	BeHealthCheckError(EPErrorCodesEnum.BeHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-								"ERR200E", "ECOMP-PORTAL Back-end probably lost connectivity to either one of the following components: MySQL DB, UEB Cluster", "", "Please check the logs for more information."),
-
-	BeHealthCheckMySqlError(EPErrorCodesEnum.BEHEALTHCHECKMYSQLERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-								"ERR201E", "ECOMP-PORTAL Back-end probably lost connectivity to MySQL DB", "", "Check connectivity to MYSQL is configured correctly under system.properties file."),
-
-	BeHealthCheckUebClusterError(EPErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-								"ERR203E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "", "Check connectivity to UEB cluster which is configured under portal.properties file."),
-	
-	FeHealthCheckError(EPErrorCodesEnum.FEHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-								"ERR204E", "Unable to connect to a valid ECOMP-PORTAL Back-end Server.", "", "Please check connectivity from this FE instance towards BE or BE Load Balancer."),
-	
-	BeHealthCheckRecovery(EPErrorCodesEnum.BEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-								"ERR205I", "ECOMP-PORTAL Back-end Recovery to either one of the following components: MySQL DB, UEB Cluster", "", "Please check logs for more specific information about the problem."),
-	
-	BeHealthCheckMySqlRecovery(EPErrorCodesEnum.BEHEALTHCHECKMYSQLRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-								"ERR206I", "ECOMP-PORTAL Back-end connection recovery to MySQL DB", "", "Please check logs for more specific information about the problem."),
-	
-	BeHealthCheckUebClusterRecovery(EPErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-								"ERR208I", "ECOMP-PORTAL Back-end connection recovery to UEB Cluster", "", "Please check logs for more specific information about the problem."),
-	
-	FeHealthCheckRecovery(EPErrorCodesEnum.FEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-								"ERR209I", "Connectivity to ECOMP-PORTAL Front-end Server is recovered", "", "Please check logs for more specific information about the problem."),
-    
-	BeUebConnectionError(EPErrorCodesEnum.BEUEBCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR210E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
-    
-    BeUebUnkownHostError(EPErrorCodesEnum.BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR211E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Cannot reach host: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
-	
-    BeUebRegisterOnboardingAppError(EPErrorCodesEnum.BEUEBREGISTERONBOARDINGAPPERROR, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR212E", "Failed to register the On-boarding application with UEB Communication server", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
-    
-    BeHttpConnectionError(EPErrorCodesEnum.BEHTTPCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-								"ERR213E", "It could be that communication to an external application might resulted an exception or failed to reach the external application", 
-								"Details: {0}.", "Please check logs for more information."),
-	MusicHealthCheckZookeeperError(EPErrorCodesEnum.MUSICHEALTHCHECKZOOKEEPERERROR_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-                                "ERR214E", "Connectivity to Music Cluster -zookeeper server", "Details: {0}.", "Please check zookeeper server list and check the logs for more information"),
-	
-    MusicHealthCheckCassandraError(EPErrorCodesEnum.MUSICHEALTHCHECKCASSANDRAERROR_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-                                "ERR215E", "Connectivity to Music Cluster -Cassandra server", "Details: {0}.", "Please check Cassandra server list and check the logs for more information"),
-    
-    InternalConnectionInfo(EPErrorCodesEnum.INTERNALCONNECTIONINFO_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-								"ERR299I", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
-    
-	InternalConnectionWarning(EPErrorCodesEnum.INTERNALCONNECTIONWARNING_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
-								"ERR299W", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
-    
-    InternalConnectionError(EPErrorCodesEnum.INTERNALCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR299E", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
-    
-    InternalConnectionFatal(EPErrorCodesEnum.INTERNALCONNECTIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
-    							"ERR299F", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
-    
-    BeUebObjectNotFoundError(EPErrorCodesEnum.BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR303E", "Error occurred during access to U-EB Server.", "Data not found: {0}.", "An error occurred during access to UEB Server, {1} failed to either register or unregister to/from UEB topic."),
-    
-    BeUserMissingError(EPErrorCodesEnum.BEUSERMISSINGERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR310E", "User is not found", "", "User {0} must be added to the corresponding application with proper user roles."),
-    
-    BeUserInactiveWarning(EPErrorCodesEnum.BEUSERINACTIVEWARNING_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
-    							"ERR313W", "User is found but in-active", "", "User {0} must be added to the corresponding application with proper user roles."),
-    
-    BeUserAdminPrivilegesInfo(EPErrorCodesEnum.BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
-    							"ERR314W", "User is found but don't have administrative privileges", "", "User {0} should be given administrator role for the corresponding application to perform the necessary actions."),
-    
-    BeInvalidJsonInput(EPErrorCodesEnum.BEINVALIDJSONINPUT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR405E", "Failed to convert JSON input to object", "", "Please check logs for more information."),
-    
-    BeIncorrectHttpStatusError(EPErrorCodesEnum.BEINCORRECTHTTPSTATUSERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR407E", "Communication to an external application is resulted in with Incorrect Http response code", "", "Please check logs for more information."),
-    
-    BeInitializationError(EPErrorCodesEnum.BEINITIALIZATIONERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-    							"ERR500E", "ECOMP-PORTAL Back-end was not initialized properly", "", "Please check logs for more information."),
-    
-    BeUebSystemError(EPErrorCodesEnum.BEUEBSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR502E", "Error occurred during access to U-EB Server", "Details: {0}.", "An error occurred in {1} distribution mechanism. Please check the logs for more information."),
-    
-    BeDaoSystemError(EPErrorCodesEnum.BEDAOSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-    							"ERR505E", "Performing DDL or DML operations on database might have failed", "", "Please check MySQL DB health or look at the logs for more details."),
-    
-    BeSystemError(EPErrorCodesEnum.BESYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-    							"ERR506E", "Unexpected error during operation", "", "Please check logs for more information."),
-    
-    BeExecuteRollbackError(EPErrorCodesEnum.BEEXECUTEROLLBACKERROR, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR507E", "Roll-back operation towards database has failed", "", "Please check MYSQL DB health or look at the logs for more details."),
-    
-    FeHttpLoggingError(EPErrorCodesEnum.FEHTTPLOGGINGERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.ERROR,
-    							"ERR517E", "Error when logging FE HTTP request/response", "", "Please check MYSQL DB health or look at the logs for more details."),
-    
-	FePortalServletError(EPErrorCodesEnum.FEPORTALSERVLETERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-								"ERR518E", "Error when trying to access FE Portal page.", "", "Please check logs for more information."),
-	
-    BeDaoCloseSessionError(EPErrorCodesEnum.BEDAOCLOSESESSIONERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR519E", "Close local session operation with database failed", "", "Please check MYSQL DB health or look at the logs form more details."),
-    
-    BeRestApiGeneralError(EPErrorCodesEnum.BERESTAPIGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-    							"ERR900E", "Unexpected error during ECOMP-PORTAL Back-end REST API execution", "", "Please check error log for more information."),
-    
-    FeHealthCheckGeneralError(EPErrorCodesEnum.FEHEALTHCHECKGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
-    							"ERR901E", "General error during FE Health Check", "", "Please check error log for more information."),
-    
-    InternalUnexpectedInfo(EPErrorCodesEnum.INTERNALUNEXPECTEDINFO_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
-    							"ERR999I", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
-    
-    InternalUnexpectedWarning(EPErrorCodesEnum.INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
-    							"ERR999W", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
-    
-    InternalUnexpectedError(EPErrorCodesEnum.INTERNALUNEXPECTEDERROR_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-    							"ERR999E", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
-    
-    InternalUnexpectedFatal(EPErrorCodesEnum.INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
-    							"ERR999F", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
-    
-    ExternalAuthAccessConnectionError(EPErrorCodesEnum.EXTERNALAUTHACCESS_CONNECTIONERROR, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR220E", "AAF Connection problem", "Details: {0}.", "Please check logs for more information."),
-
-    ExternalAuthAccessAuthenticationError(EPErrorCodesEnum.EXTERNALAUTHACCESS_AUTHENTICATIONERROR, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR120E", "AAF authentication problem", "Details: {0}.", "Please check logs for more information."),
-    
-    ExternalAuthAccessGeneralError(EPErrorCodesEnum.EXTERNALAUTHACCESS_GENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR520E", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
-    
-    SchedulerAccessConnectionError(EPErrorCodesEnum.SCHEDULER_ACCESS_CONNECTIONERROR, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR240E", "Scheduler Connection problem", "Details: {0}.", "Please check logs for more information."),
-
-    SchedulerAuxAccessAuthenticationError(EPErrorCodesEnum.SCHEDULERAUX_ACCESS_AUTHENTICATIONERROR, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR140E", "SchedulerAux authentication problem", "Details: {0}.", "Please check logs for more information."),
-    
-    SchedulerAccessGeneralError(EPErrorCodesEnum.SCHEDULER_ACCESS_GENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR540E", "Unexpected Scheduler error", "Details: {0}.", "Please check logs for more information."),
-    
-    SchedulerInvalidAttributeError(EPErrorCodesEnum.SCHEDULER_INVALID_ATTRIBUTEERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
-			"ERR515E", "Unable to create Scheduler", "Details: {0}.", "Please check logs for more information."),
-
-	;
-	
-	ErrorTypeEnum eType;
-	AlarmSeverityEnum alarmSeverity;
-	EPErrorCodesEnum messageCode;
-	ErrorSeverityEnum errorSeverity;
-	String errorCode;
-	String errorDescription;
-	String details;
-	String resolution;
-	
-	EPAppMessagesEnum(EPErrorCodesEnum messageCode, ErrorTypeEnum eType, AlarmSeverityEnum alarmSeverity, ErrorSeverityEnum errorSeverity, String errorCode, String errorDescription,
-						String details, String resolution) {
-		this.messageCode = messageCode;
-		this.eType = eType;
-		this.alarmSeverity = alarmSeverity;
-		this.errorSeverity = errorSeverity;
-		this.errorCode = errorCode;
-		this.errorDescription = errorDescription;
-		this.details = details;
-		this.resolution = resolution;
-	}
-	
-	public String getDetails() {
-		return this.details;
-	}
-	
-	public String getResolution() {
-		return this.resolution;
-	}
-	public String getErrorCode() {
-		return this.errorCode;
-	}
-	
-	public String getErrorDescription() {
-		return this.errorDescription;
-	}
-	
-	public ErrorSeverityEnum getErrorSeverity() {
-		return this.errorSeverity;
-	}
-	
-	public void setErrorSeverity(ErrorSeverityEnum errorSeverity) {
-		this.errorSeverity = errorSeverity;
-	}
-	
-	public EPErrorCodesEnum getMessageCode() {
-		return messageCode;
-	}
-
-	public void setMessageCode(EPErrorCodesEnum messageCode) {
-		this.messageCode = messageCode;
-	}
-	
-	public AlarmSeverityEnum getAlarmSeverity() {
-		return alarmSeverity;
-	}
-
-	public void setAlarmSeverity(AlarmSeverityEnum alarmSeverity) {
-		this.alarmSeverity = alarmSeverity;
-	}
-	
-	public ErrorTypeEnum getErrorType() {
-		return eType;
-	}
-
-	public void setErrorType(ErrorTypeEnum eType) {
-		this.eType = eType;
-	}
+
+       BeUebAuthenticationError(EPErrorCodesEnum.BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR100E", "An Authentication failure occurred during access to UEB server", "Details: {0}.",
+               "Please check UEB server list and keys configured under Portal.Properties file."),
+
+       BeRestApiAuthenticationError(EPErrorCodesEnum.BERESTAPIAUTHENTICATIONERROR, ErrorTypeEnum.AUTHENTICATION_PROBLEM,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR101E", "Rejected an incoming REST API request due to invalid credentials", "",
+               "Please check application credentials defined in Database or properties files."),
+
+       InternalAuthenticationInfo(EPErrorCodesEnum.INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR199I", "Internal authentication problem", "Details: {0}.",
+               "Please check the logs for more information."),
+
+       InternalAuthenticationWarning(EPErrorCodesEnum.INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+               "ERR199W", "Internal authentication problem", "Details: {0}.",
+               "Please check the logs for more information."),
+
+       InternalAuthenticationError(EPErrorCodesEnum.INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR199E", "Internal authentication problem", "Details: {0}.",
+               "Please check the logs for more information."),
+
+       InternalAuthenticationFatal(EPErrorCodesEnum.INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+               "ERR199F", "Internal authentication problem", "Details: {0}.",
+               "Please check the logs for more information."),
+
+       BeHealthCheckError(EPErrorCodesEnum.BeHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL,
+               ErrorSeverityEnum.ERROR,
+               "ERR200E",
+               "ECOMP-PORTAL Back-end probably lost connectivity to either one of the following components: MySQL DB, UEB Cluster",
+               "", "Please check the logs for more information."),
+
+       BeHealthCheckMySqlError(EPErrorCodesEnum.BEHEALTHCHECKMYSQLERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+               "ERR201E", "ECOMP-PORTAL Back-end probably lost connectivity to MySQL DB", "",
+               "Check connectivity to MYSQL is configured correctly under system.properties file."),
+
+       BeHealthCheckUebClusterError(EPErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+               "ERR203E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "",
+               "Check connectivity to UEB cluster which is configured under portal.properties file."),
+
+       FeHealthCheckError(EPErrorCodesEnum.FEHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL,
+               ErrorSeverityEnum.ERROR,
+               "ERR204E", "Unable to connect to a valid ECOMP-PORTAL Back-end Server.", "",
+               "Please check connectivity from this FE instance towards BE or BE Load Balancer."),
+
+       BeHealthCheckRecovery(EPErrorCodesEnum.BEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY,
+               AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR205I",
+               "ECOMP-PORTAL Back-end Recovery to either one of the following components: MySQL DB, UEB Cluster", "",
+               "Please check logs for more specific information about the problem."),
+
+       BeHealthCheckMySqlRecovery(EPErrorCodesEnum.BEHEALTHCHECKMYSQLRECOVERY, ErrorTypeEnum.RECOVERY,
+               AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR206I", "ECOMP-PORTAL Back-end connection recovery to MySQL DB", "",
+               "Please check logs for more specific information about the problem."),
+
+       BeHealthCheckUebClusterRecovery(EPErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERRECOVERY, ErrorTypeEnum.RECOVERY,
+               AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR208I", "ECOMP-PORTAL Back-end connection recovery to UEB Cluster", "",
+               "Please check logs for more specific information about the problem."),
+
+       FeHealthCheckRecovery(EPErrorCodesEnum.FEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY,
+               AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR209I", "Connectivity to ECOMP-PORTAL Front-end Server is recovered", "",
+               "Please check logs for more specific information about the problem."),
+
+       BeUebConnectionError(EPErrorCodesEnum.BEUEBCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR210E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Details: {0}.",
+               "Please check UEB server list and keys configured under Portal.Properties file."),
+
+       BeUebUnkownHostError(EPErrorCodesEnum.BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR211E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Cannot reach host: {0}.",
+               "Please check UEB server list and keys configured under Portal.Properties file."),
+
+       BeUebRegisterOnboardingAppError(EPErrorCodesEnum.BEUEBREGISTERONBOARDINGAPPERROR,
+               ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR212E", "Failed to register the On-boarding application with UEB Communication server",
+               "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+
+       BeHttpConnectionError(EPErrorCodesEnum.BEHTTPCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR213E",
+               "It could be that communication to an external application might resulted an exception or failed to reach the external application",
+               "Details: {0}.", "Please check logs for more information."),
+       MusicHealthCheckZookeeperError(EPErrorCodesEnum.MUSICHEALTHCHECKZOOKEEPERERROR_ONE_ARGUMENT,
+               ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR214E", "Connectivity to Music Cluster -zookeeper server", "Details: {0}.",
+               "Please check zookeeper server list and check the logs for more information"),
+
+       MusicHealthCheckCassandraError(EPErrorCodesEnum.MUSICHEALTHCHECKCASSANDRAERROR_ONE_ARGUMENT,
+               ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR215E", "Connectivity to Music Cluster -Cassandra server", "Details: {0}.",
+               "Please check Cassandra server list and check the logs for more information"),
+
+       InternalConnectionInfo(EPErrorCodesEnum.INTERNALCONNECTIONINFO_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM,
+               AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR299I", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+
+       InternalConnectionWarning(EPErrorCodesEnum.INTERNALCONNECTIONWARNING_ONE_ARGUMENT,
+               ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+               "ERR299W", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+
+       InternalConnectionError(EPErrorCodesEnum.INTERNALCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR299E", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+
+       InternalConnectionFatal(EPErrorCodesEnum.INTERNALCONNECTIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+               "ERR299F", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+
+       BeUebObjectNotFoundError(EPErrorCodesEnum.BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR303E", "Error occurred during access to U-EB Server.", "Data not found: {0}.",
+               "An error occurred during access to UEB Server, {1} failed to either register or unregister to/from UEB topic."),
+
+       BeUserMissingError(EPErrorCodesEnum.BEUSERMISSINGERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR310E", "User is not found", "",
+               "User {0} must be added to the corresponding application with proper user roles."),
+
+       BeUserInactiveWarning(EPErrorCodesEnum.BEUSERINACTIVEWARNING_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR,
+               AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+               "ERR313W", "User is found but in-active", "",
+               "User {0} must be added to the corresponding application with proper user roles."),
+
+       BeUserAdminPrivilegesInfo(EPErrorCodesEnum.BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR,
+               AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+               "ERR314W", "User is found but don't have administrative privileges", "",
+               "User {0} should be given administrator role for the corresponding application to perform the necessary actions."),
+
+       BeInvalidJsonInput(EPErrorCodesEnum.BEINVALIDJSONINPUT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR,
+               ErrorSeverityEnum.ERROR,
+               "ERR405E", "Failed to convert JSON input to object", "", "Please check logs for more information."),
+
+       BeIncorrectHttpStatusError(EPErrorCodesEnum.BEINCORRECTHTTPSTATUSERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR407E", "Communication to an external application is resulted in with Incorrect Http response code",
+               "", "Please check logs for more information."),
+
+       BeInitializationError(EPErrorCodesEnum.BEINITIALIZATIONERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+               "ERR500E", "ECOMP-PORTAL Back-end was not initialized properly", "",
+               "Please check logs for more information."),
+
+       BeUebSystemError(EPErrorCodesEnum.BEUEBSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR,
+               ErrorSeverityEnum.ERROR,
+               "ERR502E", "Error occurred during access to U-EB Server", "Details: {0}.",
+               "An error occurred in {1} distribution mechanism. Please check the logs for more information."),
+
+       BeDaoSystemError(EPErrorCodesEnum.BEDAOSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL,
+               ErrorSeverityEnum.ERROR,
+               "ERR505E", "Performing DDL or DML operations on database might have failed", "",
+               "Please check MySQL DB health or look at the logs for more details."),
+
+       BeSystemError(EPErrorCodesEnum.BESYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL,
+               ErrorSeverityEnum.ERROR,
+               "ERR506E", "Unexpected error during operation", "", "Please check logs for more information."),
+
+       BeExecuteRollbackError(EPErrorCodesEnum.BEEXECUTEROLLBACKERROR, ErrorTypeEnum.DATA_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR507E", "Roll-back operation towards database has failed", "",
+               "Please check MYSQL DB health or look at the logs for more details."),
+
+       FeHttpLoggingError(EPErrorCodesEnum.FEHTTPLOGGINGERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR,
+               ErrorSeverityEnum.ERROR,
+               "ERR517E", "Error when logging FE HTTP request/response", "",
+               "Please check MYSQL DB health or look at the logs for more details."),
+
+       FePortalServletError(EPErrorCodesEnum.FEPORTALSERVLETERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR,
+               ErrorSeverityEnum.ERROR,
+               "ERR518E", "Error when trying to access FE Portal page.", "", "Please check logs for more information."),
+
+       BeDaoCloseSessionError(EPErrorCodesEnum.BEDAOCLOSESESSIONERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR519E", "Close local session operation with database failed", "",
+               "Please check MYSQL DB health or look at the logs form more details."),
+
+       BeRestApiGeneralError(EPErrorCodesEnum.BERESTAPIGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+               "ERR900E", "Unexpected error during ECOMP-PORTAL Back-end REST API execution", "",
+               "Please check error log for more information."),
+
+       FeHealthCheckGeneralError(EPErrorCodesEnum.FEHEALTHCHECKGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+               "ERR901E", "General error during FE Health Check", "", "Please check error log for more information."),
+
+       InternalUnexpectedInfo(EPErrorCodesEnum.INTERNALUNEXPECTEDINFO_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+               "ERR999I", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+
+       InternalUnexpectedWarning(EPErrorCodesEnum.INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+               "ERR999W", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+
+       InternalUnexpectedError(EPErrorCodesEnum.INTERNALUNEXPECTEDERROR_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR999E", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+
+       InternalUnexpectedFatal(EPErrorCodesEnum.INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+               "ERR999F", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+
+       ExternalAuthAccessConnectionError(EPErrorCodesEnum.EXTERNALAUTHACCESS_CONNECTIONERROR,
+               ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR220E", "AAF Connection problem", "Details: {0}.", "Please check logs for more information."),
+
+       ExternalAuthAccessAuthenticationError(EPErrorCodesEnum.EXTERNALAUTHACCESS_AUTHENTICATIONERROR,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR120E", "AAF authentication problem", "Details: {0}.", "Please check logs for more information."),
+
+       ExternalAuthAccessGeneralError(EPErrorCodesEnum.EXTERNALAUTHACCESS_GENERALERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR520E", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+
+       SchedulerAccessConnectionError(EPErrorCodesEnum.SCHEDULER_ACCESS_CONNECTIONERROR,
+               ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR240E", "Scheduler Connection problem", "Details: {0}.", "Please check logs for more information."),
+
+       SchedulerAuxAccessAuthenticationError(EPErrorCodesEnum.SCHEDULERAUX_ACCESS_AUTHENTICATIONERROR,
+               ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR140E", "SchedulerAux authentication problem", "Details: {0}.",
+               "Please check logs for more information."),
+
+       SchedulerAccessGeneralError(EPErrorCodesEnum.SCHEDULER_ACCESS_GENERALERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR540E", "Unexpected Scheduler error", "Details: {0}.", "Please check logs for more information."),
+
+       SchedulerInvalidAttributeError(EPErrorCodesEnum.SCHEDULER_INVALID_ATTRIBUTEERROR, ErrorTypeEnum.SYSTEM_ERROR,
+               AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+               "ERR515E", "Unable to create Scheduler", "Details: {0}.", "Please check logs for more information."),
+
+       ;
+
+       ErrorTypeEnum eType;
+       AlarmSeverityEnum alarmSeverity;
+       EPErrorCodesEnum messageCode;
+       ErrorSeverityEnum errorSeverity;
+       String errorCode;
+       String errorDescription;
+       String details;
+       String resolution;
+
+       EPAppMessagesEnum(EPErrorCodesEnum messageCode, ErrorTypeEnum eType, AlarmSeverityEnum alarmSeverity,
+               ErrorSeverityEnum errorSeverity, String errorCode, String errorDescription,
+               String details, String resolution) {
+              this.messageCode = messageCode;
+              this.eType = eType;
+              this.alarmSeverity = alarmSeverity;
+              this.errorSeverity = errorSeverity;
+              this.errorCode = errorCode;
+              this.errorDescription = errorDescription;
+              this.details = details;
+              this.resolution = resolution;
+       }
+
+       public String getDetails() {
+              return this.details;
+       }
+
+       public String getResolution() {
+              return this.resolution;
+       }
+
+       public String getErrorCode() {
+              return this.errorCode;
+       }
+
+       public String getErrorDescription() {
+              return this.errorDescription;
+       }
+
+       public ErrorSeverityEnum getErrorSeverity() {
+              return this.errorSeverity;
+       }
+
+
+       public EPErrorCodesEnum getMessageCode() {
+              return messageCode;
+       }
+
+
+       public AlarmSeverityEnum getAlarmSeverity() {
+              return alarmSeverity;
+       }
+
+
+       public ErrorTypeEnum getErrorType() {
+              return eType;
+       }
+
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
index 8c5806ea..cd966fb4 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
@@ -89,7 +89,6 @@ public class FnUserService implements UserDetailsService {
        }
 
        List<FnUser> getUsersByOrgIds(final List<String> orgIds){
-              String ids = "(" + orgIds.stream().map(s -> "'" + s + "'").collect(Collectors.joining()) + ")";
               return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
        }
 
diff --git a/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java b/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java
index cc32f756..30613aa8 100644
--- a/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java
+++ b/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java
@@ -147,7 +147,6 @@ class FnUserServiceTest {
               assertEquals(expected.getActiveYn(), actual.getActiveYn());
               assertEquals(expected.getCreatedId(), actual.getCreatedId());
               assertEquals(expected.getCreatedDate(), actual.getCreatedDate());
-              assertEquals(expected.getModifiedId(), actual.getModifiedId());
               assertEquals(expected.getModifiedDate(), actual.getModifiedDate());
               assertEquals(expected.getIsInternalYn(), actual.getIsInternalYn());
               assertEquals(expected.getAddressLine1(), actual.getAddressLine1());