From 006ab23bc2863627571ea7a065de7b05e78b21f6 Mon Sep 17 00:00:00 2001 From: dhebeha Date: Fri, 6 Nov 2020 18:46:12 +0530 Subject: -Avoid removal of samples ico insufficient data -set aafpass and username to null if not present Review Comments fixed -pom version modified -indentation and java docs are added Issue-ID: DCAEGEN2-2509 Signed-off-by: Ahila P Change-Id: I870cc3e91cf0914ba53f0b930d60684a5bd39ef1 --- .../org/onap/slice/analysis/ms/models/Configuration.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java') diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java index 8bdbb1a8..91a07d4f 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java @@ -260,9 +260,18 @@ public class Configuration { minPercentageChange = jsonObject.get("sliceanalysisms.minPercentageChange").getAsInt(); initialDelaySeconds = jsonObject.get("sliceanalysisms.initialDelaySeconds").getAsLong(); - aafUsername = jsonObject.get("aafUsername").getAsString(); - aafPassword = jsonObject.get("aafPassword").getAsString(); - + if(jsonObject.get("aafUsername") == null) { + aafUsername = null; + } + else { + aafUsername = jsonObject.get("aafUsername").getAsString(); + } + if(jsonObject.get("aafPassword") == null) { + aafPassword = null; + } + else { + aafPassword = jsonObject.get("aafPassword").getAsString(); + } log.info("configuration from CBS {}", this); } } -- cgit 1.2.3-korg