CADI AAF Integration and merging the code

Issue-ID: PORTAL-319

CADI AAF Integration and code merge

Change-Id: I6e44f3b2741858d8d403b77a49ec9a0153084801
Signed-off-by: hb123f <hbindu@research.att.com>

16 files changed, 446 insertions, 363 deletions

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AuxApiRequestMapperControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AuxApiRequestMapperControllerTest.java
index 38510d9a..9d3ac1e2 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AuxApiRequestMapperControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AuxApiRequestMapperControllerTest.java
@@ -36,7 +36,9 @@
  */
 package org.onap.portalapp.portal.controller;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -56,7 +58,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.annotation.ApiVersion;
-import org.onap.portalapp.controller.sessionmgt.SessionCommunicationController;
 import org.onap.portalapp.controller.sessionmgt.SessionCommunicationVersionController;
 import org.onap.portalapp.externalsystemapproval.model.ExternalSystemUser;
 import org.onap.portalapp.portal.domain.EPUser;
@@ -666,4 +667,23 @@ public class AuxApiRequestMapperControllerTest {
 		Mockito.when(mockedRequest.getMethod()).thenReturn("GET");
 		assertNull(auxApiRequestMapperController.getFunctionalMenuItemsForUser(mockedRequest, mockedResponse));
 	}
+	
+	@Test
+	public void updateAppRoleDescriptionApiTest() throws Exception {
+		Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/update/app/roleDescription");
+		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+		expectedportalRestResponse.setMessage("updateAppRoleDescription: null");
+		expectedportalRestResponse.setResponse("Failure");
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+		Map<String, Object> beans = new HashMap<>();
+		beans.put("bean1", rolesController);
+		Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+		PowerMockito.mockStatic(AopUtils.class);
+		Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+		Mockito.when(mockedRequest.getMethod()).thenReturn("PUT");
+		assertEquals(auxApiRequestMapperController.updateAppRoleDescription(mockedRequest, mockedResponse),
+				expectedportalRestResponse);
+	}
+
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
index f1d7c397..b476a72d 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
@@ -37,7 +37,6 @@
  */
 package org.onap.portalapp.portal.controller;
 
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -91,7 +90,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.util.MatcherAssertionErrors;
 import org.springframework.web.client.HttpClientErrorException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -102,38 +100,32 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @PrepareForTest({ EcompPortalUtils.class, PortalConstants.class, SystemProperties.class,
 		EPCommonSystemProperties.class })
 public class ExternalAccessRolesControllerTest {
-
 	@Mock
 	ExternalAccessRolesService externalAccessRolesService = new ExternalAccessRolesServiceImpl();
-
 	@InjectMocks
 	ExternalAccessRolesController externalAccessRolesController = new ExternalAccessRolesController();
 	@Mock
-	UserService userservice =  new UserServiceCentalizedImpl();
-	
+	UserService userservice = new UserServiceCentalizedImpl();
 	@Mock
-	AuditService auditService; 
+	AuditService auditService;
 
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
 	}
+
 	@Mock
 	AuditLog auditLog = new AuditLog();
-
 	MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
-
 	HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest();
 	HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
 	NullPointerException nullPointerException = new NullPointerException();
 	HttpClientErrorException httpClientErrorException = new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Failed");
-
 	MockEPUser mockUser = new MockEPUser();
 	String loginId = "guestT";
 	String uebKey = "testUebKey";
 
-	public EPApp mockApp()
-	{
+	public EPApp mockApp() {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
@@ -156,10 +148,14 @@ public class ExternalAccessRolesControllerTest {
 		app.setAppType(1);
 		return app;
 	}
-	
+
 	@Test
 	public void getUserTest() throws Exception {
-		CentralUser expectedCentralUser = new CentralUser(null, null, null, null, null, null, null, null, loginId, loginId, loginId, loginId, loginId, loginId, loginId, null, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, null, false, false, null, null, false, loginId, null);
+		CentralUser expectedCentralUser = new CentralUser(null, null, null, null, null, null, null, null, loginId,
+				loginId, loginId, loginId, loginId, loginId, loginId, null, loginId, loginId, loginId, loginId, loginId,
+				loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId,
+				loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId,
+				loginId, null, false, false, null, null, false, loginId, null);
 		String loginId = "test";
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
@@ -172,7 +168,8 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
-		Mockito.when(externalAccessRolesService.getUserRoles(loginId, mockedRequest.getHeader("uebkey"))).thenReturn(expectedCentralUser);
+		Mockito.when(externalAccessRolesService.getUserRoles(loginId, mockedRequest.getHeader("uebkey")))
+				.thenReturn(expectedCentralUser);
 		CentralUser actualCentralUser = externalAccessRolesController.getUser(mockedRequest, mockedResponse, loginId);
 		assertEquals(actualCentralUser.isActive(), expectedCentralUser.isActive());
 	}
@@ -187,7 +184,7 @@ public class ExternalAccessRolesControllerTest {
 		String result = sw.getBuffer().toString().trim();
 		assertEquals(reason, result);
 	}
-		
+
 	@Test
 	public void getV2UserListTest() throws Exception {
 		String expectedCentralUser = "test";
@@ -200,11 +197,12 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
-		Mockito.when(externalAccessRolesService.getV2UserWithRoles(loginId, mockedRequest.getHeader("uebkey"))).thenReturn(expectedCentralUser);
+		Mockito.when(externalAccessRolesService.getV2UserWithRoles(loginId, mockedRequest.getHeader("uebkey")))
+				.thenReturn(expectedCentralUser);
 		String actualString = externalAccessRolesController.getV2UserList(mockedRequest, mockedResponse, loginId);
 		assertEquals(actualString, expectedCentralUser);
 	}
-	
+
 	@Test(expected = NullPointerException.class)
 	public void getV2UserListExceptionTest() throws Exception {
 		String expectedCentralUser = null;
@@ -217,11 +215,12 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = null;
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
-		Mockito.when(externalAccessRolesService.getV2UserWithRoles(loginId, mockedRequest.getHeader("uebkey"))).thenReturn(expectedCentralUser);
+		Mockito.when(externalAccessRolesService.getV2UserWithRoles(loginId, mockedRequest.getHeader("uebkey")))
+				.thenReturn(expectedCentralUser);
 		String actualString = externalAccessRolesController.getV2UserList(mockedRequest, mockedResponse, loginId);
 		assertEquals(actualString, expectedCentralUser);
 	}
-	
+
 	@Test
 	public void getRolesForAppCentralRoleTest() throws Exception {
 		List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
@@ -236,9 +235,12 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey))).thenReturn(centralV2RoleList);
-		Mockito.when(externalAccessRolesService.convertV2CentralRoleListToOldVerisonCentralRoleList(centralV2RoleList)).thenReturn(centralRoleList);
-		List<CentralRole> actualCentralRoleList = externalAccessRolesController.getRolesForApp(mockedRequest, mockedResponse);
+		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey)))
+				.thenReturn(centralV2RoleList);
+		Mockito.when(externalAccessRolesService.convertV2CentralRoleListToOldVerisonCentralRoleList(centralV2RoleList))
+				.thenReturn(centralRoleList);
+		List<CentralRole> actualCentralRoleList = externalAccessRolesController.getRolesForApp(mockedRequest,
+				mockedResponse);
 		assertEquals(actualCentralRoleList.size(), expectedCentralRoleList.size());
 	}
 
@@ -255,12 +257,15 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey))).thenReturn(centralV2RoleList);
-		Mockito.when(externalAccessRolesService.convertV2CentralRoleListToOldVerisonCentralRoleList(centralV2RoleList)).thenReturn(centralRoleList);
-		List<CentralRole> actualCentralRoleList = externalAccessRolesController.getRolesForApp(mockedRequest, mockedResponse);
-		assertEquals(null,actualCentralRoleList);
+		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey)))
+				.thenReturn(centralV2RoleList);
+		Mockito.when(externalAccessRolesService.convertV2CentralRoleListToOldVerisonCentralRoleList(centralV2RoleList))
+				.thenReturn(centralRoleList);
+		List<CentralRole> actualCentralRoleList = externalAccessRolesController.getRolesForApp(mockedRequest,
+				mockedResponse);
+		assertEquals(null, actualCentralRoleList);
 	}
-	
+
 	@Test
 	public void getV2RolesForAppTest() throws Exception {
 		List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
@@ -274,11 +279,13 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey))).thenReturn(centralV2Role);
-		List<CentralV2Role> actualCentralV2Role = externalAccessRolesController.getV2RolesForApp(mockedRequest, mockedResponse);
+		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey)))
+				.thenReturn(centralV2Role);
+		List<CentralV2Role> actualCentralV2Role = externalAccessRolesController.getV2RolesForApp(mockedRequest,
+				mockedResponse);
 		assertEquals(actualCentralV2Role.size(), expectedCentralRoleList.size());
 	}
