Reduce number of parameters

[portal.git] / ecomp-portal-BE-common / src / test / java / org / onap / portalapp / portal / controller / ExternalAccessRolesControllerTest.java

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 556e215..6b06ee2 100644 (file)
--- 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.

  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed


@@ -37,7 +37,6 @@
  */
 package org.onap.portalapp.portal.controller;
 
  */
 package org.onap.portalapp.portal.controller;
 

-

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 


@@ -69,11 +68,7 @@ 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.portalapp.portal.service.ExternalAccessRolesServiceImpl;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalapp.portal.service.ExternalAccessRolesServiceImpl;

-import org.onap.portalapp.portal.transport.CentralRole;
-import org.onap.portalapp.portal.transport.CentralRoleFunction;
-import org.onap.portalapp.portal.transport.CentralUser;
-import org.onap.portalapp.portal.transport.CentralV2Role;
-import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator;
+import org.onap.portalapp.portal.transport.*;

 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.portal.utils.PortalConstants;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.portal.utils.PortalConstants;


@@ -91,7 +86,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.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;
 import org.springframework.web.client.HttpClientErrorException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;


@@ -102,38 +96,32 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @PrepareForTest({ EcompPortalUtils.class, PortalConstants.class, SystemProperties.class,
                EPCommonSystemProperties.class })
 public class ExternalAccessRolesControllerTest {
 @PrepareForTest({ EcompPortalUtils.class, PortalConstants.class, SystemProperties.class,
                EPCommonSystemProperties.class })
 public class ExternalAccessRolesControllerTest {

-

        @Mock
        ExternalAccessRolesService externalAccessRolesService = new ExternalAccessRolesServiceImpl();
        @Mock
        ExternalAccessRolesService externalAccessRolesService = new ExternalAccessRolesServiceImpl();

-

        @InjectMocks
        @InjectMocks

-       ExternalAccessRolesController externalAccessRolesController = new ExternalAccessRolesController();
+       ExternalAccessRolesController externalAccessRolesController;

        @Mock
        @Mock

-       UserService userservice =  new UserServiceCentalizedImpl();
-       
+       UserService userservice = new UserServiceCentalizedImpl();

        @Mock
        @Mock

-       AuditService auditService; 
+       AuditService auditService;

 
        @Before
        public void setup() {
                MockitoAnnotations.initMocks(this);
        }
 
        @Before
        public void setup() {
                MockitoAnnotations.initMocks(this);
        }

+

        @Mock
        AuditLog auditLog = new AuditLog();
        @Mock
        AuditLog auditLog = new AuditLog();

-

        MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
        MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();

-

        HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest();
        HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
        NullPointerException nullPointerException = new NullPointerException();
        HttpClientErrorException httpClientErrorException = new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Failed");
        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";
 
        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");
                EPApp app = new EPApp();
                app.setName("Test");
                app.setImageUrl("test");


@@ -156,10 +144,23 @@ public class ExternalAccessRolesControllerTest {
                app.setAppType(1);
                return app;
        }
                app.setAppType(1);
                return app;
        }

-       
+

        @Test
        public void getUserTest() throws Exception {
        @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.CentralUserBuilder().setId(null).setCreated(null).setModified(null).setCreatedId(null)
+                        .setModifiedId(null).setRowNum(null).setOrgId(null).setManagerId(null).setFirstName(loginId)
+                        .setMiddleInitial(loginId).setLastName(loginId).setPhone(loginId).setFax(loginId)
+                        .setCellular(loginId).setEmail(loginId).setAddressId(null).setAlertMethodCd(loginId)
+                        .setHrid(loginId).setOrgUserId(loginId).setOrgCode(loginId).setAddress1(loginId)
+                        .setAddress2(loginId).setCity(loginId).setState(loginId).setZipCode(loginId).setCountry(loginId)
+                        .setOrgManagerUserId(loginId).setLocationClli(loginId).setBusinessCountryCode(loginId)
+                        .setBusinessCountryName(loginId).setBusinessUnit(loginId).setBusinessUnitName(loginId)
+                        .setDepartment(loginId).setDepartmentName(loginId).setCompanyCode(loginId).setCompany(loginId)
+                        .setZipCodeSuffix(loginId).setJobTitle(loginId).setCommandChain(loginId).setSiloStatus(loginId)
+                        .setCostCenter(loginId).setFinancialLocCode(loginId).setLoginId(loginId).setLoginPwd(loginId)
+                        .setLastLoginDate(null).setActive(false).setInternal(false).setSelectedProfileId(null)
+                        .setTimeZoneId(null).setOnline(false).setChatId(loginId).setUserApps(null).createCentralUser();

                String loginId = "test";
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                String loginId = "test";
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);


@@ -172,7 +173,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);
                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());
        }
                CentralUser actualCentralUser = externalAccessRolesController.getUser(mockedRequest, mockedResponse, loginId);
                assertEquals(actualCentralUser.isActive(), expectedCentralUser.isActive());
        }


@@ -187,7 +189,19 @@ public class ExternalAccessRolesControllerTest {
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }

