From 3a463e1ed1676af54a1482662f7412d7230ad42e Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Mon, 29 Jul 2024 11:06:26 +0300 Subject: [PATCH] RED-9749 - Fix NPE --- .../persistence/ComponentDefinitionPersistenceService.java | 3 ++- .../v1/server/integration/tests/ComponentDefinitionTests.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ComponentDefinitionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ComponentDefinitionPersistenceService.java index fe6538333..f6e7a0f58 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ComponentDefinitionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ComponentDefinitionPersistenceService.java @@ -4,6 +4,7 @@ import java.time.OffsetDateTime; import java.util.List; import java.util.UUID; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ComponentDefinitionEntity; @@ -41,7 +42,7 @@ public class ComponentDefinitionPersistenceService { componentDefinitionEntity.setId(UUID.randomUUID().toString()); componentDefinitionEntity.setDossierTemplateId(dossierTemplateId); componentDefinitionEntity.setTechnicalName(SnakeCaseUtils.toSnakeCase(component.getTechnicalName())); - componentDefinitionEntity.setDisplayName(component.getDisplayName().isEmpty() ? component.getTechnicalName() : component.getDisplayName()); + componentDefinitionEntity.setDisplayName(StringUtils.isEmpty(component.getDisplayName()) ? component.getTechnicalName() : component.getDisplayName()); componentDefinitionEntity.setDescription(component.getDescription()); componentDefinitionEntity.setRank(rank); return componentDefinitionRepository.saveAndFlush(componentDefinitionEntity); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentDefinitionTests.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentDefinitionTests.java index 899c713c2..04118251b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentDefinitionTests.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentDefinitionTests.java @@ -44,7 +44,7 @@ public class ComponentDefinitionTests extends AbstractPersistenceServerServiceTe assertEquals(response.get(0).getTechnicalName(), componentDefinitionAddRequest.getTechnicalName()); assertNull(response.get(0).getSoftDeleteTime()); - var noDisplayNameComponent = ComponentDefinitionAddRequest.builder().displayName("").technicalName("component_2").description("Description").build(); + var noDisplayNameComponent = ComponentDefinitionAddRequest.builder().technicalName("component_2").description("Description").build(); var result1 = dossierTemplateExternalClient.createComponents(dossierTemplate.getId(), List.of(noDisplayNameComponent)); assertTrue(result1.get(0).getDisplayName().equals("component_2"));