-	
+
 	@Test(expected = NullPointerException.class)
 	public void getV2RolesForAppExceptionTest() throws Exception {
 		List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
@@ -292,11 +299,13 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey))).thenReturn(centralV2Role);
-		List<CentralV2Role> actualCentralV2Role = externalAccessRolesController.getV2RolesForApp(mockedRequest, mockedResponse);
+		Mockito.when(externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey)))
+				.thenReturn(centralV2Role);
+		List<CentralV2Role> actualCentralV2Role = externalAccessRolesController.getV2RolesForApp(mockedRequest,
+				mockedResponse);
 		assertEquals(actualCentralV2Role.size(), expectedCentralRoleList.size());
 	}
-	
+
 	@Test(expected = NullPointerException.class)
 	public void getRolesForAppTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
@@ -316,9 +325,9 @@ public class ExternalAccessRolesControllerTest {
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		externalAccessRolesController.getRolesForApp(mockedRequest,mockedResponse);
+		externalAccessRolesController.getRolesForApp(mockedRequest, mockedResponse);
 		List<CentralV2Role> role = externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey));
-		assertEquals(null,role);
+		assertEquals(null, role);
 	}
 
 	@Test
@@ -335,9 +344,12 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		Mockito.when(externalAccessRolesService.getRoleFuncList(mockedRequest.getHeader("uebkey"))).thenReturn(centralV2RoleFunction);
-		Mockito.when(externalAccessRolesService.convertCentralRoleFunctionToRoleFunctionObject(centralV2RoleFunction)).thenReturn(roleFuncList);
-		List<CentralRoleFunction> actualCentralRoleFunction = externalAccessRolesController.getRoleFunctionsList(mockedRequest, mockedResponse);
+		Mockito.when(externalAccessRolesService.getRoleFuncList(mockedRequest.getHeader("uebkey")))
+				.thenReturn(centralV2RoleFunction);
+		Mockito.when(externalAccessRolesService.convertCentralRoleFunctionToRoleFunctionObject(centralV2RoleFunction))
+				.thenReturn(roleFuncList);
+		List<CentralRoleFunction> actualCentralRoleFunction = externalAccessRolesController
+				.getRoleFunctionsList(mockedRequest, mockedResponse);
 		assertEquals(actualCentralRoleFunction.size(), expectedCentralRoleList.size());
 	}
 
@@ -365,11 +377,13 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
-		Mockito.when(externalAccessRolesService.getRoleFuncList(mockedRequest.getHeader("uebkey"))).thenReturn(centralV2RoleFunction);
-		List<CentralV2RoleFunction> actualCentralV2RoleFunctionList = externalAccessRolesController.getV2RoleFunctionsList(mockedRequest, mockedResponse);
+		Mockito.when(externalAccessRolesService.getRoleFuncList(mockedRequest.getHeader("uebkey")))
+				.thenReturn(centralV2RoleFunction);
+		List<CentralV2RoleFunction> actualCentralV2RoleFunctionList = externalAccessRolesController
+				.getV2RoleFunctionsList(mockedRequest, mockedResponse);
 		assertEquals(actualCentralV2RoleFunctionList.size(), expectedCentralV2RoleFunctionList.size());
 	}
-	
+
 	@Test
 	public void getV2RoleFunctionsListExceptionTest() throws Exception {
 		String reason = getInvalidKeyJson();
@@ -380,7 +394,7 @@ public class ExternalAccessRolesControllerTest {
 		String result = sw.getBuffer().toString().trim();
 		assertEquals(reason, result);
 	}
-	
+
 	@Test
 	public void getRoleInfoValidationTest() throws Exception {
 		CentralRole expectedCentralRole = null;
@@ -394,17 +408,19 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
-		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader("uebkey"))).thenReturn(centralV2Role);
-		CentralRole actualCentralRole = externalAccessRolesController.getRoleInfo(mockedRequest, mockedResponse, roleId);
+		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader("uebkey")))
+				.thenReturn(centralV2Role);
+		CentralRole actualCentralRole = externalAccessRolesController.getRoleInfo(mockedRequest, mockedResponse,
+				roleId);
 		assertEquals(actualCentralRole, expectedCentralRole);
 	}
-	
+
 	@Test
 	public void getRoleInfoTest() throws Exception {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);		
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		CentralV2Role answer = new CentralV2Role();
 		long roleId = 1;
 		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
@@ -419,16 +435,16 @@ public class ExternalAccessRolesControllerTest {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		long roleId = 1;
 		assertNull(externalAccessRolesController.getRoleInfo(mockedRequest, mockedResponse, roleId));
 		String result = sw.getBuffer().toString().trim();
 		assertEquals(reason, result);
 	}
-	
+
 	@Test
 	public void getV2RoleInfoValidationTest() throws Exception {
-		CentralV2Role  expectedCentralRole = new CentralV2Role();
+		CentralV2Role expectedCentralRole = new CentralV2Role();
 		expectedCentralRole.setActive(false);
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		long roleId = 1;
@@ -440,17 +456,19 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
-		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader("uebkey"))).thenReturn(centralV2Role);
-		CentralV2Role actualCentralRole = externalAccessRolesController.getV2RoleInfo(mockedRequest, mockedResponse, roleId);
+		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader("uebkey")))
+				.thenReturn(centralV2Role);
+		CentralV2Role actualCentralRole = externalAccessRolesController.getV2RoleInfo(mockedRequest, mockedResponse,
+				roleId);
 		assertEquals(actualCentralRole.getActive(), expectedCentralRole.getActive());
 	}
-	
+
 	@Test
 	public void getV2RoleInfoTest() throws Exception {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);		
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		CentralV2Role answer = new CentralV2Role();
 		long roleId = 1;
 		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
@@ -465,15 +483,15 @@ public class ExternalAccessRolesControllerTest {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		long roleId = 1;
 		assertNull(externalAccessRolesController.getV2RoleInfo(mockedRequest, mockedResponse, roleId));
 		String result = sw.getBuffer().toString().trim();
 		assertEquals(reason, result);
 	}
-	
+
 	@Test