-               
+
+       @Test
+       public void getUserXSSTest() throws Exception {
+               String loginId = "<script ~~~>alert(0%0)</script ~~~>";
+               String expected = getXSSKeyJson();
+               StringWriter sw = new StringWriter();
+               PrintWriter writer = new PrintWriter(sw);
+               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+               externalAccessRolesController.getUser(mockedRequest, mockedResponse, loginId);
+               String actual = sw.getBuffer().toString().trim();
+               assertEquals(expected, actual);
+               }
+

        @Test
        public void getV2UserListTest() throws Exception {
                String expectedCentralUser = "test";
        @Test
        public void getV2UserListTest() throws Exception {
                String expectedCentralUser = "test";


@@ -200,11 +214,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);
                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);
        }
                String actualString = externalAccessRolesController.getV2UserList(mockedRequest, mockedResponse, loginId);
                assertEquals(actualString, expectedCentralUser);
        }

-       
+

        @Test(expected = NullPointerException.class)
        public void getV2UserListExceptionTest() throws Exception {
                String expectedCentralUser = null;
        @Test(expected = NullPointerException.class)
        public void getV2UserListExceptionTest() throws Exception {
                String expectedCentralUser = null;


@@ -217,15 +232,16 @@ 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);
                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);
        }
                String actualString = externalAccessRolesController.getV2UserList(mockedRequest, mockedResponse, loginId);
                assertEquals(actualString, expectedCentralUser);
        }

-       
+

        @Test
        public void getRolesForAppCentralRoleTest() throws Exception {
        @Test
        public void getRolesForAppCentralRoleTest() throws Exception {

-               List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<CentralRole> expectedCentralRoleList = new ArrayList<>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2Role> centralV2RoleList = new ArrayList<>();
                List<CentralRole> centralRoleList = new ArrayList<>();
                EPApp app = mockApp();
                List<CentralV2Role> centralV2RoleList = new ArrayList<>();
                List<CentralRole> centralRoleList = new ArrayList<>();
                EPApp app = mockApp();


@@ -236,15 +252,18 @@ 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(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());
        }
 
        @Test(expected = NullPointerException.class)
        public void getRolesForAppCentralRoleExceptionTest() throws Exception {
                assertEquals(actualCentralRoleList.size(), expectedCentralRoleList.size());
        }
 
        @Test(expected = NullPointerException.class)
        public void getRolesForAppCentralRoleExceptionTest() throws Exception {

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2Role> centralV2RoleList = new ArrayList<>();
                List<CentralRole> centralRoleList = new ArrayList<>();
                EPApp app = mockApp();
                List<CentralV2Role> centralV2RoleList = new ArrayList<>();
                List<CentralRole> centralRoleList = new ArrayList<>();
                EPApp app = mockApp();


@@ -255,16 +274,19 @@ 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(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 {
        @Test
        public void getV2RolesForAppTest() throws Exception {

-               List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<CentralRole> expectedCentralRoleList = new ArrayList<>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2Role> centralV2Role = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);
                List<CentralV2Role> centralV2Role = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);


@@ -274,15 +296,17 @@ 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(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());
        }
                assertEquals(actualCentralV2Role.size(), expectedCentralRoleList.size());
        }

-       
+

        @Test(expected = NullPointerException.class)
        public void getV2RolesForAppExceptionTest() throws Exception {
        @Test(expected = NullPointerException.class)
        public void getV2RolesForAppExceptionTest() throws Exception {

-               List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<CentralRole> expectedCentralRoleList = new ArrayList<>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2Role> centralV2Role = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);
                List<CentralV2Role> centralV2Role = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);


@@ -292,14 +316,16 @@ 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(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());
        }
                assertEquals(actualCentralV2Role.size(), expectedCentralRoleList.size());
        }

-       
+

        @Test(expected = NullPointerException.class)
        public void getRolesForAppTest() throws Exception {
        @Test(expected = NullPointerException.class)
        public void getRolesForAppTest() throws Exception {

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2Role> answer = new ArrayList<>();
                EPApp app = mockApp();
                applicationList.add(app);
                List<CentralV2Role> answer = new ArrayList<>();
                EPApp app = mockApp();
                applicationList.add(app);


@@ -311,21 +337,21 @@ public class ExternalAccessRolesControllerTest {
 
        @Test(expected = NullPointerException.class)
        public void getRolesForAppExceptionTest() throws Exception {
 
        @Test(expected = NullPointerException.class)
        public void getRolesForAppExceptionTest() throws Exception {

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
                EPApp app = mockApp();
                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));
                List<CentralV2Role> role = externalAccessRolesService.getRolesForApp(mockedRequest.getHeader(uebKey));

-               assertEquals(null,role);
+               assertEquals(null, role);

        }
 
        @Test
        public void getRoleFunctionsListTest() throws Exception {
        }
 
        @Test
        public void getRoleFunctionsListTest() throws Exception {

-               List<CentralRole> expectedCentralRoleList = new ArrayList<CentralRole>();
-               List<CentralRoleFunction> roleFuncList = new ArrayList<CentralRoleFunction>();
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<CentralRole> expectedCentralRoleList = new ArrayList<>();
+               List<CentralRoleFunction> roleFuncList = new ArrayList<>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2RoleFunction> centralV2RoleFunction = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);
                List<CentralV2RoleFunction> centralV2RoleFunction = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);


@@ -335,9 +361,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(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());
        }
 
                assertEquals(actualCentralRoleFunction.size(), expectedCentralRoleList.size());
        }
 


