summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-03-01 15:20:33 +0100
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-03-01 15:20:33 +0100
commitb42ef89649fc86f7912b40a6da22fb069baa94a0 (patch)
tree6d57603905095c43622b464f08465069a52acb7b /src
parent44508f217d6df709ff4b9adbbe2898dfa9dee25e (diff)
Rework CldsReferenceProp class
Refactor the code and insert new config for SDC client code Issue-ID: CLAMP-81 Change-Id: Ifabf220e7bf0067e689242f3f1ef09503b11fe87 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/clamp/clds/config/CldsReferenceProperties.java13
-rw-r--r--src/main/resources/application.properties1
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/org/onap/clamp/clds/config/CldsReferenceProperties.java b/src/main/java/org/onap/clamp/clds/config/CldsReferenceProperties.java
index a8acdee14..c0f7a7286 100644
--- a/src/main/java/org/onap/clamp/clds/config/CldsReferenceProperties.java
+++ b/src/main/java/org/onap/clamp/clds/config/CldsReferenceProperties.java
@@ -50,12 +50,20 @@ public class CldsReferenceProperties {
private String cldsReferenceValuesFile;
@PostConstruct
- public void loadConfig() throws IOException {
+ public void loadConfiguration() throws IOException {
prop = new Properties();
Resource resource = appContext.getResource(cldsReferenceValuesFile);
prop.load(resource.getInputStream());
}
+ public CldsReferenceProperties(String referenceValuesFile) throws IOException {
+ cldsReferenceValuesFile = referenceValuesFile;
+ loadConfiguration();
+ }
+
+ public CldsReferenceProperties() {
+ }
+
/**
* get property value
*
@@ -105,6 +113,7 @@ public class CldsReferenceProperties {
*/
public JsonNode getJsonTemplate(String key1, String key2) throws IOException {
ObjectMapper objectMapper = new ObjectMapper();
- return objectMapper.readValue(getStringValue(key1, key2), JsonNode.class);
+ String result = getStringValue(key1, key2);
+ return (result != null) ? objectMapper.readValue(result, JsonNode.class) : null;
}
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 38a719d8e..2ac53e0b3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -110,6 +110,7 @@ org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.propert
org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
+org.onap.clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
CLDS_PERMISSION_TYPE_CL=permission-type-cl