Improve code quality:

- Refactor Properties class
- Refactor ResourceConfig class

Issue-ID: DCAEGEN2-2449
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I9f7debafc21d9dd2912a537499d6936e511dd824

1 files changed, 16 insertions, 0 deletions

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/common/blueprint/BlueprintHelper.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/common/blueprint/BlueprintHelper.java
index ef335a8..c3b1453 100644
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/common/blueprint/BlueprintHelper.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/common/blueprint/BlueprintHelper.java
@@ -29,6 +29,7 @@ public class BlueprintHelper {
 
     public static final String INTEGER_TYPE = "integer";
     public static final String BOOLEAN_TYPE = "boolean";
+    public static final String STRING_TYPE = "string";
 
     public static LinkedHashMap<String, Object> createInputValue(String type, String description, Object defaultValue) {
         LinkedHashMap<String, Object> inputMap = new LinkedHashMap<>();
@@ -38,6 +39,13 @@ public class BlueprintHelper {
         return inputMap;
     }
 
+    public static LinkedHashMap<String, Object> createInputValue(String type, Object defaultValue) {
+        LinkedHashMap<String, Object> inputMap = new LinkedHashMap<>();
+        inputMap.put("type", type);
+        inputMap.put("default", defaultValue);
+        return inputMap;
+    }
+
     public static LinkedHashMap<String, Object> createIntegerInput(String description, Object defaultValue){
         return createInputValue(INTEGER_TYPE, description, defaultValue);
     }
@@ -46,6 +54,14 @@ public class BlueprintHelper {
         return createInputValue(BOOLEAN_TYPE, description, defaultValue);
     }
 
+    public static LinkedHashMap<String, Object> createStringInput(String description, Object defaultValue){
+        return createInputValue(STRING_TYPE, description, defaultValue);
+    }
+
+    public static LinkedHashMap<String, Object> createStringInput(Object defaultValue){
+        return createInputValue(STRING_TYPE, defaultValue);
+    }
+
     public static String joinUnderscore(String firstValue, String secondValue){
         return firstValue + "_" + secondValue;
     }