@@ -354,8 +383,8 @@ public class ExternalAccessRolesControllerTest {
 
        @Test
        public void getV2RoleFunctionsListTest() throws Exception {
 
        @Test
        public void getV2RoleFunctionsListTest() throws Exception {

-               List<CentralV2RoleFunction> expectedCentralV2RoleFunctionList = new ArrayList<CentralV2RoleFunction>();
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<CentralV2RoleFunction> expectedCentralV2RoleFunctionList = new ArrayList<>();
+               List<EPApp> applicationList = new ArrayList<>();

                List<CentralV2RoleFunction> centralV2RoleFunction = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);
                List<CentralV2RoleFunction> centralV2RoleFunction = new ArrayList<>();
                EPApp app = mockApp();
                app.setCentralAuth(true);


@@ -365,11 +394,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(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());
        }
                assertEquals(actualCentralV2RoleFunctionList.size(), expectedCentralV2RoleFunctionList.size());
        }

-       
+

        @Test
        public void getV2RoleFunctionsListExceptionTest() throws Exception {
                String reason = getInvalidKeyJson();
        @Test
        public void getV2RoleFunctionsListExceptionTest() throws Exception {
                String reason = getInvalidKeyJson();


@@ -380,13 +411,13 @@ public class ExternalAccessRolesControllerTest {
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }

-       
+

        @Test
        public void getRoleInfoValidationTest() throws Exception {
                CentralRole expectedCentralRole = null;
        @Test
        public void getRoleInfoValidationTest() throws Exception {
                CentralRole expectedCentralRole = null;

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                long roleId = 1;
                long roleId = 1;

-               CentralV2Role centralV2Role = new CentralV2Role();
+               CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();

                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);
                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);


@@ -394,18 +425,20 @@ 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);
                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);
        }
                assertEquals(actualCentralRole, expectedCentralRole);
        }

-       
+

        @Test
        public void getRoleInfoTest() throws Exception {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
        @Test
        public void getRoleInfoTest() throws Exception {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);

-               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);            
-               CentralV2Role answer = new CentralV2Role();
+               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+               CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();

                long roleId = 1;
                Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
                                .thenReturn(answer);
                long roleId = 1;
                Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
                                .thenReturn(answer);


@@ -419,20 +452,20 @@ public class ExternalAccessRolesControllerTest {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                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);
        }
                long roleId = 1;
                assertNull(externalAccessRolesController.getRoleInfo(mockedRequest, mockedResponse, roleId));
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }

-       
+

        @Test
        public void getV2RoleInfoValidationTest() throws Exception {
        @Test
        public void getV2RoleInfoValidationTest() throws Exception {

-               CentralV2Role  expectedCentralRole = new CentralV2Role();
+               CentralV2Role expectedCentralRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();

                expectedCentralRole.setActive(false);
                expectedCentralRole.setActive(false);

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                long roleId = 1;
                long roleId = 1;

-               CentralV2Role centralV2Role = new CentralV2Role();
+               CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();

                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);
                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);


@@ -440,18 +473,20 @@ 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);
                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());
        }
                assertEquals(actualCentralRole.getActive(), expectedCentralRole.getActive());
        }

-       
+

        @Test
        public void getV2RoleInfoTest() throws Exception {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
        @Test
        public void getV2RoleInfoTest() throws Exception {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);

-               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);            
-               CentralV2Role answer = new CentralV2Role();
+               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+               CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();

                long roleId = 1;
                Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
                                .thenReturn(answer);
                long roleId = 1;
                Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
                                .thenReturn(answer);


@@ -465,18 +500,18 @@ public class ExternalAccessRolesControllerTest {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                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);
        }
                long roleId = 1;
                assertNull(externalAccessRolesController.getV2RoleInfo(mockedRequest, mockedResponse, roleId));
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }

-       
+

        @Test
        @Test

-       public void getV2RoleFunctionTest() throws HttpClientErrorException, Exception{
+       public void getV2RoleFunctionTest() throws Exception {

                CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
                expectedCentralV2RoleFunction.setCode("test");
                CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
                expectedCentralV2RoleFunction.setCode("test");

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                String code = "test";
                CentralV2RoleFunction centralV2RoleFunction = new CentralV2RoleFunction();
                centralV2RoleFunction.setCode("test");
                String code = "test";
                CentralV2RoleFunction centralV2RoleFunction = new CentralV2RoleFunction();
                centralV2RoleFunction.setCode("test");


@@ -487,15 +522,18 @@ 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);
                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());
        }
                assertEquals(actualCentralV2RoleFunction.getCode(), expectedCentralV2RoleFunction.getCode());
        }

-       
+
+

        @Test
        @Test

-       public void getV2RoleFunctionNullCheckTest() throws HttpClientErrorException, Exception{
+       public void getV2RoleFunctionNullCheckTest() throws Exception {

                CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
                CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                String code = "test";
                CentralV2RoleFunction centralV2RoleFunction = null;
                EPApp app = mockApp();
                String code = "test";
                CentralV2RoleFunction centralV2RoleFunction = null;
                EPApp app = mockApp();


@@ -505,23 +543,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);
                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());
        }
                assertEquals(actualCentralV2RoleFunction.getAction(), expectedCentralV2RoleFunction.getAction());
        }

