X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fdomain%2FEPUserApp.java;h=d644c9980ea6e927ba48e36228b67f37a0009b3c;hp=424a9152a632eab99bef7249dca90627be0afa8d;hb=8b67487fa29e61ad15ac961231ebb3b6621d39dc;hpb=4027435c28e1433df2476b83a6e77ba4d1d865bd

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
index 424a9152..d644c998 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
@@ -64,13 +64,12 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 	}
 	
 	public Long getAppRoleId() {
-		return (role.getAppRoleId() == null) ? null : role.getAppRoleId();
+		return this.role.getAppRoleId();
 	}
 		
 	@Override 
 	public String toString() {
-		String str = "[u: "+getUserId()+"; a: "+getAppId()+", r: "+getRoleId()+"; appRoleId: "+getAppRoleId()+"]";
-		return str;
+		return "[u: "+getUserId()+"; a: "+getAppId()+", r: "+getRoleId()+"; appRoleId: "+getAppRoleId()+"]";
 	}
 	
 	public Long getUserId() {
@@ -105,6 +104,7 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 		this.priority = priority;
 	}
 
+	@Override
 	public boolean equals(Object other) {
 		if ((this == other))
 			return true;
@@ -114,10 +114,10 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 			return false;
 		EPUserApp castOther = (EPUserApp) other;
 
-		return (this.getUserId().equals(castOther.getUserId()))
-				&& (this.getApp().getId().equals(castOther.getApp().getId()))
-				&& (this.getRole().getId().equals(castOther.getRole().getId()))
-				&& ((this.priority==null && castOther.getPriority()==null) || this.getPriority().equals(castOther.getPriority()));
+		return (otherUserIdIsSameAsThisUserId(castOther))
+				&& (otherAppIdIsSameAsThis(castOther))
+				&& (otherRoleIsSameAsThis(castOther))
+				&& (otherPriorityIsSameAsThis(castOther));
 	}
 
 	public int hashCode() {
@@ -138,4 +138,19 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 
 	    return c1.compareTo(c2);
 	}
+	private boolean otherPriorityIsSameAsThis(EPUserApp other){
+		return (this.priority==null && other.getPriority()==null) || this.getPriority().equals(other.getPriority());
+	}
+
+	private boolean otherRoleIsSameAsThis(EPUserApp other){
+		return this.getRole().getId().equals(other.getRole().getId());
+	}
+
+	private boolean otherAppIdIsSameAsThis(EPUserApp other){
+		return this.getApp().getId().equals(other.getApp().getId());
+	}
+
+	private boolean otherUserIdIsSameAsThisUserId(EPUserApp other){
+		return this.getUserId().equals(other.getUserId());
+	}
 }