From cddbf4178c451ed6ff7a0eb3aaf0655176107221 Mon Sep 17 00:00:00 2001 From: st782s Date: Wed, 1 Aug 2018 17:16:07 -0400 Subject: Get Analytics call resulting in NPE Issue-ID: PORTAL-344,PORTAL-288 Includes POM changes to prepare for release Change-Id: Ia7980c27ae1859273bacac8b7569d9396d31fe0c Signed-off-by: st782s --- ecomp-sdk/epsdk-aaf/pom.xml | 4 ++-- ecomp-sdk/epsdk-analytics/pom.xml | 2 +- ecomp-sdk/epsdk-app-common/README.md | 3 +++ ecomp-sdk/epsdk-app-common/pom.xml | 2 +- .../java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java | 5 +++-- ecomp-sdk/epsdk-app-os/pom.xml | 2 +- ecomp-sdk/epsdk-app-overlay/pom.xml | 2 +- ecomp-sdk/epsdk-core/pom.xml | 2 +- ecomp-sdk/epsdk-domain/pom.xml | 4 ++-- ecomp-sdk/epsdk-fw/pom.xml | 2 +- ecomp-sdk/epsdk-music/pom.xml | 4 ++-- ecomp-sdk/epsdk-workflow/pom.xml | 2 +- ecomp-sdk/pom.xml | 2 +- 13 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml index cccfc833..17812e33 100644 --- a/ecomp-sdk/epsdk-aaf/pom.xml +++ b/ecomp-sdk/epsdk-aaf/pom.xml @@ -5,12 +5,12 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 org.onap.portal.sdk epsdk-aaf - 2.4.0-SNAPSHOT + 2.4.0 jar ONAP Portal SDK AAF Authorization diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml index bcf202d5..cf410db1 100644 --- a/ecomp-sdk/epsdk-analytics/pom.xml +++ b/ecomp-sdk/epsdk-analytics/pom.xml @@ -5,7 +5,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 diff --git a/ecomp-sdk/epsdk-app-common/README.md b/ecomp-sdk/epsdk-app-common/README.md index 2ba60d3b..e9a5be68 100644 --- a/ecomp-sdk/epsdk-app-common/README.md +++ b/ecomp-sdk/epsdk-app-common/README.md @@ -24,6 +24,9 @@ AngularJS version 1.5.0. ### ONAP Distributions +Version 2.4.0 +- PORTAL 344 Get Analytics call resulting in NPE + Version 2.1.0 - PORTAL 161 Add the JUNIT plumbing for PortalSDK - PORTAL 160 Prevent unauthorized access to SamplePages, Report Pages, Role diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index 2d38b6a5..d534dfa1 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -5,7 +5,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 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 871a3750..f8c07a9b 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 @@ -120,9 +120,10 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR // initialize the base class definition for Admin Auth Extension adminAuthExtensionServiceImpl = appContext.getBean(IAdminAuthExtension.class); userService = appContext.getBean(UserService.class); - if(isCentralized.equals(isAccessCentralized)){ - restApiRequestBuilder = appContext.getBean(RestApiRequestBuilder.class); appServiceImpl = appContext.getBean(AppService.class); + + if(isCentralized.equals(isAccessCentralized)){ + restApiRequestBuilder = appContext.getBean(RestApiRequestBuilder.class); } } diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 733a1798..62112735 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -10,7 +10,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml index f0d15a73..409f4d7a 100644 --- a/ecomp-sdk/epsdk-app-overlay/pom.xml +++ b/ecomp-sdk/epsdk-app-overlay/pom.xml @@ -5,7 +5,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml index d15b18ff..7cc3a8e3 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -6,7 +6,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 diff --git a/ecomp-sdk/epsdk-domain/pom.xml b/ecomp-sdk/epsdk-domain/pom.xml index 34a55ac4..e37a4bfe 100644 --- a/ecomp-sdk/epsdk-domain/pom.xml +++ b/ecomp-sdk/epsdk-domain/pom.xml @@ -5,12 +5,12 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 org.onap.portal.sdk epsdk-domain - 2.4.0-SNAPSHOT + 2.4.0 jar ONAP Portal SDK Domain diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml index 91487ad8..2bc0cd12 100644 --- a/ecomp-sdk/epsdk-fw/pom.xml +++ b/ecomp-sdk/epsdk-fw/pom.xml @@ -6,7 +6,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml index 45ebddc3..68a34d5b 100644 --- a/ecomp-sdk/epsdk-music/pom.xml +++ b/ecomp-sdk/epsdk-music/pom.xml @@ -5,12 +5,12 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 org.onap.portal.sdk epsdk-music - 2.4.0-SNAPSHOT + 2.4.0 jar ONAP Portal SDK Music diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml index eaac5a44..a50dff3c 100644 --- a/ecomp-sdk/epsdk-workflow/pom.xml +++ b/ecomp-sdk/epsdk-workflow/pom.xml @@ -5,7 +5,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml index 8acbdac6..e0d6c0e6 100644 --- a/ecomp-sdk/pom.xml +++ b/ecomp-sdk/pom.xml @@ -14,7 +14,7 @@ org.onap.portal.sdk epsdk-project - 2.4.0-SNAPSHOT + 2.4.0 pom portal-sdk https://wiki.onap.org/display/DW/Portal -- cgit 1.2.3-korg