-       
+

        @Test
        public void getV2RoleFunctionExceptionTest() throws Exception {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
        @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);
        }
                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();
        @Test
        public void getRoleFunctionTest() throws Exception {
                EPApp mockApp = mockApp();


@@ -530,7 +570,7 @@ public class ExternalAccessRolesControllerTest {
                mockAppList.add(mockApp);
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                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");
                CentralV2RoleFunction roleFunction1 = new CentralV2RoleFunction();
                CentralRoleFunction roleFunction2 = new CentralRoleFunction();
                roleFunction1.setCode("test2");


@@ -541,7 +581,8 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.getNameSpaceIfExists(mockAppList.get(0))).thenReturn(response);
                Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey")))
                                .thenReturn(roleFunction1);
                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);
                assertEquals(returnedValue, roleFunction2);
                String result = sw.getBuffer().toString().trim();
                assertEquals("", result);


@@ -552,23 +593,51 @@ public class ExternalAccessRolesControllerTest {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                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);
                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);
        }
 
                String result = sw.getBuffer().toString().trim();
                assertEquals(reason, result);
        }
 

+       @Test
+       public void getRoleFunctionXSSTest() throws Exception {
+               String expected = getXSSKeyJson();
+               EPApp mockApp = mockApp();
+               mockApp.setCentralAuth(true);
+               List<EPApp> mockAppList = new ArrayList<>();
+               mockAppList.add(mockApp);
+               StringWriter sw = new StringWriter();
+               PrintWriter writer = new PrintWriter(sw);
+               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+               CentralV2RoleFunction roleFunction1 = new CentralV2RoleFunction();
+               CentralRoleFunction roleFunction2 = new CentralRoleFunction();
+               roleFunction1.setCode("test2");
+               String code = "<script>alert(‘XSS’)</script>";
+               Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(mockAppList);
+               ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
+               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);
+               assertEquals(returnedValue, roleFunction2);
+               String result = sw.getBuffer().toString().trim();
+               assertEquals(expected, result);
+       }
+

        @Test
        public void saveRoleFunctionIfIsNotDeletedTest() throws Exception {
        @Test
        public void saveRoleFunctionIfIsNotDeletedTest() throws Exception {

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                PortalRestResponse<String> portalRestResponse = null;
                EPApp app = mockApp();
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage(null);
                expectedportalRestResponse.setResponse("Failed");
                expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
                expectedportalRestResponse.setMessage(null);
                expectedportalRestResponse.setResponse("Failed");
                expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);


@@ -582,16 +651,16 @@ public class ExternalAccessRolesControllerTest {
                portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse, data);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }
                portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse, data);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }

-       
+

        @Test
        public void saveRoleFunctionExceptionTest() throws Exception {
        @Test
        public void saveRoleFunctionExceptionTest() throws Exception {

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                PortalRestResponse<String> portalRestResponse = null;
                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage(null);
                expectedportalRestResponse.setResponse("Failed");
                expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
                expectedportalRestResponse.setMessage(null);
                expectedportalRestResponse.setResponse("Failed");
                expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);


@@ -602,10 +671,10 @@ public class ExternalAccessRolesControllerTest {
                portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse, null);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }
                portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse, null);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }

-       
+

        @Test
        public void saveRoleFunctionTest() throws Exception {
        @Test
        public void saveRoleFunctionTest() throws Exception {

-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               List<EPApp> applicationList = new ArrayList<>();

                EPUser user = mockUser.mockEPUser();
                List<EPUser> userList = new ArrayList<>();
                userList.add(user);
                EPUser user = mockUser.mockEPUser();
                List<EPUser> userList = new ArrayList<>();
                userList.add(user);


@@ -623,11 +692,10 @@ public class ExternalAccessRolesControllerTest {
                saveRoleFunc.setAppId(app.getId());
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                PortalRestResponse<String> portalRestResponse = null;
                saveRoleFunc.setAppId(app.getId());
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully saved!");
                expectedportalRestResponse.setResponse("Success");
                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);
                Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
                ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);


@@ -645,6 +713,47 @@ public class ExternalAccessRolesControllerTest {
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }
 
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }
 

