Improve handling 'empty'/null string in Service fields

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / validation / component / ComponentProjectCodeValidator.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentProjectCodeValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentProjectCodeValidator.java
index 8d0fdf1..af08381 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentProjectCodeValidator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentProjectCodeValidator.java
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.validation.component;
 
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.components.impl.exceptions.ByResponseFormatComponentException;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -34,7 +34,7 @@ import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
 
 @org.springframework.stereotype.Component
-public class ComponentProjectCodeValidator implements  ComponentFieldValidator{
+public class ComponentProjectCodeValidator implements ComponentFieldValidator {
 
     private static final Logger log = Logger.getLogger(ComponentProjectCodeValidator.class.getName());
     private ComponentsUtils componentsUtils;
@@ -50,22 +50,18 @@ public class ComponentProjectCodeValidator implements  ComponentFieldValidator{
         }
         log.debug("validate ProjectCode name ");
         String projectCode = component.getProjectCode();
-
-        if (!ValidationUtils.validateStringNotEmpty(projectCode)) {
+        if (StringUtils.isEmpty(projectCode)) {
             log.info("projectCode is empty is allowed CR.");
             return;
         }
-
         try {
             validateProjectCode(projectCode);
         } catch (ComponentException exp) {
             ResponseFormat responseFormat = exp.getResponseFormat();
             componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, component.getComponentType(),
-                    ResourceVersionInfo.newBuilder()
-                            .build());
+                ResourceVersionInfo.newBuilder().build());
             throw exp;
         }
-
     }
 
     private void validateProjectCode(String projectCode) {