Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-9749 - Fix NPE #630

Merged
andrei.isvoran.ext merged 1 commits from RED-8749-fix-npe into master 2024-07-29 10:40:02 +02:00
Conversation 5 Commits 1 Files Changed 2 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ComponentDefinitionPersistenceService.java
View File

@ -4,6 +4,7 @@ import java.time.OffsetDateTime;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ComponentDefinitionEntity; 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.setId(UUID.randomUUID().toString());
componentDefinitionEntity.setDossierTemplateId(dossierTemplateId); componentDefinitionEntity.setDossierTemplateId(dossierTemplateId);
componentDefinitionEntity.setTechnicalName(SnakeCaseUtils.toSnakeCase(component.getTechnicalName())); 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.setDescription(component.getDescription());
componentDefinitionEntity.setRank(rank); componentDefinitionEntity.setRank(rank);
return componentDefinitionRepository.saveAndFlush(componentDefinitionEntity); return componentDefinitionRepository.saveAndFlush(componentDefinitionEntity);

2
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentDefinitionTests.java
View File

@ -44,7 +44,7 @@ public class ComponentDefinitionTests extends AbstractPersistenceServerServiceTe
assertEquals(response.get(0).getTechnicalName(), componentDefinitionAddRequest.getTechnicalName()); assertEquals(response.get(0).getTechnicalName(), componentDefinitionAddRequest.getTechnicalName());
assertNull(response.get(0).getSoftDeleteTime()); 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)); var result1 = dossierTemplateExternalClient.createComponents(dossierTemplate.getId(), List.of(noDisplayNameComponent));
assertTrue(result1.get(0).getDisplayName().equals("component_2")); assertTrue(result1.get(0).getDisplayName().equals("component_2"));