+       @Test
+       public void saveRoleFunctionXSSTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();
+               EPUser user = mockUser.mockEPUser();
+               List<EPUser> userList = new ArrayList<>();
+               userList.add(user);
+               EPApp app = mockApp();
+               app.setCentralAuth(true);
+               applicationList.add(app);
+               JSONObject roleFunc = new JSONObject();
+               roleFunc.put("type", "<script>alert(“XSS”)</script> ");
+               roleFunc.put("code", "test_instance");
+               roleFunc.put("action", "test_action");
+               roleFunc.put("name", "test_name");
+               ObjectMapper mapper = new ObjectMapper();
+               mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+               CentralV2RoleFunction saveRoleFunc = mapper.readValue(roleFunc.toString(), CentralV2RoleFunction.class);
+               saveRoleFunc.setAppId(app.getId());
+               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
+               PortalRestResponse<String> portalRestResponse = null;
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Failed to roleFunc, not valid data.");
+               expectedportalRestResponse.setResponse("Failed");
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+               Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
+               ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
+               Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
+               Mockito.when(externalAccessRolesService.getRoleFunction("test_type|test_instance|test_action", app.getUebKey()))
+                       .thenReturn(null);
+               Mockito.when(externalAccessRolesService.saveCentralRoleFunction(Matchers.any(CentralV2RoleFunction.class),
+                       Matchers.any(EPApp.class))).thenReturn(true);
+               Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader(Matchers.anyString())))
+                       .thenReturn(userList);
+               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(Matchers.anyString())))
+                       .thenReturn(applicationList);
+               portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse,
+                       roleFunc.toString());
+               assertEquals(expectedportalRestResponse, portalRestResponse);
+       }
+

        @Test
        public void deleteRoleFunctionTest() throws Exception {
                PowerMockito.mockStatic(EcompPortalUtils.class);
        @Test
        public void deleteRoleFunctionTest() throws Exception {
                PowerMockito.mockStatic(EcompPortalUtils.class);


@@ -652,19 +761,48 @@ public class ExternalAccessRolesControllerTest {
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> portalRestResponse = null;
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully Deleted");
                expectedportalRestResponse.setResponse("Success");
                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);
                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";
+               Mockito.when(mockedRequest.getHeader("LoginId")).thenReturn("guestT");
+               Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+               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.deleteCentralRoleFunction(code, app)).thenReturn(true);
+               portalRestResponse = externalAccessRolesController.deleteRoleFunction(mockedRequest, mockedResponse, code);
+               assertEquals(portalRestResponse, expectedportalRestResponse);
+       }
+
+       @Test
+       public void deleteRoleFunctionXSSTest() throws Exception {
+               PowerMockito.mockStatic(EcompPortalUtils.class);
+               PowerMockito.mockStatic(SystemProperties.class);
+               PowerMockito.mockStatic(EPCommonSystemProperties.class);
+               PowerMockito.mockStatic(PortalConstants.class);
+               PortalRestResponse<String> portalRestResponse = null;
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Failed to deleteRoleFunction, not valid data.");
+               expectedportalRestResponse.setResponse("Failed");
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+               EPUser user = mockUser.mockEPUser();
+               List<EPUser> userList = new ArrayList<>();
+               userList.add(user);
+               EPApp app = mockApp();
+               app.setCentralAuth(true);
+               List<EPApp> appList = new ArrayList<>();

                appList.add(app);
                appList.add(app);

-               expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
-               String code ="testNew";
+               String code = "<script>alert(‘XSS’)</script>";

                Mockito.when(mockedRequest.getHeader("LoginId")).thenReturn("guestT");
                Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
                Mockito.when(mockedRequest.getHeader("LoginId")).thenReturn("guestT");
                Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);


@@ -694,19 +832,20 @@ public class ExternalAccessRolesControllerTest {
                List<CentralRole> expectedRolesList = null;
                EPApp app = mockApp();
                app.setCentralAuth(true);
                List<CentralRole> expectedRolesList = null;
                EPApp app = mockApp();
                app.setCentralAuth(true);

-               List<EPApp> appList = new ArrayList<EPApp>();
+               List<EPApp> appList = new ArrayList<>();

                appList.add(app);
                appList.add(app);

-               List<CentralV2Role> cenRoles = new ArrayList<CentralV2Role>();
+               List<CentralV2Role> cenRoles = new ArrayList<>();

                Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
                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);
                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);
        }
                List<CentralRole> actualRolesList = externalAccessRolesController.getActiveRoles(mockedRequest, mockedResponse);
                assertEquals(actualRolesList, expectedRolesList);
        }

-       
+

        @Test
        public void getActiveRolesExceptionTest() throws Exception {
                String reason = getInvalidKeyJson();
        @Test
        public void getActiveRolesExceptionTest() throws Exception {
                String reason = getInvalidKeyJson();


@@ -722,27 +861,36 @@ public class ExternalAccessRolesControllerTest {
         * It return JSON string which has error information
         * 
         * @return JSON String
         * It return JSON string which has error information
         * 
         * @return JSON String

-        * @throws JsonProcessingException 
+        * @throws JsonProcessingException

         */
        private String getInvalidKeyJson() 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();
                String reason = "";
                ObjectMapper mapper = new ObjectMapper();

-               uebkeyResponse.put("error","Invalid uebkey!");
+               uebkeyResponse.put("error", "Invalid credentials!");
+               reason = mapper.writeValueAsString(uebkeyResponse);
+               return reason;
+       }
+
+       private String getXSSKeyJson() throws JsonProcessingException {
+               final Map<String, String> uebkeyResponse = new HashMap<>();
+               String reason = "";
+               ObjectMapper mapper = new ObjectMapper();
+               uebkeyResponse.put("error", "Data is not valid");

                reason = mapper.writeValueAsString(uebkeyResponse);
                return reason;
        }
 
        @Test
                reason = mapper.writeValueAsString(uebkeyResponse);
                return reason;
        }
 
        @Test

-       public void deleteDependcyRoleRecordExceptionTest() throws Exception {
+       public void deleteDependcyRoleRecordExceptionTest() {

                PortalRestResponse<String> portalRestResponse = null;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-               expectedportalRestResponse.setMessage("Invalid uebkey!");
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Invalid credentials!");

                expectedportalRestResponse.setResponse("Failed");
                expectedportalRestResponse.setResponse("Failed");

-               PortalRestStatusEnum portalRestStatusEnum = null;
-               expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);

                long roleId = 123;
                long roleId = 123;

-               portalRestResponse = externalAccessRolesController.deleteDependencyRoleRecord(mockedRequest, mockedResponse, roleId);
+               portalRestResponse = externalAccessRolesController.deleteDependencyRoleRecord(mockedRequest, mockedResponse,
+                               roleId);

                assertEquals(expectedportalRestResponse, portalRestResponse);
        }
 
                assertEquals(expectedportalRestResponse, portalRestResponse);
        }
 


