X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fcomponents%2Fimpl%2FAdditionalInformationBusinessLogic.java;h=6153309bb616b260a64ba8c89ed5673610c0318a;hb=438650c3a958c9176db3720204ec1ff9af94fc3a;hp=c3efa610fcc7e763f1fd8d4a4a43586b62af29e9;hpb=b1fc8c337d3b9750eff6e62b626c0bc3a1467a88;p=sdc.git

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java
index c3efa610fc..6153309bb6 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java
@@ -21,6 +21,7 @@ package org.openecomp.sdc.be.components.impl;
 
 import fj.data.Either;
 import java.util.List;
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -156,10 +157,8 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
             result = valueValidRes.right().value();
         } else {
             String newValue = valueValidRes.left().value();
-            if (log.isTraceEnabled()) {
-                if (value != null && !value.equals(newValue)) {
-                    log.trace("The additional information value was normalized from {} to {}", value, newValue);
-                }
+            if (log.isTraceEnabled() && (value != null && !value.equals(newValue))) {
+                log.trace("The additional information value was normalized from {} to {}", value, newValue);
             }
             additionalInfoParameterInfo.setValue(newValue);
         }
@@ -232,8 +231,7 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
      * @return
      */
     private Either<String, ResponseFormat> validateValue(String value) {
-        boolean isNonEmptyString = ValidationUtils.validateStringNotEmpty(value);
-        if (!isNonEmptyString) {
+        if (StringUtils.isEmpty(value)) {
             return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED));
         }
         boolean valid = StringValidator.getInstance().isValid(value, null);
@@ -264,8 +262,7 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
         AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo();
         additionalInfoParameterInfo.setKey(key);
         String normKey = ValidationUtils.normalizeAdditionalInformation(key);
-        boolean isNonEmptyString = ValidationUtils.validateStringNotEmpty(normKey);
-        if (!isNonEmptyString) {
+        if (StringUtils.isEmpty(normKey)) {
             return Either.right(componentsUtils
                 .getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED, null, null,
                     AdditionalInformationEnum.Label));