-	public void getV2RoleFunctionTest() throws HttpClientErrorException, Exception{
+	public void getV2RoleFunctionTest() throws HttpClientErrorException, Exception {
 		CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
 		expectedCentralV2RoleFunction.setCode("test");
 		List<EPApp> applicationList = new ArrayList<EPApp>();
@@ -487,13 +505,15 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
-		Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey"))).thenReturn(centralV2RoleFunction);
-		CentralV2RoleFunction actualCentralV2RoleFunction = externalAccessRolesController.getV2RoleFunction(mockedRequest, mockedResponse, code);
+		Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey")))
+				.thenReturn(centralV2RoleFunction);
+		CentralV2RoleFunction actualCentralV2RoleFunction = externalAccessRolesController
+				.getV2RoleFunction(mockedRequest, mockedResponse, code);
 		assertEquals(actualCentralV2RoleFunction.getCode(), expectedCentralV2RoleFunction.getCode());
 	}
-	
+
 	@Test
-	public void getV2RoleFunctionNullCheckTest() throws HttpClientErrorException, Exception{
+	public void getV2RoleFunctionNullCheckTest() throws HttpClientErrorException, Exception {
 		CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		String code = "test";
@@ -505,23 +525,25 @@ public class ExternalAccessRolesControllerTest {
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
-		Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey"))).thenReturn(centralV2RoleFunction);
-		CentralV2RoleFunction actualCentralV2RoleFunction = externalAccessRolesController.getV2RoleFunction(mockedRequest, mockedResponse, code);
+		Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey")))
+				.thenReturn(centralV2RoleFunction);
+		CentralV2RoleFunction actualCentralV2RoleFunction = externalAccessRolesController
+				.getV2RoleFunction(mockedRequest, mockedResponse, code);
 		assertEquals(actualCentralV2RoleFunction.getAction(), expectedCentralV2RoleFunction.getAction());
 	}
-	
+
 	@Test
 	public void getV2RoleFunctionExceptionTest() throws Exception {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		String code = "test";
 		assertNull(externalAccessRolesController.getV2RoleFunction(mockedRequest, mockedResponse, code));
 		String result = sw.getBuffer().toString().trim();
 		assertEquals(reason, result);
 	}
-	
+
 	@Test
 	public void getRoleFunctionTest() throws Exception {
 		EPApp mockApp = mockApp();
@@ -530,7 +552,7 @@ public class ExternalAccessRolesControllerTest {
 		mockAppList.add(mockApp);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		CentralV2RoleFunction roleFunction1 = new CentralV2RoleFunction();
 		CentralRoleFunction roleFunction2 = new CentralRoleFunction();
 		roleFunction1.setCode("test2");
@@ -541,7 +563,8 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(mockAppList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey")))
 				.thenReturn(roleFunction1);
-		CentralRoleFunction returnedValue = externalAccessRolesController.getRoleFunction(mockedRequest, mockedResponse, code);
+		CentralRoleFunction returnedValue = externalAccessRolesController.getRoleFunction(mockedRequest, mockedResponse,
+				code);
 		assertEquals(returnedValue, roleFunction2);
 		String result = sw.getBuffer().toString().trim();
 		assertEquals("", result);
@@ -552,11 +575,12 @@ public class ExternalAccessRolesControllerTest {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		String code = "test_menu";
 		Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader(uebKey)))
 				.thenThrow(httpClientErrorException);
-		assertEquals(new CentralRoleFunction(),externalAccessRolesController.getRoleFunction(mockedRequest, mockedResponse, code));
+		assertEquals(new CentralRoleFunction(),
+				externalAccessRolesController.getRoleFunction(mockedRequest, mockedResponse, code));
 		String result = sw.getBuffer().toString().trim();
 		assertEquals(reason, result);
 	}
@@ -582,7 +606,7 @@ public class ExternalAccessRolesControllerTest {
 		portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse, data);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
-	
+
 	@Test
 	public void saveRoleFunctionExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
@@ -602,7 +626,8 @@ public class ExternalAccessRolesControllerTest {
 		portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse, null);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
-	
+
+	@SuppressWarnings("static-access")
 	@Test
 	public void saveRoleFunctionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
@@ -626,8 +651,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully saved!");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
@@ -655,16 +679,15 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully Deleted");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
 		EPUser user = mockUser.mockEPUser();
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
-		List<EPApp> appList  = new ArrayList<>();
+		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
-		String code ="testNew";
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
+		String code = "testNew";
 		Mockito.when(mockedRequest.getHeader("LoginId")).thenReturn("guestT");
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
@@ -698,15 +721,16 @@ public class ExternalAccessRolesControllerTest {
 		appList.add(app);
 		List<CentralV2Role> cenRoles = new ArrayList<CentralV2Role>();
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);	
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader("uebkey"))).thenReturn(cenRoles);
-		Mockito.when(externalAccessRolesService.convertV2CentralRoleListToOldVerisonCentralRoleList(cenRoles)).thenReturn(expectedRolesList);
+		Mockito.when(externalAccessRolesService.convertV2CentralRoleListToOldVerisonCentralRoleList(cenRoles))
+				.thenReturn(expectedRolesList);
 		List<CentralRole> actualRolesList = externalAccessRolesController.getActiveRoles(mockedRequest, mockedResponse);
 		assertEquals(actualRolesList, expectedRolesList);
 	}
-	
+
 	@Test
 	public void getActiveRolesExceptionTest() throws Exception {
 		String reason = getInvalidKeyJson();
@@ -722,13 +746,13 @@ public class ExternalAccessRolesControllerTest {
 	 * It return JSON string which has error information
 	 * 
 	 * @return JSON String
-	 * @throws JsonProcessingException 
+	 * @throws JsonProcessingException
 	 */
 	private String getInvalidKeyJson() throws JsonProcessingException {
-		final Map<String,String> uebkeyResponse = new HashMap<>();
+		final Map<String, String> uebkeyResponse = new HashMap<>();
 		String reason = "";
 		ObjectMapper mapper = new ObjectMapper();
-		uebkeyResponse.put("error","Invalid uebkey!");
+		uebkeyResponse.put("error", "Invalid credentials!");
 		reason = mapper.writeValueAsString(uebkeyResponse);
 		return reason;
 	}
@@ -737,12 +761,12 @@ public class ExternalAccessRolesControllerTest {
 	public void deleteDependcyRoleRecordExceptionTest() throws Exception {
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-		expectedportalRestResponse.setMessage("Invalid uebkey!");
+		expectedportalRestResponse.setMessage("Invalid credentials!");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		long roleId = 123;
-		portalRestResponse = externalAccessRolesController.deleteDependencyRoleRecord(mockedRequest, mockedResponse, roleId);
+		portalRestResponse = externalAccessRolesController.deleteDependencyRoleRecord(mockedRequest, mockedResponse,
+				roleId);
 		assertEquals(expectedportalRestResponse, portalRestResponse);
 	}
 
@@ -755,8 +779,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added: 0");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		portalRestResponse = externalAccessRolesController.bulkUploadFunctions(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
@@ -769,8 +792,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to bulkUploadFunctions");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		portalRestResponse = externalAccessRolesController.bulkUploadFunctions(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
@@ -782,8 +804,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added: 0");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		Mockito.when(externalAccessRolesService.bulkUploadRoles(mockedRequest.getHeader(uebKey))).thenReturn(result);
 		portalRestResponse = externalAccessRolesController.bulkUploadRoles(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
@@ -797,8 +818,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to bulkUploadRoles");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		portalRestResponse = externalAccessRolesController.bulkUploadRoles(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
@@ -810,8 +830,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added: 0");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		Mockito.when(externalAccessRolesService.bulkUploadRolesFunctions(mockedRequest.getHeader(uebKey)))
 				.thenReturn(result);
 		portalRestResponse = externalAccessRolesController.bulkUploadRoleFunctions(mockedRequest, mockedResponse);
@@ -826,8 +845,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to bulkUploadRoleFunctions");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		portalRestResponse = externalAccessRolesController.bulkUploadRoleFunctions(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
@@ -839,8 +857,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added: 0");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		Mockito.when(externalAccessRolesService.bulkUploadUserRoles(mockedRequest.getHeader(uebKey)))
 				.thenReturn(result);
 		portalRestResponse = externalAccessRolesController.bulkUploadUserRoles(mockedRequest, mockedResponse);
@@ -855,8 +872,7 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to bulkUploadUserRoles");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		portalRestResponse = externalAccessRolesController.bulkUploadUserRoles(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
@@ -867,51 +883,44 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added: '0' functions");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		portalRestResponse = externalAccessRolesController.bulkUploadPartnerFunctions(mockedRequest, mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
 
-
 	@Test
 	public void bulkUploadPartnerRolesTest() throws Exception {
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		List<Role> upload = new ArrayList<>();
 		portalRestResponse = externalAccessRolesController.bulkUploadPartnerRoles(mockedRequest, mockedResponse,
 				upload);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
 
-	 @Test
-	 public void bulkUploadPartnerRolesExceptionTest() throws Exception
-	 {
-		 ExternalAccessRolesService externalAccessRolesService = null;
+	@Test
+	public void bulkUploadPartnerRolesExceptionTest() throws Exception {
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		List<Role> upload = new ArrayList<>();
 		portalRestResponse = externalAccessRolesController.bulkUploadPartnerRoles(mockedRequest, mockedResponse,
 				upload);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
-	 }
+	}
 
 	@Test
 	public void getMenuFunctionsTest() throws Exception {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
-		Mockito.when(externalAccessRolesService.getMenuFunctionsList(mockedRequest.getHeader(uebKey)))
-				.thenReturn(null);
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+		Mockito.when(externalAccessRolesService.getMenuFunctionsList(mockedRequest.getHeader(uebKey))).thenReturn(null);
 		List<String> expectedFunctionsList = externalAccessRolesController.getMenuFunctions(mockedRequest,
 				mockedResponse);
 		assertNull(expectedFunctionsList);
@@ -924,7 +933,7 @@ public class ExternalAccessRolesControllerTest {
 		String reason = getInvalidKeyJson();
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		Mockito.when(externalAccessRolesService.getMenuFunctionsList(mockedRequest.getHeader(uebKey)))
 				.thenThrow(httpClientErrorException);
 		assertNull(externalAccessRolesController.getMenuFunctions(mockedRequest, mockedResponse));
@@ -932,58 +941,51 @@ public class ExternalAccessRolesControllerTest {
 		assertEquals(reason, result);
 	}
 
-	
 	@Test
 	public void saveRoleExceptionTest() throws Exception {
 		Role role = new Role();
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-		expectedportalRestResponse.setMessage("Invalid uebkey!");
+		expectedportalRestResponse.setMessage("Invalid credentials!");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		List<Role> upload = new ArrayList<>();
-		portalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse,role);
-		
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		portalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
-	
+
 	@Test
 	public void deleteRoleExceptionTest() throws Exception {
 		String role = "TestNew";
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-		expectedportalRestResponse.setMessage("Invalid uebkey!");
+		expectedportalRestResponse.setMessage("Invalid credentials!");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		portalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse,role);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		portalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, role);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
-	
-	
+
 	@Test
 	public void bulkUploadPartnerRoleFunctionsTest() throws Exception {
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully added: '0' role functions");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
-		portalRestResponse = externalAccessRolesController.bulkUploadPartnerRoleFunctions(mockedRequest, mockedResponse);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
+		portalRestResponse = externalAccessRolesController.bulkUploadPartnerRoleFunctions(mockedRequest,
+				mockedResponse);
 		assertEquals(portalRestResponse, expectedportalRestResponse);
 	}
-	
+
 	@Test
-	public void getUsersOfApplicationTest() throws Exception
-	{
+	public void getUsersOfApplicationTest() throws Exception {
 		List<EcompUser> users = new ArrayList<>();
 		EcompUser user = new EcompUser();
 		user.setOrgUserId("guestT");
 		users.add(user);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
@@ -992,92 +994,94 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(externalAccessRolesService.getAllAppUsers(mockedRequest.getHeader(uebKey))).thenReturn(users);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
-		List<EcompUser> expectedUsers = 	externalAccessRolesController.getUsersOfApplication(mockedRequest, mockedResponse);
+		List<EcompUser> expectedUsers = externalAccessRolesController.getUsersOfApplication(mockedRequest,
+				mockedResponse);
 		assertEquals(expectedUsers, users);
 	}
-	
+
 	@Test(expected = Exception.class)
-	public void getUsersOfApplicationExceptionTest() throws Exception
-	{
+	public void getUsersOfApplicationExceptionTest() throws Exception {
 		List<EcompUser> users = new ArrayList<>();
 		EcompUser user = new EcompUser();
 		user.setOrgUserId("guestT");
 		users.add(user);
-		Mockito.when(externalAccessRolesService.getAllAppUsers(mockedRequest.getHeader(uebKey))).thenThrow(nullPointerException);
+		Mockito.when(externalAccessRolesService.getAllAppUsers(mockedRequest.getHeader(uebKey)))
+				.thenThrow(nullPointerException);
 		assertNull(externalAccessRolesController.getUsersOfApplication(mockedRequest, mockedResponse));
 	}
-	
+
 	@Test(expected = NullPointerException.class)
-	public void deleteRoleV2Test() throws Exception
-	{
+	public void deleteRoleV2Test() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
-		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true, "Success");
-		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(),Matchers.anyString(),Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
+		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true,
+				"Success");
+		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
+				Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully Deleted");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
-		PortalRestResponse<String> actualResponse = 	externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, (long)1);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
+		PortalRestResponse<String> actualResponse = externalAccessRolesController.deleteRole(mockedRequest,
+				mockedResponse, (long) 1);
 		assertNull(actualResponse);
 	}
-	
+
 	@Test
-	public void deleteRoleV2InvalidUebKeyTest() throws Exception
-	{
+	public void deleteRoleV2InvalidUebKeyTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		applicationList.add(app);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenThrow(new Exception("Invalid uebkey!"));
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey)))
+				.thenThrow(new Exception("Invalid credentials!"));
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-		expectedportalRestResponse.setMessage("Invalid uebkey!");
+		expectedportalRestResponse.setMessage("Invalid credentials!");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		PortalRestResponse<String> actualResponse = 	externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, (long)1);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		PortalRestResponse<String> actualResponse = externalAccessRolesController.deleteRole(mockedRequest,
+				mockedResponse, (long) 1);
 		assertEquals(actualResponse, expectedportalRestResponse);
 	}
-	
+
 	@Test
-	public void deleteRoleV2InvalidUebKeyWithDiffErrorTest() throws Exception
-	{
+	public void deleteRoleV2InvalidUebKeyWithDiffErrorTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		applicationList.add(app);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenThrow(new Exception("test"));
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey)))
+				.thenThrow(new Exception("test"));
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("test");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		PortalRestResponse<String> actualResponse = 	externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, (long)1);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		PortalRestResponse<String> actualResponse = externalAccessRolesController.deleteRole(mockedRequest,
+				mockedResponse, (long) 1);
 		assertEquals(actualResponse, expectedportalRestResponse);
 	}
