diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/service/ServiceNamingPolicyValidator.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/service/ServiceNamingPolicyValidator.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/service/ServiceNamingPolicyValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/service/ServiceNamingPolicyValidator.java index 73acf20c53..11974acc34 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/service/ServiceNamingPolicyValidator.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/service/ServiceNamingPolicyValidator.java @@ -49,21 +49,19 @@ public class ServiceNamingPolicyValidator implements ServiceFieldValidator { throw new ByActionStatusComponentException(ActionStatus.MISSING_ECOMP_GENERATED_NAMING); } if (isEcompGeneratedCurr) { + if (StringUtils.isEmpty(namingPolicyUpdate)) { + return; + } if (!ValidationUtils.validateServiceNamingPolicyLength(namingPolicyUpdate)) { ResponseFormat responseFormat = componentsUtils .getResponseFormat(ActionStatus.NAMING_POLICY_EXCEEDS_LIMIT, "" + ValidationUtils.SERVICE_NAMING_POLICY_MAX_SIZE); throw new ByResponseFormatComponentException(responseFormat); } - if (StringUtils.isEmpty(namingPolicyUpdate)) { - service.setNamingPolicy(""); - return; - } if (!ValidationUtils.validateCommentPattern(namingPolicyUpdate)) { throw new ByActionStatusComponentException(ActionStatus.INVALID_NAMING_POLICY); } - service.setNamingPolicy(namingPolicyUpdate); } else { - if (!StringUtils.isEmpty(namingPolicyUpdate)) { + if (StringUtils.isNotEmpty(namingPolicyUpdate)) { log.warn("NamingPolicy must be empty for EcompGeneratedNaming=false"); } service.setNamingPolicy(""); |