Fix the new tosca converter

[clamp.git] / src / main / java / org / onap / clamp / clds / tosca / update / elements / Constraint.java

diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Constraint.java b/src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java
similarity index 93%
rename from src/main/java/org/onap/clamp/clds/tosca/update/Constraint.java
rename to src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java
index 4f6b27a..d6bd355 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Constraint.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java
@@ -21,21 +21,22 @@
  *\r
  */\r
 \r
-package org.onap.clamp.clds.tosca.update;\r
+package org.onap.clamp.clds.tosca.update.elements;\r
 \r
 import com.google.gson.JsonArray;\r
 import com.google.gson.JsonObject;\r
 import java.util.ArrayList;\r
 import java.util.LinkedHashMap;\r
 import java.util.Map.Entry;\r
+import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;\r
 \r
 public class Constraint {\r
 \r
     private LinkedHashMap<String, Object> constraints;\r
-    private Template template;\r
+    private JsonTemplate jsonTemplate;\r
 \r
-    public Constraint(LinkedHashMap<String, Object> constraints, Template template) {\r
-        this.template = template;\r
+    public Constraint(LinkedHashMap<String, Object> constraints, JsonTemplate jsonTemplate) {\r
+        this.jsonTemplate = jsonTemplate;\r
         this.constraints = constraints;\r
     }\r
 \r
@@ -120,7 +121,7 @@ public class Constraint {
                 checkTemplateField("maxLength", jsonSchema, fieldValue);\r
                 break;\r
             case "array":\r
-                if (fieldValue.equals(1) && template.hasFields("uniqueItems")) {\r
+                if (fieldValue.equals(1) && jsonTemplate.hasFields("uniqueItems")) {\r
                     jsonSchema.addProperty("uniqueItems", true);\r
                 } else {\r
                     checkTemplateField("minItems", jsonSchema, fieldValue);\r
@@ -171,7 +172,7 @@ public class Constraint {
      * @param typeProperty Get as Enum the valid values for the property\r
      */\r
     public void getValueArray(JsonObject jsonSchema, Object fieldValue, String typeProperty) {\r
-        if (template.hasFields("enum")) {\r
+        if (jsonTemplate.hasFields("enum")) {\r
             JsonArray enumeration = new JsonArray();\r
             if (typeProperty.equals("string") || typeProperty.equals("String")) {\r
                 ArrayList<String> arrayValues = (ArrayList<String>) fieldValue;\r
@@ -197,7 +198,7 @@ public class Constraint {
      * @param fieldValue Simple way to avoid code duplication\r
      */\r
     public void checkTemplateField(String field, JsonObject jsonSchema, Object fieldValue) {\r
-        if (template.hasFields(field)) {\r
+        if (jsonTemplate.hasFields(field)) {\r
             String typeField = fieldValue.getClass().getSimpleName();\r
             switch (typeField) {\r
                 case "String":\r