@@ -752,11 +900,10 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.bulkUploadFunctions(mockedRequest.getHeader(uebKey)))
                                .thenReturn(result);
                PortalRestResponse<String> portalRestResponse = null;
                Mockito.when(externalAccessRolesService.bulkUploadFunctions(mockedRequest.getHeader(uebKey)))
                                .thenReturn(result);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added: 0");
                expectedportalRestResponse.setResponse("Success");
                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);
        }
                portalRestResponse = externalAccessRolesController.bulkUploadFunctions(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }


@@ -766,11 +913,10 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.bulkUploadFunctions(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;
                Mockito.when(externalAccessRolesService.bulkUploadFunctions(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to bulkUploadFunctions");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                portalRestResponse = externalAccessRolesController.bulkUploadFunctions(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }


@@ -779,11 +925,10 @@ public class ExternalAccessRolesControllerTest {
        public void bulkUploadRolesTest() throws Exception {
                Integer result = 0;
                PortalRestResponse<String> portalRestResponse = null;
        public void bulkUploadRolesTest() throws Exception {
                Integer result = 0;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added: 0");
                expectedportalRestResponse.setResponse("Success");
                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);
                Mockito.when(externalAccessRolesService.bulkUploadRoles(mockedRequest.getHeader(uebKey))).thenReturn(result);
                portalRestResponse = externalAccessRolesController.bulkUploadRoles(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);


@@ -794,11 +939,10 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.bulkUploadRoles(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;
                Mockito.when(externalAccessRolesService.bulkUploadRoles(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to bulkUploadRoles");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                portalRestResponse = externalAccessRolesController.bulkUploadRoles(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }


@@ -807,11 +951,10 @@ public class ExternalAccessRolesControllerTest {
        public void bulkUploadRoleFunctionsTest() throws Exception {
                Integer result = 0;
                PortalRestResponse<String> portalRestResponse = null;
        public void bulkUploadRoleFunctionsTest() throws Exception {
                Integer result = 0;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added: 0");
                expectedportalRestResponse.setResponse("Success");
                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);
                Mockito.when(externalAccessRolesService.bulkUploadRolesFunctions(mockedRequest.getHeader(uebKey)))
                                .thenReturn(result);
                portalRestResponse = externalAccessRolesController.bulkUploadRoleFunctions(mockedRequest, mockedResponse);


@@ -823,11 +966,10 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.bulkUploadRolesFunctions(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;
                Mockito.when(externalAccessRolesService.bulkUploadRolesFunctions(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to bulkUploadRoleFunctions");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                portalRestResponse = externalAccessRolesController.bulkUploadRoleFunctions(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }


@@ -836,11 +978,10 @@ public class ExternalAccessRolesControllerTest {
        public void bulkUploadUserRolesTest() throws Exception {
                Integer result = 0;
                PortalRestResponse<String> portalRestResponse = null;
        public void bulkUploadUserRolesTest() throws Exception {
                Integer result = 0;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added: 0");
                expectedportalRestResponse.setResponse("Success");
                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);
                Mockito.when(externalAccessRolesService.bulkUploadUserRoles(mockedRequest.getHeader(uebKey)))
                                .thenReturn(result);
                portalRestResponse = externalAccessRolesController.bulkUploadUserRoles(mockedRequest, mockedResponse);


@@ -852,66 +993,58 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.bulkUploadUserRoles(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;
                Mockito.when(externalAccessRolesService.bulkUploadUserRoles(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to bulkUploadUserRoles");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
 
        @Test
                portalRestResponse = externalAccessRolesController.bulkUploadUserRoles(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }
 
        @Test

-       public void bulkUploadPartnerFunctionsTest() throws Exception {
+       public void bulkUploadPartnerFunctionsTest() {

                PortalRestResponse<String> portalRestResponse = null;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added: '0' functions");
                expectedportalRestResponse.setResponse("Success");
                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);
        }
 
                portalRestResponse = externalAccessRolesController.bulkUploadPartnerFunctions(mockedRequest, mockedResponse);
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }
 

-

        @Test
        @Test

-       public void bulkUploadPartnerRolesTest() throws Exception {
+       public void bulkUploadPartnerRolesTest() {

                PortalRestResponse<String> portalRestResponse = null;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added");
                expectedportalRestResponse.setResponse("Success");
                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);
        }
 
                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() {

                PortalRestResponse<String> portalRestResponse = null;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added");
                expectedportalRestResponse.setResponse("Success");
                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);
                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);
 
        @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);
                List<String> expectedFunctionsList = externalAccessRolesController.getMenuFunctions(mockedRequest,
                                mockedResponse);
                assertNull(expectedFunctionsList);


@@ -924,7 +1057,7 @@ public class ExternalAccessRolesControllerTest {
                String reason = getInvalidKeyJson();
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                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));
                Mockito.when(externalAccessRolesService.getMenuFunctionsList(mockedRequest.getHeader(uebKey)))
                                .thenThrow(httpClientErrorException);
                assertNull(externalAccessRolesController.getMenuFunctions(mockedRequest, mockedResponse));


@@ -932,59 +1065,52 @@ public class ExternalAccessRolesControllerTest {
                assertEquals(reason, result);
        }
 
                assertEquals(reason, result);
        }
 

-       

        @Test
        @Test

-       public void saveRoleExceptionTest() throws Exception {
+       public void saveRoleExceptionTest() {

                Role role = new Role();
                PortalRestResponse<String> portalRestResponse = null;
                Role role = new Role();
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-               expectedportalRestResponse.setMessage("Invalid uebkey!");
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Invalid credentials!");

                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }

-       
+

        @Test
        @Test

-       public void deleteRoleExceptionTest() throws Exception {
+       public void deleteRoleExceptionTest() {

                String role = "TestNew";
                PortalRestResponse<String> portalRestResponse = null;
                String role = "TestNew";
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-               expectedportalRestResponse.setMessage("Invalid uebkey!");
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Invalid credentials!");

                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }

-       
-       
+

        @Test
        @Test

-       public void bulkUploadPartnerRoleFunctionsTest() throws Exception {
+       public void bulkUploadPartnerRoleFunctionsTest() {

                PortalRestResponse<String> portalRestResponse = null;
                PortalRestResponse<String> portalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully added: '0' role functions");
                expectedportalRestResponse.setResponse("Success");
                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);
        }
                assertEquals(portalRestResponse, expectedportalRestResponse);
        }

-       
+

        @Test
        @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);
                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);    
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);
                EPApp app = mockApp();
                app.setCentralAuth(true);
                applicationList.add(app);


@@ -992,93 +1118,95 @@ 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);
                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);
        }
                assertEquals(expectedUsers, users);
        }

-       
+

        @Test(expected = Exception.class)
        @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);
                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));
        }
                assertNull(externalAccessRolesController.getUsersOfApplication(mockedRequest, mockedResponse));
        }

-       
+

        @Test(expected = NullPointerException.class)
        @Test(expected = NullPointerException.class)

-       public void deleteRoleV2Test() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void deleteRoleV2Test() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                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);
-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true,
+                               "Success");
+               Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
+                               Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully Deleted");
                expectedportalRestResponse.setResponse("Success");
                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);
        }
                assertNull(actualResponse);
        }