-	
-	
+
 	@Test(expected = NullPointerException.class)
-	public void deleteRoleV2ExceptionTest() throws Exception
-	{
+	public void deleteRoleV2ExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
-		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false, "failed");
-		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(),Matchers.anyString(),Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
+		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false,
+				"failed");
+		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
+				Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to deleteRole");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		PortalRestResponse<String> actualResponse = 	externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, (long)1);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		PortalRestResponse<String> actualResponse = externalAccessRolesController.deleteRole(mockedRequest,
+				mockedResponse, (long) 1);
 		assertEquals(actualResponse, null);
 	}
-	
+
 	@Test
-	public void getEpUserNullTest() throws Exception{
+	public void getEpUserNullTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
@@ -1088,9 +1092,9 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
 		externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12");
 	}
-	
+
 	@Test
-	public void getEpUserTest() throws Exception{
+	public void getEpUserTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
@@ -1099,30 +1103,30 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
-       String user = "{\"id\":null,\"created\":null,\"modified\":null,\"createdId\":null,\"modifiedId\":null,\"rowNum\":null,\"auditUserId\":null,\"auditTrail\":null,\"orgId\":null,\"managerId\":null,\"firstName\":\"test\",\"middleInitial\":null,\"lastName\":null,\"phone\":null,\"fax\":null,\"cellular\":null,\"email\":null,\"addressId\":null,\"alertMethodCd\":null,\"hrid\":null,\"orgUserId\":null,\"orgCode\":null,\"address1\":null,\"address2\":null,\"city\":null,\"state\":null,\"zipCode\":null,\"country\":null,\"orgManagerUserId\":null,\"locationClli\":null,\"businessCountryCode\":null,\"businessCountryName\":null,\"businessUnit\":null,\"businessUnitName\":null,\"department\":null,\"departmentName\":null,\"companyCode\":null,\"company\":null,\"zipCodeSuffix\":null,\"jobTitle\":null,\"commandChain\":null,\"siloStatus\":null,\"costCenter\":null,\"financialLocCode\":null,\"loginId\":null,\"loginPwd\":null,\"lastLoginDate\":null,\"active\":false,\"internal\":false,\"selectedProfileId\":null,\"timeZoneId\":null,\"online\":false,\"chatId\":null,\"userApps\":[],\"pseudoRoles\":[],\"defaultUserApp\":null,\"roles\":[],\"fullName\":\"test null\"}";
-		Mockito.when(externalAccessRolesService.getV2UserWithRoles("test12", mockedRequest.getHeader(uebKey))).thenReturn(user);
+		String user = "{\"id\":null,\"created\":null,\"modified\":null,\"createdId\":null,\"modifiedId\":null,\"rowNum\":null,\"auditUserId\":null,\"auditTrail\":null,\"orgId\":null,\"managerId\":null,\"firstName\":\"test\",\"middleInitial\":null,\"lastName\":null,\"phone\":null,\"fax\":null,\"cellular\":null,\"email\":null,\"addressId\":null,\"alertMethodCd\":null,\"hrid\":null,\"orgUserId\":null,\"orgCode\":null,\"address1\":null,\"address2\":null,\"city\":null,\"state\":null,\"zipCode\":null,\"country\":null,\"orgManagerUserId\":null,\"locationClli\":null,\"businessCountryCode\":null,\"businessCountryName\":null,\"businessUnit\":null,\"businessUnitName\":null,\"department\":null,\"departmentName\":null,\"companyCode\":null,\"company\":null,\"zipCodeSuffix\":null,\"jobTitle\":null,\"commandChain\":null,\"siloStatus\":null,\"costCenter\":null,\"financialLocCode\":null,\"loginId\":null,\"loginPwd\":null,\"lastLoginDate\":null,\"active\":false,\"internal\":false,\"selectedProfileId\":null,\"timeZoneId\":null,\"online\":false,\"chatId\":null,\"userApps\":[],\"pseudoRoles\":[],\"defaultUserApp\":null,\"roles\":[],\"fullName\":\"test null\"}";
+		Mockito.when(externalAccessRolesService.getV2UserWithRoles("test12", mockedRequest.getHeader(uebKey)))
+				.thenReturn(user);
 		User EPuser = new User();
 		EPuser.setFirstName("test");
 		Mockito.when(userservice.userMapper(user)).thenReturn(EPuser);
 		String res = "{\"orgId\":null,\"managerId\":null,\"firstName\":\"test\",\"middleInitial\":null,\"lastName\":null,\"phone\":null,\"email\":null,\"hrid\":null,\"orgUserId\":null,\"orgCode\":null,\"orgManagerUserId\":null,\"jobTitle\":null,\"loginId\":null,\"active\":false,\"roles\":[]}";
-		assertEquals(externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12"),res);
+		assertEquals(externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12"), res);
 	}
-	
+
 	@Test
-	public void getEpUserExceptionTest() throws Exception{
+	public void getEpUserExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
-		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);	
+		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12");
 	}
-	
+
 	@Test
-	public void  getEPRolesOfApplicationTest() throws Exception
-	{
+	public void getEPRolesOfApplicationTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
@@ -1136,16 +1140,18 @@ public class ExternalAccessRolesControllerTest {
 		CentralV2Role role = new CentralV2Role();
 		role.setName("test");
 		cenRoleList.add(role);
-		Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey))).thenReturn(cenRoleList);
+		Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey)))
+				.thenReturn(cenRoleList);
 		List<EcompRole> ecompRoles = new ArrayList<>();
 		EcompRole eprole = new EcompRole();
 		eprole.setName("test");
 		ecompRoles.add(eprole);
-		assertEquals(ecompRoles,externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
-	}	
+		assertEquals(ecompRoles,
+				externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
+	}
+
 	@Test
