From cca8e17ff1487366072aac8720058fe1465d0ea3 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 16 Apr 2018 12:34:29 -0400 Subject: Fix properties precedence Updated aai-service so that /aaiclient.properties has highest precedence, over any properties bundled within the jar / karaf container. Change-Id: I5289889d5afc7fa5ae9deac92b5826e2087a329d Issue-ID: CCSDK-243 Signed-off-by: Timoney, Dan (dt5972) --- .../org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java index 3450ff74..baa86c44 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java @@ -71,20 +71,20 @@ public class AAIServiceProvider implements UtilsProvider { * Set up the prioritized list of strategies for resolving dblib properties files. */ public AAIServiceProvider() { + dblibPropertiesFileResolvers.add(new SdncConfigEnvVarFileResolver( + "Using property file (1) from environment variable" + )); dblibPropertiesFileResolvers.add(new JREFileResolver( - "Using property file (1) from JRE argument", AAIServiceProvider.class + "Using property file (2) from JRE argument", AAIServiceProvider.class )); dblibPropertiesFileResolvers.add(new BundleContextFileResolver( - "Using property file (1) from JRE argument", AAIServiceProvider.class - )); - dblibPropertiesFileResolvers.add(new SdncConfigEnvVarFileResolver( - "Using property file (2) from environment variable" + "Using property file (3) from JRE argument", AAIServiceProvider.class )); dblibPropertiesFileResolvers.add(new KarafRootFileResolver( "Using property file (4) from karaf root", this )); dblibPropertiesFileResolvers.add(new CoreDefaultFileResolver( - "Using property file (3) from default directory" + "Using property file (5) from default directory" )); // determines properties file as according to the priority described in the class header comment -- cgit 1.2.3-korg