CADI AAF Integration and merging the code

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / domain / EPUser.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUser.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUser.java
index e743520..d7cce0e 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUser.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUser.java
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.portal.domain;
 
@@ -538,9 +538,10 @@ public class EPUser extends User {
                SortedSet<EPRole> roles = new TreeSet<EPRole>();
                SortedSet<EPUserApp> userAppRoles = getEPUserApps();
                
-               logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - userApps = ", userAppRoles.size());
+               logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - userApps = {} ", userAppRoles.size());
 
                Iterator<EPUserApp> userAppRolesIterator = userAppRoles.iterator();
+
                EPUserApp userAppRole = null;
                // getting default app
                while (userAppRolesIterator.hasNext()) {
@@ -561,14 +562,14 @@ public class EPUser extends User {
                                }                               
                        }
                }
-               logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - roles = ", roles.size());
+               logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - roles = {}" , roles.size());
 
                return roles;
        }
 
        
        /**
-        * Attention! Not for use in ECOMP
+        * Attention! Not for use in ONAP
         */
        public SortedSet<EPRole> getAppRoles(EPApp app) {
                SortedSet<EPRole> roles = new TreeSet<EPRole>();
@@ -589,7 +590,7 @@ public class EPUser extends User {
        
 
        /**
-        * Attention! Not for use in ECOMP
+        * Attention! Not for use in ONAP
         */
        public SortedSet<EPRole> getEPRoles() {
                EPApp app = new EPApp();
@@ -599,7 +600,7 @@ public class EPUser extends User {
        }
 
        /**
-        * Attention! Not for use in ECOMP
+        * Attention! Not for use in ONAP
         */
        public void setEPRoles(SortedSet<EPRole> roles) {
                EPApp app = new EPApp();
@@ -609,7 +610,7 @@ public class EPUser extends User {
        }
 
        /**
-        * Attention! Not for use in ECOMP
+        * Attention! Not for use in ONAP
         */
        public void removeEPRole(Long roleId) {
                SortedSet<EPUserApp> apps = getEPUserApps();
@@ -624,7 +625,7 @@ public class EPUser extends User {
        }
 
        /**
-        * Attention! Not for use in ECOMP
+        * Attention! Not for use in ONAP
         */
        public void addEPRole(EPRole role) {
                if (role != null) {