-       
+

        @Test
        @Test

-       public void deleteRoleV2InvalidUebKeyTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void deleteRoleV2InvalidUebKeyTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                EPApp app = mockApp();
                applicationList.add(app);

-               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenThrow(new Exception("Invalid uebkey!"));
-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-               expectedportalRestResponse.setMessage("Invalid uebkey!");
+               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey)))
+                               .thenThrow(new Exception("Invalid credentials!"));
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Invalid credentials!");

                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                assertEquals(actualResponse, expectedportalRestResponse);
        }

-       
+

        @Test
        @Test

-       public void deleteRoleV2InvalidUebKeyWithDiffErrorTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void deleteRoleV2InvalidUebKeyWithDiffErrorTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                EPApp app = mockApp();
                applicationList.add(app);

-               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenThrow(new Exception("test"));
-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey)))
+                               .thenThrow(new Exception("test"));
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("test");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                assertEquals(actualResponse, expectedportalRestResponse);
        }

-       
-       
+

        @Test(expected = NullPointerException.class)
        @Test(expected = NullPointerException.class)

-       public void deleteRoleV2ExceptionTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void deleteRoleV2ExceptionTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                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);
-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false,
+                               "failed");
+               Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
+                               Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to deleteRole");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                assertEquals(actualResponse, null);
        }

-       
+

        @Test
        @Test

-       public void getEpUserNullTest() throws Exception{
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void getEpUserNullTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);
                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);


@@ -1086,12 +1214,12 @@ 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);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
                Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);

-               assertNull(externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12"));
+               externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12");

        }
        }

-       
+

        @Test
        @Test

-       public void getEpUserTest() throws Exception{
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void getEpUserTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);
                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);


@@ -1099,31 +1227,31 @@ 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);
                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\":[],\"roles\":[]}";
+               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\":[]}";
                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
        @Test

-       public void getEpUserExceptionTest() throws Exception{
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void getEpUserExceptionTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setCentralAuth(true);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                StringWriter sw = new StringWriter();
                PrintWriter writer = new PrintWriter(sw);
                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);    
-               assertNull(externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12"));
+               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+               externalAccessRolesController.getEcompUser(mockedRequest, mockedResponse, "test12");

        }
        }

-       
+

        @Test
        @Test

-       public void  getEPRolesOfApplicationTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void getEPRolesOfApplicationTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);
                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);


@@ -1136,17 +1264,19 @@ public class ExternalAccessRolesControllerTest {
                CentralV2Role role = new CentralV2Role();
                role.setName("test");
                cenRoleList.add(role);
                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);
                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
        @Test

-       public void  getEPRolesOfApplicationNullTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void getEPRolesOfApplicationNullTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);
                EPApp app = mockApp();
                app.setUebKey("uebKey");
                app.setCentralAuth(true);


@@ -1156,18 +1286,16 @@ public class ExternalAccessRolesControllerTest {
                Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
                Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
                List<CentralV2Role> cenRoleList = new ArrayList<>();
                Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
                Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
                List<CentralV2Role> cenRoleList = new ArrayList<>();

-               CentralV2Role role = new CentralV2Role();
+               CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();

                role.setName("test");
                cenRoleList.add(role);
                Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey))).thenReturn(null);
                assertNull(externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
                role.setName("test");
                cenRoleList.add(role);
                Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey))).thenReturn(null);
                assertNull(externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));

