Merge "Add roles to user"

1 files changed, 3 insertions, 65 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/ExternalRoleDescription.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/ExternalRoleDescription.java
index dd013c78..b9781071 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/ExternalRoleDescription.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/ExternalRoleDescription.java
@@ -39,59 +39,20 @@ package org.onap.portalapp.portal.transport;
 
 public class ExternalRoleDescription {
 
-	private String id;
 	private String  name;
-    private String active;
-    private String priority;
-    private String appId;
-    private String appRoleId;
     
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
 	public String getName() {
 		return name;
 	}
 	public void setName(String name) {
 		this.name = name;
 	}
-	public String getActive() {
-		return active;
-	}
-	public void setActive(String active) {
-		this.active = active;
-	}
-	public String getPriority() {
-		return priority;
-	}
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-	public String getAppId() {
-		return appId;
-	}
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-	public String getAppRoleId() {
-		return appRoleId;
-	}
-	public void setAppRoleId(String appRoleId) {
-		this.appRoleId = appRoleId;
-	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((active == null) ? 0 : active.hashCode());
-		result = prime * result + ((appId == null) ? 0 : appId.hashCode());
-		result = prime * result + ((appRoleId == null) ? 0 : appRoleId.hashCode());
-		result = prime * result + ((id == null) ? 0 : id.hashCode());
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result + ((priority == null) ? 0 : priority.hashCode());
 		return result;
 	}
 	@Override
@@ -103,38 +64,15 @@ public class ExternalRoleDescription {
 		if (getClass() != obj.getClass())
 			return false;
 		ExternalRoleDescription other = (ExternalRoleDescription) obj;
-		if (active == null) {
-			if (other.active != null)
-				return false;
-		} else if (!active.equals(other.active))
-			return false;
-		if (appId == null) {
-			if (other.appId != null)
-				return false;
-		} else if (!appId.equals(other.appId))
-			return false;
-		if (appRoleId == null) {
-			if (other.appRoleId != null)
-				return false;
-		} else if (!appRoleId.equals(other.appRoleId))
-			return false;
-		if (id == null) {
-			if (other.id != null)
-				return false;
-		} else if (!id.equals(other.id))
-			return false;
 		if (name == null) {
 			if (other.name != null)
 				return false;
 		} else if (!name.equals(other.name))
 			return false;
-		if (priority == null) {
-			if (other.priority != null)
-				return false;
-		} else if (!priority.equals(other.priority))
-			return false;
 		return true;
 	}
+	
+	
     
     
 }