From c0e480a15a31efb9c0eaedd8d2033c363ccc8db9 Mon Sep 17 00:00:00 2001 From: Chris André Date: Tue, 21 Apr 2020 20:41:08 -0400 Subject: Add null tests in `createComponentExternal` Issue-ID: SDC-2916 Signed-off-by: Chris Andre Change-Id: Ieb0a79c8d3a891a08cd758e1a4ebab7679166476 --- .../openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'catalog-be/src') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java index 0c2f673fcf..4f374e0f54 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java @@ -264,19 +264,19 @@ public class CrudExternalServlet extends AbstractValidationsServlet { } //validate name exist - if(responseWrapper.isEmpty() && isNullOrEmpty(service.getName())){ + if(responseWrapper.isEmpty() && service != null && isNullOrEmpty(service.getName())){ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat( ActionStatus.MISSING_COMPONENT_NAME, ComponentTypeEnum.SERVICE.getValue())); } //validate category - if(responseWrapper.isEmpty() && service.getCategories().size()>0 && !ExternalCategoryTypeEnum.containsIgnoreCase(service.getCategories().get(0).getName())){ + if(responseWrapper.isEmpty() && service != null && service.getCategories() != null && !service.getCategories().isEmpty() && !ExternalCategoryTypeEnum.containsIgnoreCase(service.getCategories().get(0).getName())){ log.debug("Service category is not supported {}", service.getCategories().get(0).getName()); responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat( ActionStatus.COMPONENT_INVALID_CATEGORY, ComponentTypeEnum.SERVICE.getValue())); } - if(responseWrapper.isEmpty()){ + if(responseWrapper.isEmpty() && service != null){ service.setSystemName(ValidationUtils.convertToSystemName(service.getName())); log.debug("Service system name :"+service.getSystemName()); } -- cgit 1.2.3-korg