-

        }
        }

-       
+

        @Test
        @Test

-       public void  getEPRolesOfApplicationExceptionTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void getEPRolesOfApplicationExceptionTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                app.setCentralAuth(true);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                EPApp app = mockApp();
                app.setCentralAuth(true);
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);


@@ -1175,200 +1303,236 @@ public class ExternalAccessRolesControllerTest {
                PrintWriter writer = new PrintWriter(sw);
                Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
                assertNull(externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));
                PrintWriter writer = new PrintWriter(sw);
                Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
                assertNull(externalAccessRolesController.getEcompRolesOfApplication(mockedRequest, mockedResponse));

-

        }
        }

-       
+

        @Test
        @Test

-       public void saveRoleTest() throws Exception{
+       public void saveRoleTest() throws Exception {

                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;
                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully Saved");
                expectedportalRestResponse.setResponse("Success");
                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);
                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);
                appList.add(app);

-               expectedportalRestResponse.setStatus(portalRestStatusEnum.OK);
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);

                Role role = new Role();
                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(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);
                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());
        }
                actualPortalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
                assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
        }

-       
+

        @Test
        @Test

-       public void saveRoleNegativeTest() throws Exception{
+       public void saveRoleNegativeTest() throws Exception {

                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;
                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully Saved");
                expectedportalRestResponse.setResponse("Success");
                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);
                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);
                appList.add(app);

-               expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);

                Role role = new Role();
                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(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);
                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());
        }
                actualPortalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
                assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
        }

-       
+

        @Test
        @Test

-       public void saveRole406Test() throws Exception{
+       public void saveRole406Test() throws Exception {

                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;
                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully Saved");
                expectedportalRestResponse.setResponse("Failed");
                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);
                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);
                appList.add(app);

-               expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);

                Role role = new Role();
                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(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);
                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());
        }
                actualPortalRestResponse = externalAccessRolesController.saveRole(mockedRequest, mockedResponse, role);
                assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
        }

-               
+

        @Test(expected = NullPointerException.class)
        @Test(expected = NullPointerException.class)

-       public void saveRoleNullExceptionTest() throws Exception
-       {
-               List<EPApp> applicationList = new ArrayList<EPApp>();
+       public void saveRoleNullExceptionTest() throws Exception {
+               List<EPApp> applicationList = new ArrayList<>();

                EPApp app = mockApp();
                applicationList.add(app);
                Role role = new Role();
                Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
                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);
-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(false,
+                               "failed");
+               Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
+                               Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to deleteRole");
                expectedportalRestResponse.setResponse("Failed");
                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);
        }
                assertEquals(actualResponse, null);
        }

-       
+

        @Test
        @Test

-       public void deleteRoleTest() throws Exception{
+       public void deleteRoleTest() throws Exception {

                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;
                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Successfully Deleted");
                expectedportalRestResponse.setResponse("Success");
                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);
                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);
                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);
                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);
                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());
        }
                actualPortalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, code);
                assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
        }

-       
+
+       @Test
+       public void deleteRoleXSSTest() throws Exception {
+               PowerMockito.mockStatic(EcompPortalUtils.class);
+               PowerMockito.mockStatic(SystemProperties.class);
+               PowerMockito.mockStatic(EPCommonSystemProperties.class);
+               PowerMockito.mockStatic(PortalConstants.class);
+               PortalRestResponse<String> actualPortalRestResponse = null;
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Failed to deleteRole, not valid data.");
+               expectedportalRestResponse.setResponse("Failed");
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+               EPUser user = mockUser.mockEPUser();
+               List<EPUser> userList = new ArrayList<>();
+               userList.add(user);
+               EPApp app = mockApp();
+               app.setCentralAuth(true);
+               List<EPApp> appList = new ArrayList<>();
+               appList.add(app);
+               String code = "<img src=xss onerror=alert(1)>";
+               boolean deleteResponse = true;
+               Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+               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);
+               actualPortalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, code);
+               assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
+       }
+

        @Test
        @Test

-       public void deleteRoleNegativeTest() throws Exception{
+       public void deleteRoleNegativeTest() throws Exception {

                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;
                PowerMockito.mockStatic(EcompPortalUtils.class);
                PowerMockito.mockStatic(SystemProperties.class);
                PowerMockito.mockStatic(EPCommonSystemProperties.class);
                PowerMockito.mockStatic(PortalConstants.class);
                PortalRestResponse<String> actualPortalRestResponse = null;

-               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();

                expectedportalRestResponse.setMessage("Failed to delete Role for 'test");
                expectedportalRestResponse.setResponse("Failed");
                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);
                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);
                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);
                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);
                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());
        }
                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;
        @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!");
+               PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<>();
+               expectedportalRestResponse.setMessage("Invalid credentials!");

                expectedportalRestResponse.setResponse("Failed");
                expectedportalRestResponse.setResponse("Failed");

-               PortalRestStatusEnum portalRestStatusEnum = null;
-               expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
+               expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);

                long roleId = 123;
                String LoginId = "loginId";
                long roleId = 123;
                String LoginId = "loginId";

-               List<EPApp> appList = new ArrayList<EPApp>();
+               List<EPApp> appList = new ArrayList<>();

                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(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);
        }
                assertEquals(expectedportalRestResponse, portalRestResponse);
        }

+       

 }
 }