re base code

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / tosca / validators / StringValidator.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/StringValidator.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/StringValidator.java
index dad3461..cd8d927 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/StringValidator.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/StringValidator.java
@@ -20,66 +20,65 @@
 
 package org.openecomp.sdc.be.model.tosca.validators;
 
-import java.util.Map;
-
 import org.openecomp.sdc.be.config.Configuration.ToscaValidatorsConfig;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.Map;
 
 public class StringValidator implements PropertyTypeValidator {
 
-       public static final int DEFAULT_STRING_MAXIMUM_LENGTH = 2500;
-
-       private static int STRING_MAXIMUM_LENGTH = DEFAULT_STRING_MAXIMUM_LENGTH;
-
-       private static Logger log = LoggerFactory.getLogger(StringValidator.class.getName());
-
-       private static StringValidator stringValidator = new StringValidator();
-
-       private StringValidator() {
-               if (ConfigurationManager.getConfigurationManager() != null) {
-                       ToscaValidatorsConfig toscaValidators = ConfigurationManager.getConfigurationManager().getConfiguration()
-                                       .getToscaValidators();
-                       log.debug("toscaValidators= {}", toscaValidators);
-                       if (toscaValidators != null) {
-                               Integer stringMaxLength = toscaValidators.getStringMaxLength();
-                               if (stringMaxLength != null) {
-                                       STRING_MAXIMUM_LENGTH = stringMaxLength;
-                               }
-                       }
-               }
-       }
-
-       public static StringValidator getInstance() {
-               return stringValidator;
-       }
-
-       @Override
-       public boolean isValid(String value, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
-
-               if (value == null || true == value.isEmpty()) {
-                       return true;
-               }
-
-               if (value.length() > STRING_MAXIMUM_LENGTH) {
-                       log.debug("parameter String length {} is higher than configured({})", value.length(), STRING_MAXIMUM_LENGTH);
-                       return false;
-               }
-               String converted = ValidationUtils.removeNoneUtf8Chars(value);
-               boolean isValid = ValidationUtils.validateIsAscii(converted);
-
-               if (false == isValid && log.isDebugEnabled()) {
-                       log.debug("parameter String value {} is not an ascii string.", value.substring(0, Math.min(value.length(), 20)));
-               }
-
-               return isValid;
-       }
-
-       @Override
-       public boolean isValid(String value, String innerType) {
-               return isValid(value, innerType, null);
-       }
+    public static final int DEFAULT_STRING_MAXIMUM_LENGTH = 2500;
+
+    private static int STRING_MAXIMUM_LENGTH = DEFAULT_STRING_MAXIMUM_LENGTH;
+
+    private static final Logger log = Logger.getLogger(StringValidator.class.getName());
+
+    private static StringValidator stringValidator = new StringValidator();
+
+    private StringValidator() {
+        if (ConfigurationManager.getConfigurationManager() != null) {
+            ToscaValidatorsConfig toscaValidators = ConfigurationManager.getConfigurationManager().getConfiguration()
+                    .getToscaValidators();
+            log.debug("toscaValidators= {}", toscaValidators);
+            if (toscaValidators != null) {
+                Integer stringMaxLength = toscaValidators.getStringMaxLength();
+                if (stringMaxLength != null) {
+                    STRING_MAXIMUM_LENGTH = stringMaxLength;
+                }
+            }
+        }
+    }
+
+    public static StringValidator getInstance() {
+        return stringValidator;
+    }
+
+    @Override
+    public boolean isValid(String value, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
+
+        if (value == null || value.isEmpty()) {
+            return true;
+        }
+
+        if (value.length() > STRING_MAXIMUM_LENGTH) {
+            log.debug("parameter String length {} is higher than configured({})", value.length(), STRING_MAXIMUM_LENGTH);
+            return false;
+        }
+        String converted = ValidationUtils.removeNoneUtf8Chars(value);
+        boolean isValid = ValidationUtils.validateIsAscii(converted);
+
+        if (!isValid && log.isDebugEnabled()) {
+            log.debug("parameter String value {} is not an ascii string.", value.substring(0, Math.min(value.length(), 20)));
+        }
+
+        return isValid;
+    }
+
+    @Override
+    public boolean isValid(String value, String innerType) {
+        return isValid(value, innerType, null);
+    }
 }