X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fdomain%2FEPUserApp.java;h=ebdf85429d9308875f07a3b7500f673d6675a45d;hb=abf55f3469a7942bab06961d55a5107777f5391f;hp=c52bc3036f0ac0b0138c5e909e782ad18fb718a9;hpb=788e99d836a75badf45dce96358d184aa9e549f2;p=portal.git

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 c52bc303..ebdf8542 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
@@ -37,6 +37,7 @@
  */
 package org.onap.portalapp.portal.domain;
 
+import javax.validation.Valid;
 import org.onap.portalsdk.core.domain.support.DomainVo;
 
 @SuppressWarnings("rawtypes")
@@ -45,7 +46,9 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 	private static final long serialVersionUID = 1L;
 	
 	private Long userId;
+	@Valid
 	private EPApp app;
+	@Valid
 	private EPRole role;
 	private Integer priority;
 	
@@ -94,7 +97,7 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 	}
 		
 	public Integer getPriority() {
-		return (this.priority == null) ? 1 : priority;
+		return priority;
 	}
 
 	public void setPriority(Integer priority) {
@@ -113,8 +116,7 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 
 		return (otherUserIdIsSameAsThisUserId(castOther))
 				&& (otherAppIdIsSameAsThis(castOther))
-				&& (otherRoleIsSameAsThis(castOther))
-				&& (otherPriorityIsSameAsThis(castOther));
+				&& (otherRoleIsSameAsThis(castOther));
 	}
 
 	public int hashCode() {
@@ -123,22 +125,18 @@ public class EPUserApp extends DomainVo implements java.io.Serializable, Compara
 		result = 37 * result + (int) (this.getUserId()==null ? 0 : this.getUserId().intValue());
 		result = 37 * result + (int) (this.getApp().getId()==null ? 0 : this.getApp().getId().intValue());
 		result = 37 * result + (int) (this.getRole().getId()==null ? 0 : this.getRole().getId().intValue());
-		result = 37 * result + (int) (this.priority==null ? 0 : this.priority);
 		return result;
 	}
 
 	public int compareTo(Object other){
 	    EPUserApp castOther = (EPUserApp) other;
 
-	    Long c1 = (this.getUserId()==null ? 0 : this.getUserId()) + (this.getApp()==null||this.getApp().getId()==null ? 0 : this.getApp().getId()) + (this.getRole()==null||this.getRole().getId()==null ? 0 : this.getRole().getId()) + (this.priority==null ? 0 : this.priority);
-	    Long c2 = (castOther.getUserId()==null ? 0 : castOther.getUserId()) + (castOther.getApp()==null||castOther.getApp().getId()==null ? 0 : castOther.getApp().getId()) + (castOther.getRole()==null||castOther.getRole().getId()==null ? 0 : castOther.getRole().getId()) + (castOther.priority==null ? 0 : castOther.priority);
+	    Long c1 = (this.getUserId()==null ? 0 : this.getUserId()) + (this.getApp()==null||this.getApp().getId()==null ? 0 : this.getApp().getId()) + (this.getRole()==null||this.getRole().getId()==null ? 0 : this.getRole().getId());
+	    Long c2 = (castOther.getUserId()==null ? 0 : castOther.getUserId()) + (castOther.getApp()==null||castOther.getApp().getId()==null ? 0 : castOther.getApp().getId()) + (castOther.getRole()==null||castOther.getRole().getId()==null ? 0 : castOther.getRole().getId());
 
 	    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());
 	}