From cfb69f44f841338e1f208225ec006388e986bd2c Mon Sep 17 00:00:00 2001 From: "Kotta, Shireesha (sk434m)" Date: Tue, 6 Mar 2018 09:44:53 -0500 Subject: Added Junits & AAF attributes Support Issue-ID: PORTAL-136 Includes JUNITS, AAF attributes support Change-Id: Id4cc9f64268017665d7245d0a10369c9b498ba2f Signed-off-by: Kotta, Shireesha (sk434m) --- .../EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql | 11 +++ .../EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql | 12 +++ ecomp-sdk/epsdk-app-common/pom.xml | 101 ++++++++++++++++++++- .../service/OnBoardingApiServiceImpl.java | 54 +++++------ .../service/OnBoardingApiServiceImplTest.java | 13 ++- 5 files changed, 155 insertions(+), 36 deletions(-) create mode 100644 ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql create mode 100644 ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql (limited to 'ecomp-sdk/epsdk-app-common') diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql new file mode 100644 index 00000000..f8a7fbce --- /dev/null +++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql @@ -0,0 +1,11 @@ +use ecomp_sdk; + + +ALTER TABLE fn_function +DROP COLUMN type; + + +ALTER TABLE fn_function +DROP COLUMN action; + +commit; \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql new file mode 100644 index 00000000..32540c69 --- /dev/null +++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql @@ -0,0 +1,12 @@ +use ecomp_sdk; + +SET FOREIGN_KEY_CHECKS=0; + +alter table fn_function +add type VARCHAR(20) NULL DEFAULT NULL; + + +alter table fn_function +add action VARCHAR(20) NULL DEFAULT NULL; + +commit; \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index ae2cb96c..74621092 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -129,17 +129,17 @@ com.fasterxml.jackson.core jackson-annotations - 2.6.3 + 2.9.2 com.fasterxml.jackson.core jackson-core - 2.6.3 + 2.9.2 com.fasterxml.jackson.core jackson-databind - 2.6.3 + 2.9.2 com.mchange @@ -244,5 +244,100 @@ ${jacoco.version} runtime + + org.apache.lucene + lucene-queryparser + 7.2.1 + + + com.thoughtworks.xstream + xstream + 1.4.10 + + + org.apache.wicket + wicket-core + 1.5.16 + + + ch.qos.logback + logback-core + 1.2.3 + + + ch.qos.logback + logback-classic + 1.2.3 + + + commons-fileupload + commons-fileupload + 1.3.3 + + + commons-beanutils + commons-beanutils + 1.9.2 + + + org.apache.poi + poi + 3.17 + + + commons-logging + commons-logging + + + log4j + log4j + + + + + org.apache.poi + poi-ooxml + 3.17 + + + commons-logging + commons-logging + + + log4j + log4j + + + + + org.apache.poi + poi-scratchpad + 3.17 + + + commons-logging + commons-logging + + + log4j + log4j + + + + + org.apache.poi + poi-contrib + 3.5-FINAL + + + commons-logging + commons-logging + + + log4j + log4j + + + diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java index bfd0fc89..f19a14b6 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java @@ -108,6 +108,7 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR .getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED); private static final String isCentralized = "remote"; + private static String portalApiVersion = "/v1"; public OnBoardingApiServiceImpl() { // Defend against null-pointer exception during server startup @@ -229,11 +230,12 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR try { if (logger.isDebugEnabled()) logger.debug(EELFLoggerDelegate.debugLogger, "## REST API ## loginId: {}", loginId); - + User user = null; - if(isCentralized.equals(isAccessCentralized)){ - String responseString = restApiRequestBuilder.getViaREST("/user/" + loginId, true, loginId); - user = userService.userMapper(responseString); + if (isCentralized.equals(isAccessCentralized)) { + String responseString = restApiRequestBuilder.getViaREST(portalApiVersion+"/user/" + loginId, true, + loginId); + user = userService.userMapper(responseString); } else{ user = userProfileService.getUserByLoginId(loginId); @@ -359,30 +361,30 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR logger.debug(EELFLoggerDelegate.debugLogger, "## REST API ## loginId: {}", loginId); List ecompRoles = new ArrayList(); try { - - if(isCentralized.equals(isAccessCentralized)){ + + if (isCentralized.equals(isAccessCentralized)) { User user = null; - String responseString = restApiRequestBuilder.getViaREST("/user/" + loginId, true, loginId); - user = userService.userMapper(responseString); - SortedSet currentRoles = null; - if (user != null) { - currentRoles = user.getRoles(); - if (currentRoles != null) - for (Role role : currentRoles) - ecompRoles.add(UserUtils.convertToEcompRole(role)); - } - } - else{ - User user = userProfileService.getUserByLoginId(loginId); - SortedSet currentRoles = null; - if (user != null) { - currentRoles = user.getRoles(); - currentRoles.removeIf(role -> (role.getActive() == false)); - if (currentRoles != null) - for (Role role : currentRoles) - ecompRoles.add(UserUtils.convertToEcompRole(role)); + String responseString = restApiRequestBuilder.getViaREST(portalApiVersion+"/user/" + loginId, true, + loginId); + user = userService.userMapper(responseString); + SortedSet currentRoles = null; + if (user != null) { + currentRoles = user.getRoles(); + if (currentRoles != null) + for (Role role : currentRoles) + ecompRoles.add(UserUtils.convertToEcompRole(role)); + } + } else { + User user = userProfileService.getUserByLoginId(loginId); + SortedSet currentRoles = null; + if (user != null) { + currentRoles = user.getRoles(); + currentRoles.removeIf(role -> (role.getActive() == false)); + if (currentRoles != null) + for (Role role : currentRoles) + ecompRoles.add(UserUtils.convertToEcompRole(role)); + } } - } return ecompRoles; } catch (Exception e) { String response = "OnboardingApiService.getUserRoles failed"; diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java index 39b61b40..98ea0f8f 100644 --- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java +++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java @@ -39,7 +39,6 @@ package org.onap.portalapp.service; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -129,7 +128,7 @@ public class OnBoardingApiServiceImplTest { Assert.assertTrue(true); } - @Test(expected = PortalAPIException.class) + @Test(expected = org.onap.portalsdk.core.onboarding.exception.PortalAPIException.class) public void pushUserExceptionTest() throws Exception { PowerMockito.mockStatic(PortalApiProperties.class); Mockito.when(PortalApiProperties.getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED)).thenReturn("remote"); @@ -173,7 +172,7 @@ public class OnBoardingApiServiceImplTest { Mockito.when(PortalApiProperties.getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED)).thenReturn("remote"); String responseString = "Response"; - Mockito.when(restApiRequestBuilder.getViaREST("/user/" + loginId, true, loginId)).thenReturn(responseString); + Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenReturn(responseString); Mockito.when(userService.userMapper(responseString)).thenReturn(new User()); OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl(); @@ -201,7 +200,7 @@ public class OnBoardingApiServiceImplTest { PowerMockito.mockStatic(PortalApiProperties.class); Mockito.when(PortalApiProperties.getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED)).thenReturn("local"); String responseString = "Response"; - Mockito.when(restApiRequestBuilder.getViaREST("/user/" + loginId, true, loginId)).thenThrow(IOException.class); + Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenThrow(IOException.class); Mockito.when(userService.userMapper(responseString)).thenReturn(null); OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl(); @@ -320,7 +319,7 @@ public class OnBoardingApiServiceImplTest { public void getUserRolesTest() throws Exception { String loginId = "123"; String responseString = "Response"; - Mockito.when(restApiRequestBuilder.getViaREST("/user/" + loginId, true, loginId)).thenReturn(responseString); + Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenReturn(responseString); User user = new User(); SortedSet currentRoles = new TreeSet<>(); Role role = new Role(); @@ -333,10 +332,10 @@ public class OnBoardingApiServiceImplTest { Assert.assertNotNull(ecompRoles); } - @Test(expected = PortalAPIException.class) + @Test(expected = org.onap.portalsdk.core.onboarding.exception.PortalAPIException.class) public void getUserRolesExceptionTest() throws Exception { String loginId = "123"; - Mockito.when(restApiRequestBuilder.getViaREST("/user/" + loginId, true, loginId)).thenThrow(IOException.class); + Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenThrow(IOException.class); OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl(); onBoardingApiServiceImpl.getUserRoles(loginId); } -- cgit