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 <statta@research.att.com>

diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml
index cccfc83..17812e3 100644 (file)
--- a/ecomp-sdk/epsdk-aaf/pom.xml
+++ b/ecomp-sdk/epsdk-aaf/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
        
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-aaf</artifactId>
-       <version>2.4.0-SNAPSHOT</version>
+       <version>2.4.0</version>
        <packaging>jar</packaging>
 
        <name>ONAP Portal SDK AAF Authorization</name>

diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml
index bcf202d..cf410db 100644 (file)
--- a/ecomp-sdk/epsdk-analytics/pom.xml
+++ b/ecomp-sdk/epsdk-analytics/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
        
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-app-common/README.md b/ecomp-sdk/epsdk-app-common/README.md
index 2ba60d3..e9a5be6 100644 (file)
--- 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 2d38b6a..d534dfa 100644 (file)
--- a/ecomp-sdk/epsdk-app-common/pom.xml
+++ b/ecomp-sdk/epsdk-app-common/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

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 871a375..f8c07a9 100644 (file)
--- 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 733a179..6211273 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -10,7 +10,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml
index f0d15a7..409f4d7 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index d15b18f..7cc3a8e 100644 (file)
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-domain/pom.xml b/ecomp-sdk/epsdk-domain/pom.xml
index 34a55ac..e37a4bf 100644 (file)
--- a/ecomp-sdk/epsdk-domain/pom.xml
+++ b/ecomp-sdk/epsdk-domain/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
 
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-domain</artifactId>
-       <version>2.4.0-SNAPSHOT</version>
+       <version>2.4.0</version>
        <packaging>jar</packaging>
        <name>ONAP Portal SDK Domain</name>
 

diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml
index 91487ad..2bc0cd1 100644 (file)
--- a/ecomp-sdk/epsdk-fw/pom.xml
+++ b/ecomp-sdk/epsdk-fw/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 45ebddc..68a34d5 100644 (file)
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
        
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-music</artifactId>
-       <version>2.4.0-SNAPSHOT</version>
+       <version>2.4.0</version>
        <packaging>jar</packaging>
 
        <name>ONAP Portal SDK Music</name>

diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml
index eaac5a4..a50dff3 100644 (file)
--- a/ecomp-sdk/epsdk-workflow/pom.xml
+++ b/ecomp-sdk/epsdk-workflow/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.4.0-SNAPSHOT</version>
+               <version>2.4.0</version>
        </parent>
        
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index 8acbdac..e0d6c0e 100644 (file)
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -14,7 +14,7 @@
        <!-- Portal SDK Maven parent project -->
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-project</artifactId>
-       <version>2.4.0-SNAPSHOT</version>
+       <version>2.4.0</version>
        <packaging>pom</packaging>
        <name>portal-sdk</name>
        <url>https://wiki.onap.org/display/DW/Portal</url>