From 1efaa9b5667ba11907beb849bf55f14c5927e35e Mon Sep 17 00:00:00 2001 From: "Kotagiri, Ramprasad (rp5662)" Date: Tue, 9 Apr 2019 22:10:22 -0400 Subject: Fix for spring auto-wiring issue Loaded app properties Configuration class into the web application context. This was done to ensure that the application properties are read into the Spring Environment before it is accessed by other beans. Issue-ID: CCSDK-1011 Change-Id: I8ab840b51cc09c0095f53f8e124ca4f1fa896a73 Signed-off-by: Kotagiri, Ramprasad (rp5662) --- .../main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java | 2 +- .../src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java index 63ace9c..d167f9c 100644 --- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java @@ -131,7 +131,7 @@ public class DashboardProperties { */ @Autowired public void setEnvironment(final Environment environment) { - this.environment = environment; + DashboardProperties.environment = environment; } /** diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java index b49add1..9c6b95e 100644 --- a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java +++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -19,6 +19,7 @@ */ package org.onap.portalapp.conf; +import org.onap.ccsdk.dashboard.util.DashboardProperties; import org.onap.portalsdk.core.conf.AppInitializer; public class ExternalAppInitializer extends AppInitializer { @@ -34,7 +35,7 @@ public class ExternalAppInitializer extends AppInitializer { // Show something on stdout to indicate the app is starting. System.out.println( "ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName()); - return new Class[] {appConfigClass}; + return new Class[] {appConfigClass, DashboardProperties.class}; } /* -- cgit 1.2.3-korg