From b42ef89649fc86f7912b40a6da22fb069baa94a0 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Thu, 1 Mar 2018 15:20:33 +0100 Subject: 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) --- .../org/onap/clamp/clds/config/CldsReferenceProperties.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/main/java/org') 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; } } -- cgit 1.2.3-korg