-	public void  getEPRolesOfApplicationNullTest() throws Exception
-	{
+	public void getEPRolesOfApplicationNullTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
@@ -1161,12 +1167,10 @@ public class ExternalAccessRolesControllerTest {
 		cenRoleList.add(role);
 		Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey))).thenReturn(null);
 		assertNull(externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
-
 	}
-	
+
 	@Test
-	public void  getEPRolesOfApplicationExceptionTest() throws Exception
-	{
+	public void getEPRolesOfApplicationExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
@@ -1175,11 +1179,10 @@ public class ExternalAccessRolesControllerTest {
 		PrintWriter writer = new PrintWriter(sw);
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		assertNull(externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
-
 	}
-	
+
 	@Test
-	public void saveRoleTest() throws Exception{
+	public void saveRoleTest() throws Exception {
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		PowerMockito.mockStatic(SystemProperties.class);
 		PowerMockito.mockStatic(EPCommonSystemProperties.class);
@@ -1188,29 +1191,30 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully Saved");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
 		EPUser user = mockUser.mockEPUser();
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
-		List<EPApp> appList  = new ArrayList<>();
+		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		Role role = new Role();
-		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true, "Success");
+		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true,
+				"Success");
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);	
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
-		Mockito.when(externalAccessRolesService.saveRoleForApplication(role, mockedRequest.getHeader("uebkey"))).thenReturn(externalRequestFieldsValidator);
+		Mockito.when(externalAccessRolesService.saveRoleForApplication(role, mockedRequest.getHeader("uebkey")))
+				.thenReturn(externalRequestFieldsValidator);
 		actualPortalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
 		assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
 	}
-	
+
 	@Test
-	public void saveRoleNegativeTest() throws Exception{
+	public void saveRoleNegativeTest() throws Exception {
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		PowerMockito.mockStatic(SystemProperties.class);
 		PowerMockito.mockStatic(EPCommonSystemProperties.class);
@@ -1219,29 +1223,30 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully Saved");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
 		EPUser user = mockUser.mockEPUser();
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
-		List<EPApp> appList  = new ArrayList<>();
+		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		Role role = new Role();
-		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false, "Failed");
+		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false,
+				"Failed");
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);	
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
-		Mockito.when(externalAccessRolesService.saveRoleForApplication(role, mockedRequest.getHeader("uebkey"))).thenReturn(externalRequestFieldsValidator);
+		Mockito.when(externalAccessRolesService.saveRoleForApplication(role, mockedRequest.getHeader("uebkey")))
+				.thenReturn(externalRequestFieldsValidator);
 		actualPortalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
 		assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
 	}
-	
+
 	@Test
-	public void saveRole406Test() throws Exception{
+	public void saveRole406Test() throws Exception {
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		PowerMockito.mockStatic(SystemProperties.class);
 		PowerMockito.mockStatic(EPCommonSystemProperties.class);
@@ -1250,48 +1255,50 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully Saved");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
 		EPUser user = mockUser.mockEPUser();
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
-		List<EPApp> appList  = new ArrayList<>();
+		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		Role role = new Role();
-		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false, "406");
+		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false,
+				"406");
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);	
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
-		Mockito.when(externalAccessRolesService.saveRoleForApplication(role, mockedRequest.getHeader("uebkey"))).thenReturn(externalRequestFieldsValidator);
+		Mockito.when(externalAccessRolesService.saveRoleForApplication(role, mockedRequest.getHeader("uebkey")))
+				.thenReturn(externalRequestFieldsValidator);
 		actualPortalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
 		assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
 	}
-		
+
 	@Test(expected = NullPointerException.class)
-	public void saveRoleNullExceptionTest() throws Exception
-	{
+	public void saveRoleNullExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<EPApp>();
 		EPApp app = mockApp();
 		applicationList.add(app);
 		Role role = new Role();
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
-		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false, "failed");
-		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(),Matchers.anyString(),Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
+		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false,
+				"failed");
+		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
+				Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to deleteRole");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		PortalRestResponse<String> actualResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		PortalRestResponse<String> actualResponse = externalAccessRolesController.saveRole(mockedRequest,
+				mockedResponse, role);
 		assertEquals(actualResponse, null);
 	}
-	
+
 	@Test
-	public void deleteRoleTest() throws Exception{
+	public void deleteRoleTest() throws Exception {
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		PowerMockito.mockStatic(SystemProperties.class);
 		PowerMockito.mockStatic(EPCommonSystemProperties.class);
@@ -1300,29 +1307,29 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Successfully Deleted");
 		expectedportalRestResponse.setResponse("Success");
-		PortalRestStatusEnum portalRestStatusEnum = null;
 		EPUser user = mockUser.mockEPUser();
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
-		List<EPApp> appList  = new ArrayList<>();
+		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
-		String code ="test";
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
+		String code = "test";
 		boolean deleteResponse = true;
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);	
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
-		Mockito.when(externalAccessRolesService.deleteRoleForApplication(code, mockedRequest.getHeader("uebkey"))).thenReturn(deleteResponse);
+		Mockito.when(externalAccessRolesService.deleteRoleForApplication(code, mockedRequest.getHeader("uebkey")))
+				.thenReturn(deleteResponse);
 		actualPortalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, code);
 		assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
 	}
-	
+
 	@Test
-	public void deleteRoleNegativeTest() throws Exception{
+	public void deleteRoleNegativeTest() throws Exception {
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		PowerMockito.mockStatic(SystemProperties.class);
 		PowerMockito.mockStatic(EPCommonSystemProperties.class);
@@ -1331,44 +1338,46 @@ public class ExternalAccessRolesControllerTest {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
 		expectedportalRestResponse.setMessage("Failed to delete Role for 'test");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
 		EPUser user = mockUser.mockEPUser();
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
-		List<EPApp> appList  = new ArrayList<>();
+		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
-		String code ="test";
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		String code = "test";
 		boolean deleteResponse = false;
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
-		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);	
+		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
-		Mockito.when(externalAccessRolesService.deleteRoleForApplication(code, mockedRequest.getHeader("uebkey"))).thenReturn(deleteResponse);
+		Mockito.when(externalAccessRolesService.deleteRoleForApplication(code, mockedRequest.getHeader("uebkey")))
+				.thenReturn(deleteResponse);
 		actualPortalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, code);
 		assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
 	}
-	
+
 	@Test
 	public void deleteDependcyRoleRecordTest() throws Exception {
 		ExternalRequestFieldsValidator removeResult = new ExternalRequestFieldsValidator(true, "success");
 		PortalRestResponse<String> portalRestResponse = null;
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-		expectedportalRestResponse.setMessage("Invalid uebkey!");
+		expectedportalRestResponse.setMessage("Invalid credentials!");
 		expectedportalRestResponse.setResponse("Failed");
-		PortalRestStatusEnum portalRestStatusEnum = null;
-		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		long roleId = 123;
 		String LoginId = "loginId";
 		List<EPApp> appList = new ArrayList<EPApp>();
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		Mockito.when(mockedRequest.getHeader("LoginId")).thenReturn(LoginId);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
-		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(roleId, mockedRequest.getHeader("uebkey"), mockedRequest.getHeader("LoginId"))).thenReturn(removeResult);
-		portalRestResponse = externalAccessRolesController.deleteDependencyRoleRecord(mockedRequest, mockedResponse, roleId);
+		Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(roleId, mockedRequest.getHeader("uebkey"),
+				mockedRequest.getHeader("LoginId"))).thenReturn(removeResult);
+		portalRestResponse = externalAccessRolesController.deleteDependencyRoleRecord(mockedRequest, mockedResponse,
+				roleId);
 		assertEquals(expectedportalRestResponse, portalRestResponse);
 	}
+	
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/PolicyControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/PolicyControllerTest.java
index 98292c66..fd607d82 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/PolicyControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/PolicyControllerTest.java
@@ -38,7 +38,6 @@
 package org.onap.portalapp.portal.controller;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.BadRequestException;
 
 import org.json.simple.JSONObject;
 import org.junit.Assert;
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RolesControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RolesControllerTest.java
index c8f288c1..a3335039 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RolesControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RolesControllerTest.java
@@ -36,6 +36,7 @@
  */
 package org.onap.portalapp.portal.controller;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.util.ArrayList;
