pom, upgrade script changes, AAF role desc fixdublin

Issue-ID: PORTAL-356

portal/SDK release 2.5.1, POM, upgrade script
Change-Id: I78bf5dbc5c7927eeb087431143711642ff0261ae
Signed-off-by: Kishore Reddy, Gujja (kg811t)
<kishore.reddy.gujja@att.com>

Change-Id: Ie0065f477a4004637cbb275ad079161be9ddfb41
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kishore.reddy.gujja@att.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
index fd05c695..9c8a8838 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
@@ -191,11 +191,14 @@ public class UserApiServiceImpl implements UserApiService {
 	private Set setUserApps(List<ExternalAccessUserRoleDetail> userRoleDetailList, String namespace, User user,
 			App app) {
 		Set userApps = new TreeSet();
+		//As External Auth System does not provide roleId's we are setting counter value for roleId. These values should not be stored in DB.  
+		Long tempRoleId = 0l;
 		for (ExternalAccessUserRoleDetail userRoleDetail : userRoleDetailList) {
 			ExternalAccessRole ecRole = userRoleDetail.getRole();
 			UserApp userApp = new UserApp();
 			Role role = new Role();
 			Set roleFunctions = new TreeSet<>();
+			role.setId(tempRoleId);
 			role.setActive(true);
 			role.setName(ecRole.getName());
 			for (ExternalAccessPerms extPerm : ecRole.getPerms()) {
@@ -225,6 +228,7 @@ public class UserApiServiceImpl implements UserApiService {
 			userApp.setRole(role);
 			userApp.setUserId(user.getId());
 			userApps.add(userApp);
+			tempRoleId++;
 		}
 		return userApps;
 	}