X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Ftosca%2Fupdate%2Felements%2FConstraint.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Ftosca%2Fupdate%2FConstraint.java;h=d6bd355e30b536de9c545c744a2431a0dad756f4;hb=723de7f63f0951d0cfe7a23956cf9d00128809b1;hp=4f6b27a6ae076da2f0405fff17d1c85f63bdc8f7;hpb=774b4ba65f0d23ae34d3bddb63058796121c1ae3;p=clamp.git

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