From 5cfbc4a1f1187eb330f5e88b3d9965d5732b5581 Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Tue, 26 Jan 2021 13:27:57 +0100 Subject: Bp-generator, fix app-config inputs in different types Issue-ID: DCAEGEN2-1179 Signed-off-by: Tomasz Wrobel Change-Id: I0a368f47e0737d8870144de8ab25a385e922f2a3 --- .../service/base/BlueprintHelperService.java | 42 ++++++++++++++++------ .../service/common/AppConfigService.java | 19 +++++----- 2 files changed, 43 insertions(+), 18 deletions(-) (limited to 'mod') diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintHelperService.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintHelperService.java index c9759d0..0526f48 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintHelperService.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintHelperService.java @@ -32,8 +32,8 @@ import java.util.LinkedHashMap; /** * @author : Ravi Mantena - * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp - * and DCAE Blueprint Applications Service: An interface for Common Functions used across Blueprint + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp and DCAE Blueprint + * Applications Service: An interface for Common Functions used across Blueprint */ @Service public class BlueprintHelperService { @@ -41,8 +41,8 @@ public class BlueprintHelperService { /** * creates Input value by contatinating Type, Description and Default value * - * @param type Input Type - * @param description Description + * @param type Input Type + * @param description Description * @param defaultValue Default value of Type * @return */ @@ -58,7 +58,7 @@ public class BlueprintHelperService { /** * creates Input value by contatinating Type and Description * - * @param type Input Type + * @param type Input Type * @param description Description * @return */ @@ -72,7 +72,7 @@ public class BlueprintHelperService { /** * creates Input value by contatinating Type and Default value * - * @param type Input Type + * @param type Input Type * @param defaultValue Default value of Type * @return */ @@ -86,7 +86,7 @@ public class BlueprintHelperService { /** * creates Input value by contatinating Description and Default value * - * @param description Description + * @param description Description * @param defaultValue Default value of Type * @return */ @@ -118,7 +118,7 @@ public class BlueprintHelperService { /** * creates Integer Input value for given Description and Default value * - * @param description Description + * @param description Description * @param defaultValue Default value of Type * @return */ @@ -149,7 +149,8 @@ public class BlueprintHelperService { /** * creates String Input value for given Default value - * @param description Description + * + * @param description Description * @param defaultValue Default value of Type * @return */ @@ -172,10 +173,31 @@ public class BlueprintHelperService { return createInputValue(Constants.STRING_TYPE, defaultValue); } + /** + * creates proper Input for given inputType and defaultValue. + *

+ * Default input type: "string". + * + * @param inputType Input type, supported: "boolean", "integer" + * @param defaultValue Default value of Type + * @return + */ + public LinkedHashMap createInputByType(String inputType, Object defaultValue) { + switch (inputType) { + case "boolean": + return createBooleanInput(defaultValue); + case "integer": + return createIntegerInput(defaultValue); + default: + return createStringInput(defaultValue); + } + } + + /** * Concatenates String Input values with Underscore * - * @param firstValue Value + * @param firstValue Value * @param secondValue Value * @return */ diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java index da70511..b31fc49 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java @@ -43,8 +43,7 @@ import java.util.TreeMap; /** * @author : Ravi Mantena - * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service used to create App - * Config + * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service used to create App Config */ @Service("onapAppConfigService") public class AppConfigService { @@ -60,12 +59,12 @@ public class AppConfigService { /** - * Creates Inputs section under App Config with Publishes, Subscribes, Parameters sections by - * checking Datarouter/MessageRouter/override/Dmaap values + * Creates Inputs section under App Config with Publishes, Subscribes, Parameters sections by checking + * Datarouter/MessageRouter/override/Dmaap values * - * @param inputs Inputs + * @param inputs Inputs * @param onapComponentSpec Onap Component Specification - * @param isDmaap Dmaap Argument + * @param isDmaap Dmaap Argument * @return */ public Map createAppconfig( @@ -95,8 +94,7 @@ public class AppConfigService { paramInput.setBpInputName(pName); parameters.put(pName, paramInput); if (!"".equals(p.getValue())) { - LinkedHashMap pInputs = - blueprintHelperService.createStringInput(p.getValue()); + LinkedHashMap pInputs = createInputFromParameter(p); inputs.put(pName, pInputs); } else { LinkedHashMap pInputs = new LinkedHashMap<>(); @@ -124,4 +122,9 @@ public class AppConfigService { return response; } + private LinkedHashMap createInputFromParameter(Parameters parameter) { + String inputType = parameter.getType() == null ? "string" : parameter.getType(); + + return blueprintHelperService.createInputByType(inputType, parameter.getValue()); + } } -- cgit 1.2.3-korg