From ecb70d4efc6e1d0d664cf5d8af8b4634be76ba6b Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Fri, 6 Apr 2018 11:52:29 +0200
Subject: Fix Sonar issue
Fix issues reported by SOnar on string values
Issue-ID: CLAMP-147
Change-Id: I3ccf668b15106b32d56bc53d63b7688088561137
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---
.../clamp/clds/sdc/controller/installer/CsarInstallerImpl.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'src/main')
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java
index 4c6ed7fc..b7acbcc3 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java
+++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java
@@ -58,6 +58,7 @@ public class CsarInstallerImpl implements CsarInstaller {
private Map<String, BlueprintParserFilesConfiguration> bpmnMapping = new HashMap<>();
public static final String TEMPLATE_NAME_PREFIX = "DCAE-Designer-ClosedLoopTemplate-";
public static final String MODEL_NAME_PREFIX = "ClosedLoop-";
+ public static final String GET_INPUT_BLUEPRINT_PARAM = "get_input";
/**
* The file name that will be loaded by Spring.
*/
@@ -132,9 +133,9 @@ public class CsarInstallerImpl implements CsarInstaller {
policyNameList.add(filteredPolicyName);
} else {
String inputPolicyName = (String) ((Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>) ef
- .getValue()).get("properties")).get("policy_id")).get("get_input");
+ .getValue()).get("properties")).get("policy_id")).get(GET_INPUT_BLUEPRINT_PARAM);
if (inputPolicyName != null) {
- policyNameList.add("get_input");
+ policyNameList.add(GET_INPUT_BLUEPRINT_PARAM);
}
}
});
@@ -184,7 +185,8 @@ public class CsarInstallerImpl implements CsarInstaller {
cldsModel.setPropText("{\"global\":[{\"name\":\"service\",\"value\":[\""
+ csar.getBlueprintInvariantServiceUuid() + "\"]},{\"name\":\"vf\",\"value\":[\""
+ csar.getBlueprintInvariantResourceUuid()
- + "\"]},{\"name\":\"actionSet\",\"value\":[\"vnfRecipe\"]},{\"name\":\"location\",\"value\":[\"DC1\"]}]}");
+ + "\"]},{\"name\":\"actionSet\",\"value\":[\"vnfRecipe\"]},{\"name\":\"location\",\"value\":[\"DC1\"]},{\"name\":\"deployParameters\",\"value\":{\n"
+ + " \"policy_id\": \"" + "test" + "\"" + " }}]}");
cldsModel.setBpmnText(cldsTemplate.getBpmnText());
cldsModel.setTypeId(serviceTypeId);
cldsModel.save(cldsDao, null);
--
cgit