Reformat catalog-model

[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 cd8d927..4d80dba 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
@@ -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.
@@ -17,31 +17,25 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 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 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 final Logger log = Logger.getLogger(StringValidator.class.getName());
-
+    private static int STRING_MAXIMUM_LENGTH = DEFAULT_STRING_MAXIMUM_LENGTH;
     private static StringValidator stringValidator = new StringValidator();
 
     private StringValidator() {
         if (ConfigurationManager.getConfigurationManager() != null) {
-            ToscaValidatorsConfig toscaValidators = ConfigurationManager.getConfigurationManager().getConfiguration()
-                    .getToscaValidators();
+            ToscaValidatorsConfig toscaValidators = ConfigurationManager.getConfigurationManager().getConfiguration().getToscaValidators();
             log.debug("toscaValidators= {}", toscaValidators);
             if (toscaValidators != null) {
                 Integer stringMaxLength = toscaValidators.getStringMaxLength();
@@ -58,22 +52,18 @@ public class StringValidator implements PropertyTypeValidator {
 
     @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;
     }