1 files changed, 17 insertions, 34 deletions

diff --git a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetail.java b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetail.java
index 929bd351..5e189e5c 100644
--- a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetail.java
+++ b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetail.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal SDK
  * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -39,42 +39,30 @@ package org.onap.portalsdk.external.authorization.domain;
 
 public class ExternalAccessUserRoleDetail {
 		
-	private String name;
-	private ExternalRoleDescription description;
-	
+	private ExternalAccessRole role;
+
+	public ExternalAccessRole getRole() {
+		return role;
+	}
+
+	public void setRole(ExternalAccessRole role) {
+		this.role = role;
+	}
 	
-	/**
-	 * 
-	 */
 	public ExternalAccessUserRoleDetail() {
 		super();
-	}
+	}	
 
-	public ExternalAccessUserRoleDetail(String name, ExternalRoleDescription description) {
+	public ExternalAccessUserRoleDetail(ExternalAccessRole role) {
 		super();
-		this.name = name;
-		this.description = description;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public ExternalRoleDescription getDescription() {
-		return description;
-	}
-	public void setDescription(ExternalRoleDescription description) {
-		this.description = description;
+		this.role = role;
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((description == null) ? 0 : description.hashCode());
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((role == null) ? 0 : role.hashCode());
 		return result;
 	}
 
@@ -87,15 +75,10 @@ public class ExternalAccessUserRoleDetail {
 		if (getClass() != obj.getClass())
 			return false;
 		ExternalAccessUserRoleDetail other = (ExternalAccessUserRoleDetail) obj;
-		if (description == null) {
-			if (other.description != null)
-				return false;
-		} else if (!description.equals(other.description))
-			return false;
-		if (name == null) {
-			if (other.name != null)
+		if (role == null) {
+			if (other.role != null)
 				return false;
-		} else if (!name.equals(other.name))
+		} else if (!role.equals(other.role))
 			return false;
 		return true;
 	}