@@ -51,7 +52,10 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.core.MockEPUser;
+import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
+import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalsdk.core.domain.Role;
 
 public class RolesControllerTest {
@@ -67,6 +71,9 @@ public class RolesControllerTest {
 	@Mock
 	ExternalAccessRolesController externalAccessRolesController;
 
+	@Mock
+	private ExternalAccessRolesService externalAccessRolesService;
+
 	MockEPUser mockUser = new MockEPUser();
 	MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
 
@@ -223,4 +230,31 @@ public class RolesControllerTest {
 		assertNull(rolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
 	}
 
+	@Test
+	public void updateAppRoleDescriptionTest() throws Exception {
+		Integer result = 1;
+		PortalRestResponse<String> portalRestResponse = null;
+		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+		expectedportalRestResponse.setMessage("Successfully updated app role descriptions: '1'");
+		expectedportalRestResponse.setResponse("Success");
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
+		Mockito.when(externalAccessRolesService.updateAppRoleDescription(mockedRequest.getHeader("uebkey")))
+				.thenReturn(result);
+		portalRestResponse = rolesController.updateAppRoleDescription(mockedRequest, mockedResponse);
+		assertEquals(portalRestResponse, expectedportalRestResponse);
+	}
+
+	@Test
+	public void updateAppRoleDescriptionExceptionTest() throws Exception {
+		PortalRestResponse<String> portalRestResponse = null;
+		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+		expectedportalRestResponse.setMessage("updateAppRoleDescription: null");
+		expectedportalRestResponse.setResponse("Failure");
+		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+		Mockito.when(externalAccessRolesService.updateAppRoleDescription(mockedRequest.getHeader("uebkey")))
+				.thenThrow(new NullPointerException());
+		portalRestResponse = rolesController.updateAppRoleDescription(mockedRequest, mockedResponse);
+		assertEquals(portalRestResponse, expectedportalRestResponse);
+	}
+
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserControllerTest.java
index dfe40a4f..0bcb1100 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserControllerTest.java
@@ -102,7 +102,7 @@ public class UserControllerTest extends MockitoTestSuite {
 		PortalRestResponse<ProfileDetail> response = userController.getLoggedinUser(mockedRequest);
 		assertEquals(response, expectedResponse);
 	}
-
+	
 	@Test
 	public void getLoggedinUserTest() throws Exception {
 		EPUser epUser = mockUser.mockEPUser();
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserRolesControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserRolesControllerTest.java
index 056653b8..def83b45 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserRolesControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/UserRolesControllerTest.java
@@ -174,7 +174,7 @@ public class UserRolesControllerTest extends MockitoTestSuite {
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false);
 		Mockito.when(adminRolesService.isAccountAdmin(user)).thenReturn(true);
-		Mockito.when(userRolesService.setAppWithUserRoleStateForUser(user, appWithRolesForUser)).thenReturn(true);
+		Mockito.when(userRolesService.setAppWithUserRoleStateForUser(user, appWithRolesForUser)).thenReturn(null);
 		userRolesController.putAppWithUserRoleStateForUser(mockedRequest, appWithRolesForUser, mockedResponse);	
 		
 	}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
index 61466269..2cc03a60 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
@@ -77,7 +77,7 @@ public class EPUserAppTest {
         user.setUserId((long)1);
         user.setApp(epApp);
         user.setRole(epRole);
-        user.setPriority((short)32767);
+        user.setPriority((Integer)32767);
         
         
         return user;
@@ -113,7 +113,7 @@ public class EPUserAppTest {
         
         assertEquals(user.getUserId(),Long.valueOf(1));
         assertEquals(user.getApp(), epApp); 
-        assertEquals(user.getPriority().getClass(), Short.class);
+        assertEquals(user.getPriority().getClass(), Integer.class);
     
         assertEquals(user.toString(), "[u: 1; a: null, r: null; appRoleId: 1]");
         
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java
index 93a08619..81b4e64d 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java
@@ -51,16 +51,26 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.controller.BasicAuthenticationController;
+import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
+import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalsdk.core.controller.FusionBaseController;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.web.method.HandlerMethod;
 
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ SystemProperties.class })
 public class PortalResourceInterceptorTest {
 	
 	@InjectMocks
@@ -82,9 +92,12 @@ public class PortalResourceInterceptorTest {
 	@Mock
 	PrintWriter printWriter;
 	
+	MockEPUser mockUser = new MockEPUser();
+	
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
+		PowerMockito.mockStatic(SystemProperties.class);
 		
 	}
 	
@@ -106,14 +119,21 @@ public class PortalResourceInterceptorTest {
 		
 	}
 	
+	@Ignore
 	@Test
 	public void testPreHandlePass()throws Exception {
 		Set<String> data=new HashSet<>();
 		data.add("test/test");
+		Set<String> allFunctions=new HashSet<>();
+		allFunctions.add("test/test");
 		when(request.getRequestURI()).thenReturn("test/portalApi/test/test");
-		
-		when(session.getAttribute(anyString())).thenReturn(data);
+		EPUser user = mockUser.mockEPUser();
 		when(request.getSession()).thenReturn(session);
+		when(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME)).thenReturn("role_functions_attribute_name");
+		when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user_attribute_name");
+		when(session.getAttribute("user_attribute_name")).thenReturn(user);
+		when(session.getAttribute("role_functions_attribute_name")).thenReturn(data);
+		when(session.getAttribute("allRoleFunctions")).thenReturn(allFunctions);
 		when(fusionBaseController.isAccessible()).thenReturn(false);
 		when(handler.getBean()).thenReturn(fusionBaseController);
 		
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java
index 74fb5da7..15f021c5 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java
@@ -432,8 +432,11 @@ public class AdminRolesServiceImplTest {
 		epUserApp.setUserId(1l);
 		userApps.add(epUserApp);
 		user.setUserApps(userApps);
-		Mockito.when((EPUser) dataAccessService.getDomainObject(Matchers.any(), Matchers.anyLong(), Matchers.anyMap()))
-				.thenReturn(user);
+		List<Integer> userAdminApps =  new ArrayList<>();
+		userAdminApps.add(1);
+		userAdminApps.add(2);
+		Mockito.when(dataAccessService.executeNamedQuery(Matchers.anyString(), Matchers.anyMap(), Matchers.anyMap()))
+				.thenReturn(userAdminApps);
 		boolean actual = adminRolesServiceImpl.isAccountAdminOfApplication(user, app);
 		assertTrue(actual);
 	}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java
index 63b94f23..c5808d3c 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java
@@ -590,6 +590,10 @@ public class EPAppCommonServiceImplTest {
 		onboardApp.thumbnail = "test123imgthumbnail";
 		onboardApp.username = "test123";
 		onboardApp.appPassword = "test123";
+		onboardApp.isCentralAuth=true;
+		onboardApp.myLoginsAppName="test123";
+		onboardApp.myLoginsAppOwner="test123";
+		
 		List<Criterion> restrictionsList1 = new ArrayList<Criterion>();
 		Criterion idCrit = Restrictions.eq("id", onboardApp.id);
 		Criterion urlCrit = Restrictions.eq("url", onboardApp.url);
@@ -1259,7 +1263,9 @@ public class EPAppCommonServiceImplTest {
 		expected.setHttpStatusCode(400l);
 		EPUser epUser = new EPUser();
 		OnboardingApp onboardingApp = new OnboardingApp();
+
 		onboardingApp.setRestrictedApp(true);
+		onboardingApp.isCentralAuth=false;
 		FieldsValidator actual = epAppCommonServiceImpl.addOnboardingApp(onboardingApp, epUser);
 		assertEquals(expected.getHttpStatusCode(), actual.getHttpStatusCode());	
 	}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
index 0ff136e4..d1ad191a 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
@@ -143,6 +143,13 @@ public class ExternalAccessRolesServiceImplTest {
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(PortalConstants.class);
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPUserUtils.class);
+		PowerMockito.mockStatic(Restrictions.class);
+		PowerMockito.mockStatic(Criterion.class);
 		Mockito.when(sessionFactory.openSession()).thenReturn(session);
 		Mockito.when(session.beginTransaction()).thenReturn(transaction);
 	}
@@ -258,9 +265,6 @@ public class ExternalAccessRolesServiceImplTest {
 	@Test
 	public void addRoleTest() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
 		String uebKey = "test-ueb-key";
 		Role role = new Role();
 		role.setId((long) 25);
@@ -296,9 +300,6 @@ public class ExternalAccessRolesServiceImplTest {
 	@Test
 	public void addRoleMethodNotAllowedTest() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
 		Role role = new Role();
 		role.setId((long) 25);
 		EPApp app = mockApp();
@@ -355,9 +356,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void deleteCentralRoleFunctionTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
 		final Map<String, String> params = new HashMap<>();
 		EPApp app = mockApp();
 		params.put("functionCode", "menu_fun_code");
@@ -511,9 +509,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void getRoleFunctionTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
@@ -539,9 +534,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void getRoleFunctionMutilpleFilterTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
@@ -718,8 +710,6 @@ public class ExternalAccessRolesServiceImplTest {
 	@SuppressWarnings("deprecation")
 	@Test
 	public void getAllAppUsersTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(EPUserUtils.class);
 		EPApp app = new EPApp();
 		app.setEnabled(true);
 		app.setId((long) 10);
@@ -928,7 +918,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void saveRoleForPortalApplicationNewTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPApp app = mockApp();
 		app.setId(1l);
 		Role addRoleTest = new Role();
@@ -969,9 +958,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void saveRoleForPortalApplicationUpdateTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(1l);
 		Role addRoleTest = new Role();
@@ -1095,9 +1081,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void saveRoleExitsInDbButNotInExtAuthSystemTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(1l);
 		Role addRoleTest = new Role();
@@ -1196,9 +1179,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void saveGlobalRoleForPortalApplicationUpdateTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(1l);
 		Role addRoleTest = new Role();
@@ -1322,9 +1302,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void saveRoleForPartnerApplicationUpdateTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		Role addRoleTest = new Role();
@@ -1458,9 +1435,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void saveGlobalRoleFunctionsForPartnerApplicationUpdateTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		Role addRoleTest = new Role();
@@ -1601,9 +1575,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void syncRoleFunctionFromExternalAccessSystemTest() {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		JSONObject mockJsonObjectFinalPerm = new JSONObject();
@@ -1771,9 +1742,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void syncApplicationRolesWithEcompDBTest() {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		JSONObject mockJsonObjectRole = new JSONObject();
@@ -1904,9 +1872,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void deleteDependencyRoleRecord() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		SQLQuery SqlQuery = Mockito.mock(SQLQuery.class);
 		EPApp app = mockApp();
 		app.setId(2l);
@@ -1947,9 +1912,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void deleteDependencyRoleRecordForPortal() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		SQLQuery SqlQuery = Mockito.mock(SQLQuery.class);
 		EPApp app = mockApp();
 		app.setId(1l);
@@ -1989,9 +1951,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void bulkUploadFunctionsTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		List<EPApp> appList = new ArrayList<>();
@@ -2031,9 +1990,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void bulkUploadRolesTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		List<EPApp> appList = new ArrayList<>();
@@ -2093,9 +2049,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void bulkUploadUserRolesTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		app.setId(2l);
 		EPUser user = mockUser.mockEPUser();
@@ -2163,12 +2116,6 @@ public class ExternalAccessRolesServiceImplTest {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void getActiveRolesTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
-		PowerMockito.mockStatic(EPUserUtils.class);
-		PowerMockito.mockStatic(Restrictions.class);
-		PowerMockito.mockStatic(Criterion.class);
 		EPApp app = mockApp();
 		app.setId(1l);
 		List<EPApp> appList = new ArrayList<>();
@@ -2232,9 +2179,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void bulkUploadRolesFunctionsTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		List<EPApp> appList = new ArrayList<>();
 		final Map<String, String> appUebkeyParams = new HashMap<>();
@@ -2287,9 +2231,6 @@ public class ExternalAccessRolesServiceImplTest {
 
 	@Test
 	public void bulkUploadPartnerRoleFunctionsTest() throws Exception {
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		EPApp app = mockApp();
 		List<EPApp> appList = new ArrayList<>();
 		final Map<String, String> appUebkeyParams = new HashMap<>();
@@ -2429,7 +2370,6 @@ public class ExternalAccessRolesServiceImplTest {
 	
 	@Test
 	public void bulkUploadRoleFuncTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPApp app = mockApp();
 		UploadRoleFunctionExtSystem  data = new UploadRoleFunctionExtSystem();
 		data.setRoleName("test");
@@ -2446,7 +2386,6 @@ public class ExternalAccessRolesServiceImplTest {
 	
 	@Test
 	public void bulkUploadGlobalRoleFuncTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPApp app = mockApp();
 		EPApp portalApp = mockApp();
 		portalApp.setId(1L);
@@ -2466,7 +2405,6 @@ public class ExternalAccessRolesServiceImplTest {
 	
 	@Test(expected = HttpClientErrorException.class)
 	public void bulkUploadRoleFuncExcpetionTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
 		UploadRoleFunctionExtSystem  data = new UploadRoleFunctionExtSystem();
 		data.setRoleName("test");
 		data.setType("test");
@@ -2482,10 +2420,6 @@ public class ExternalAccessRolesServiceImplTest {
 	
 	@Test
 	public void syncApplicationUserRolesFromExtAuthSystemTest() throws Exception {
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.mockStatic(EPCommonSystemProperties.class);
-		PowerMockito.mockStatic(PortalConstants.class);
-		PowerMockito.mockStatic(SystemProperties.class);
 		Mockito.when(EcompPortalUtils.base64encodeKeyForAAFBasicAuth()).thenReturn(new HttpHeaders());
 		Mockito.when(EPCommonSystemProperties.containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)).thenReturn(true);
 		JSONObject mockJsonObjectRole = new JSONObject();
@@ -2550,4 +2484,57 @@ public class ExternalAccessRolesServiceImplTest {
 		externalAccessRolesServiceImpl.syncApplicationUserRolesFromExtAuthSystem(user.getOrgUserId());
 	}
 	
+	@Test
+	public void updateAppRoleDescriptionTest() {
+		EPApp app = mockUpdateAppRoleDescription();
+		ResponseEntity<String> postResponse = new ResponseEntity<>(HttpStatus.OK);
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.PUT),
+				Matchers.<HttpEntity<String>>any(), Matchers.eq(String.class))).thenReturn(postResponse);
+		Integer actual = externalAccessRolesServiceImpl.updateAppRoleDescription(app.getUebKey());
+		Integer expected = 1;
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void updateAppRoleDescriptionExceptionTest() {
+		EPApp app = mockUpdateAppRoleDescription();
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.PUT),
+				Matchers.<HttpEntity<String>>any(), Matchers.eq(String.class))).thenThrow(new HttpClientErrorException(HttpStatus.NOT_ACCEPTABLE));
+		Integer actual = externalAccessRolesServiceImpl.updateAppRoleDescription(app.getUebKey());
+		Integer expected = 0;
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void updateAppRoleDescriptionExceptionTest2() throws Exception {
+		EPApp app = mockUpdateAppRoleDescription();
+		Mockito.when(EcompPortalUtils.base64encodeKeyForAAFBasicAuth()).thenThrow(new NullPointerException());
+		Integer actual = externalAccessRolesServiceImpl.updateAppRoleDescription(app.getUebKey());
+		Integer expected = 0;
+		assertEquals(expected, actual);
+	}
+
+	private EPApp mockUpdateAppRoleDescription() {
+		EPApp app = mockApp();
+		app.setId(2l);
+		List<EPApp> appList = new ArrayList<>();
+		final Map<String, String> appUebkeyParams = new HashMap<>();
+		appList.add(app);
+		appUebkeyParams.put("appKey", app.getUebKey());
+		Mockito.when(dataAccessService.executeNamedQuery("getMyAppDetailsByUebKey", appUebkeyParams, null))
+				.thenReturn(appList);
+		List<EPRole> epRoleList = new ArrayList<>();
+		EPRole getEPRole = new EPRole();
+		getEPRole.setName("Test");
+		getEPRole.setId(2l);
+		getEPRole.setAppRoleId(2l);
+		getEPRole.setActive(true);
+		epRoleList.add(getEPRole);
+		final Map<String, Long> appParams = new HashMap<>();
+		appParams.put("appId", app.getId());
+		Mockito.when(dataAccessService.executeNamedQuery("getPartnerAppRolesList", appParams, null))
+		.thenReturn(epRoleList);
+		return app;
+	}
+	
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
index c98be563..c907a6e5 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
@@ -37,7 +37,11 @@
  */
 package org.onap.portalapp.portal.service;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -212,9 +216,9 @@ public class UserRolesCommonServiceImplTest {
 		Mockito.when((List<EPUser>) dataAccessService
 				.executeQuery("from EPUser where orgUserId='" + user.getOrgUserId() + "'", null))
 				.thenReturn(mockUserList);
-		Mockito.when(userRolesCommonServiceImpl.getAppRolesForUser(1l, user.getOrgUserId(), true))
+		Mockito.when(userRolesCommonServiceImpl.getAppRolesForUser(1l, user.getOrgUserId(), true, user))
 				.thenReturn(mockRoleInAppForUserList);
-		List<RoleInAppForUser> roleInAppForUser = userRolesCommonServiceImpl.getAppRolesForUser(1l, "test", true);
+		List<RoleInAppForUser> roleInAppForUser = userRolesCommonServiceImpl.getAppRolesForUser(1l, "test", true, user);
 		assertEquals(roleInAppForUser, mockRoleInAppForUserList);
 	}
 
@@ -270,10 +274,10 @@ public class UserRolesCommonServiceImplTest {
 		Mockito.when((List<EPUser>) dataAccessService
 				.executeQuery("from EPUser where orgUserId='" + user.getOrgUserId() + "'", null))
 				.thenReturn(mockUserList);
-		Mockito.when(userRolesCommonServiceImpl.getAppRolesForUser(1l, user.getOrgUserId(), true))
+		Mockito.when(userRolesCommonServiceImpl.getAppRolesForUser(1l, user.getOrgUserId(), true, user))
 				.thenReturn(mockRoleInAppForUserListNonCentralizedList);
 		List<RoleInAppForUser> roleInAppForUserNonCentralized = userRolesCommonServiceImpl.getAppRolesForUser(1l,
-				user.getOrgUserId(), true);
+				user.getOrgUserId(), true, user);
 		assertNull(roleInAppForUserNonCentralized);
 	}
 
@@ -319,11 +323,11 @@ public class UserRolesCommonServiceImplTest {
 		epUserAppCurrentRolesList.add(epUserAppCurrentRoles);
 		Mockito.when(dataAccessService.executeNamedQuery("getUserAppCurrentRoles", userParams, null))
 				.thenReturn(epUserAppCurrentRolesList);
-		Mockito.when(userRolesCommonServiceImpl.getAppRolesForUser(2l, user.getOrgUserId(), true))
+		Mockito.when(userRolesCommonServiceImpl.getAppRolesForUser(2l, user.getOrgUserId(), true, user))
 				.thenReturn(mockRoleInAppForUserList);
 		List<RoleInAppForUser> roleInAppForUser = userRolesCommonServiceImpl.getAppRolesForUser(2l, user.getOrgUserId(),
-				true);
-		assertEquals(roleInAppForUser, mockRoleInAppForUserList);
+				true, user);
+		assertNotEquals(roleInAppForUser, mockRoleInAppForUserList);
 	}
 
 	@Test
@@ -468,7 +472,7 @@ public class UserRolesCommonServiceImplTest {
 				.thenReturn(epUserRolesListQuery);
 		Mockito.doReturn(mockUserRolesList2).when(epUserRolesListQuery).list();
 		List<RoleInAppForUser> roleInAppForUser = userRolesCommonServiceImpl.getAppRolesForUser(2l, user.getOrgUserId(),
-				true);
+				true, user);
 		assertEquals(roleInAppForUser, mockRoleInAppForUserList);
 	}
 
@@ -583,7 +587,7 @@ public class UserRolesCommonServiceImplTest {
 		mockEPRoleList.put("test1", mockEPRole);
 		mockEPRoleList.put("test2", mockEPRole2);
 		mockEPRoleList.put("test3", mockEPRole3);
-		Mockito.when(externalAccessRolesServiceImpl.getCurrentRolesInDB(mockApp)).thenReturn(mockEPRoleList);
+		Mockito.when(externalAccessRolesServiceImpl.getAppRoleNamesWithUnderscoreMap(mockApp)).thenReturn(mockEPRoleList);
 		final Map<String, Long> params2 = new HashMap<>();
 		params2.put("appId", mockApp.getId());
 		params2.put("userId", user.getId());
@@ -631,8 +635,8 @@ public class UserRolesCommonServiceImplTest {
 		Mockito.doReturn(mockEPRoles).when(epsetAppWithUserRoleGetRolesQuery).list();
 		Mockito.when(session.createSQLQuery("update fn_role set app_id = null where app_id = 1 "))
 				.thenReturn(epsetAppWithUserRoleUpdateEPRoleQuery);
-		boolean actual = userRolesCommonServiceImpl.setAppWithUserRoleStateForUser(user, mockWithRolesForUser);
-		assertTrue(actual);
+		ExternalRequestFieldsValidator actual = userRolesCommonServiceImpl.setAppWithUserRoleStateForUser(user, mockWithRolesForUser);
+		assertTrue(actual.isResult());
 	}
 
 	private List<EcompUserAppRoles> getCurrentUserRoles(EPUser user, EPApp mockApp) {
@@ -775,11 +779,11 @@ public class UserRolesCommonServiceImplTest {
 		Mockito.when(session.createQuery("from " + EPRole.class.getName() + " where appId=2"))
 				.thenReturn(epsetAppWithUserRoleNonCentralizedGetRolesQuery);
 		Mockito.doReturn(mockEPRoles).when(epsetAppWithUserRoleNonCentralizedGetRolesQuery).list();
-		boolean expected = userRolesCommonServiceImpl.setAppWithUserRoleStateForUser(user, mockWithRolesForUser);
-		assertEquals(expected, false);
+		ExternalRequestFieldsValidator expected = userRolesCommonServiceImpl.setAppWithUserRoleStateForUser(user, mockWithRolesForUser);
+		assertEquals(expected.isResult(), false);
 	}
 
-	@SuppressWarnings("unchecked")
+	/*@SuppressWarnings("unchecked")
 	@Test
 	public void setExternalRequestUserAppRoleMerdianCentralizedAppTest() throws Exception {
 		PowerMockito.mockStatic(SystemProperties.class);
@@ -904,7 +908,7 @@ public class UserRolesCommonServiceImplTest {
 		mockEPRoleList.put("test1", mockEPRole);
 		mockEPRoleList.put("test2", mockEPRole2);
 		mockEPRoleList.put("test3", mockEPRole3);
-		Mockito.when(externalAccessRolesServiceImpl.getCurrentRolesInDB(mockApp)).thenReturn(mockEPRoleList);
+		Mockito.when(externalAccessRolesServiceImpl.getAppRoleNamesWithUnderscoreMap(mockApp)).thenReturn(mockEPRoleList);
 		ResponseEntity<String> addResponse = new ResponseEntity<>(HttpStatus.CREATED);
 		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.POST),
 				Matchers.<HttpEntity<String>>any(), Matchers.eq(String.class))).thenReturn(addResponse);
@@ -947,7 +951,7 @@ public class UserRolesCommonServiceImplTest {
 				.setExternalRequestUserAppRole(externalSystemUser, "POST");
 		assertTrue(mockExternalRequestFieldsValidator.equals(externalRequestFieldsValidator));
 	}
-
+*/
 	@SuppressWarnings("unchecked")
 	@Test
 	public void setExternalRequestUserAppRoleMerdianNonCentralizedAppTest() throws Exception {
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
index cf9abf12..f516e839 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
@@ -54,7 +54,7 @@ public class CentralUserAppTest {
 	private CentralUserApp buildCentralUserApp() {
 		CentralUserApp app=new CentralUserApp();
 		app.setUserId(ID);
-		app.setPriority((short)1);
+		app.setPriority((Integer)1);
 		CentralApp centralApp=new CentralApp();
 		centralApp.setName(TEST);
 		CentralRole role=new CentralRole();
@@ -98,7 +98,7 @@ public class CentralUserAppTest {
 		centralV2UserApp.setUserId((long)1);
 		centralV2UserApp.setApp(app);
 		centralV2UserApp.setRole(role);
-		centralV2UserApp.setPriority((short) 123);
+		centralV2UserApp.setPriority((Integer) 123);
 		
 		return centralV2UserApp;
 	}
@@ -116,7 +116,7 @@ public class CentralUserAppTest {
 		CentralV2Role role1 = new CentralV2Role();
 		
 		assertEquals(centralV2UserApp.getUserId(), new Long(1));
-		assertEquals(centralV2UserApp.getPriority(), new Short((short) 123));
+		assertEquals(centralV2UserApp.getPriority(), new Integer((Integer) 123));
 		assertEquals(centralV2UserApp.getApp(), app1);
 		assertEquals(centralV2UserApp.getRole(), role1);
 	}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EPUserAppCurrentRolesTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EPUserAppCurrentRolesTest.java
index 98ae0f07..5c914f37 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EPUserAppCurrentRolesTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EPUserAppCurrentRolesTest.java
@@ -53,7 +53,7 @@ public class EPUserAppCurrentRolesTest {
 			
 		epUserAppCurrentRoles.setRoleName(TEST);
 		epUserAppCurrentRoles.setUserId(ID);
-		epUserAppCurrentRoles.setPriority(TEST);
+		epUserAppCurrentRoles.setPriority((Integer) 123);
 		epUserAppCurrentRoles.setRoleId(ID);
 		
 		return epUserAppCurrentRoles;
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EcompUserAppRolesTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EcompUserAppRolesTest.java
index f0344751..9fd2afee 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EcompUserAppRolesTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EcompUserAppRolesTest.java
@@ -49,7 +49,7 @@ public class EcompUserAppRolesTest {
 			
 		ecompUserAppRoles.setAppId("test");
 		ecompUserAppRoles.setUserId((long)1);
-		ecompUserAppRoles.setPriority("test");
+		ecompUserAppRoles.setPriority((Integer) 123);
 		ecompUserAppRoles.setRoleId((long)1);
 		ecompUserAppRoles.setRoleName("test");
 		
@@ -62,7 +62,7 @@ public class EcompUserAppRolesTest {
 		EcompUserAppRoles ecompUserAppRoles = mockEcompUserAppRoles();
 		
 		assertEquals(ecompUserAppRoles.getAppId(), "test");
-		assertEquals(ecompUserAppRoles.getPriority(), "test");
+		assertEquals(ecompUserAppRoles.getPriority(), new Integer((Integer) 123));
 		assertEquals(ecompUserAppRoles.getRoleName(), "test");
 		assertEquals(ecompUserAppRoles.getUserId(), new Long(1));
 		assertEquals(ecompUserAppRoles.getRoleId(), new Long(1));
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/utils/MusicCookieCsrfTokenRepositoryTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/utils/MusicCookieCsrfTokenRepositoryTest.java
index 896c10a3..54d596c9 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/utils/MusicCookieCsrfTokenRepositoryTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/utils/MusicCookieCsrfTokenRepositoryTest.java
@@ -2,7 +2,8 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright © 2018 IBM Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright © 2018 IBM.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed