1 files changed, 32 insertions, 6 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraint.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraint.java
index 8b7ce49cbc..c8fef91ea6 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraint.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraint.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,11 +20,16 @@
 
 package org.openecomp.sdc.be.model.tosca.constraints;
 
+import java.util.List;
+import java.util.Map;
+
+import org.openecomp.sdc.be.model.tosca.ToscaType;
+import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintFunctionalException;
 import org.openecomp.sdc.be.model.tosca.constraints.exception.ConstraintViolationException;
 
 import javax.validation.constraints.NotNull;
 
-public class MaxLengthConstraint extends AbstractStringPropertyConstraint {
+public class MaxLengthConstraint extends AbstractPropertyConstraint {
 
     @NotNull
     private Integer maxLength;
@@ -37,10 +42,13 @@ public class MaxLengthConstraint extends AbstractStringPropertyConstraint {
         super();
     }
 
-    @Override
-    protected void doValidate(String propertyValue) throws ConstraintViolationException {
-        if (propertyValue.length() > maxLength) {
+    protected void doValidate(Object propertyValue) throws ConstraintViolationException {
+        if (propertyValue instanceof String && String.valueOf(propertyValue).length() > maxLength) {
             throw new ConstraintViolationException("The length of the value is greater than [" + maxLength + "]");
+        } else if (propertyValue instanceof List && ((List) propertyValue).size() > maxLength) {
+            throw new ConstraintViolationException("The size of the list is greater than [" + maxLength + "]");
+        } else if (propertyValue instanceof Map && ((Map) propertyValue).size() > maxLength) {
+            throw new ConstraintViolationException("The size of the map is greater than [" + maxLength + "]");
         }
     }
 
@@ -51,4 +59,22 @@ public class MaxLengthConstraint extends AbstractStringPropertyConstraint {
     public void setMaxLength(Integer maxLength) {
         this.maxLength = maxLength;
     }
+
+    @Override
+    public void validate(Object propertyValue) throws ConstraintViolationException {
+        if (propertyValue == null) {
+            throw new ConstraintViolationException("Value to validate is null");
+        }
+
+        if(!(propertyValue instanceof String || propertyValue instanceof List || propertyValue instanceof Map)) {
+            throw new ConstraintViolationException("This constraint can only be applied on String/List/Map value");
+        }
+
+        doValidate(propertyValue);
+    }
+
+    @Override
+    public String getErrorMessage(ToscaType toscaType, ConstraintFunctionalException e, String propertyName) {
+        return getErrorMessage(toscaType, e, propertyName, "%s maximum length must be [%s]", String.valueOf(maxLength));
+    }
 }