1 files changed, 58 insertions, 10 deletions

diff --git a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRole.java b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRole.java
index 8c191181..2c6f3ff7 100644
--- a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRole.java
+++ b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRole.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
@@ -38,23 +38,25 @@
 package org.onap.portalsdk.external.authorization.domain;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class ExternalAccessRole implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 3439986826362436339L;
+	
 	public String name;
-	public String description;
+	private List<ExternalAccessPerms> perms;
+	public ExternalAccessRoleDescription description;
 	
-	public ExternalAccessRole() {
 	
+	public ExternalAccessRole() {
+		super();
 	}
-	
-	public ExternalAccessRole(String name, String description) {
+
+	public ExternalAccessRole(String name, List<ExternalAccessPerms> ecPerms, ExternalAccessRoleDescription description) {
 		super();
 		this.name = name;
+		this.perms = ecPerms;
 		this.description = description;
 	}
 	
@@ -65,12 +67,58 @@ public class ExternalAccessRole implements Serializable {
 	public void setName(String name) {
 		this.name = name;
 	}
+	
+	public List<ExternalAccessPerms> getPerms() {
+		return perms;
+	}
 
-	public String getDescription() {
+	public void setPerms(List<ExternalAccessPerms> perms) {
+		this.perms = perms;
+	}
+
+	public ExternalAccessRoleDescription getDescription() {
 		return description;
 	}
-	public void setDescription(String description) {
+	public void setDescription(ExternalAccessRoleDescription description) {
 		this.description = description;
 	}
+
+	@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 + ((perms == null) ? 0 : perms.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ExternalAccessRole other = (ExternalAccessRole) 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)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (perms == null) {
+			if (other.perms != null)
+				return false;
+		} else if (!perms.equals(other.perms))
+			return false;
+		return true;
+	}
+	
 	
 }