From: Sunder Tattavarada <statta@research.att.com>
Date: Mon, 17 Jun 2019 15:51:58 +0000 (+0000)
Subject: Merge "Sonar: Reduce cyclomatic complexity"
X-Git-Tag: 3.2.0~282
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=8b67487fa29e61ad15ac961231ebb3b6621d39dc;hp=-c

Merge "Sonar: Reduce cyclomatic complexity"
---

8b67487fa29e61ad15ac961231ebb3b6621d39dc
diff --combined ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
index 424a9152,c52bc303..d644c998
--- 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,7 -37,6 +37,7 @@@
   */
  package org.onap.portalapp.portal.domain;
  
 +import javax.validation.Valid;
  import org.onap.portalsdk.core.domain.support.DomainVo;
  
  @SuppressWarnings("rawtypes")
@@@ -46,9 -45,7 +46,9 @@@ public class EPUserApp extends DomainV
  	private static final long serialVersionUID = 1L;
  	
  	private Long userId;
 +	@Valid
  	private EPApp app;
 +	@Valid
  	private EPRole role;
  	private Integer priority;
  	
@@@ -64,13 -61,12 +64,12 @@@
  	}
  	
  	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 -101,7 +104,7 @@@
  		this.priority = priority;
  	}
  
+ 	@Override
  	public boolean equals(Object other) {
  		if ((this == other))
  			return true;
@@@ -114,10 -111,10 +114,10 @@@
  			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 -135,19 +138,19 @@@
  
  	    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());
+ 	}
  }