From 889e63e7c7e8da4b88f5387ab484d1c03a866362 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 13 Jun 2023 13:05:00 +0300 Subject: [PATCH] RED-6485 - Dossier-only entity setting in the dossier template, RED-6743 - Create dossier dictionaries on-the-fly - remove check for dossier dictionary only - fix PMD violations --- .../service/DictionaryManagementService.java | 14 ++++++-------- .../management/v1/processor/utils/TypeIdUtils.java | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java index 1a8de4c1b..cd22574ce 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DictionaryManagementService.java @@ -264,17 +264,15 @@ public class DictionaryManagementService { // check for the existence of dossier type and create in case it does not exist if (isDossierTypeId(typeId)) { try { - var typeResult = dictionaryPersistenceService.getType(typeId); + dictionaryPersistenceService.getType(typeId); } catch (NotFoundException e) { // type not found, it should be created based on the info from the dossier template type and if flag dossierDictionaryOnly is also true var dossierTemplateType = dictionaryPersistenceService.getType(getDosssierTemplateTypeIdFromTypeId(typeId)); - if (dossierTemplateType.isDossierDictionaryOnly()) { - Type dossierDictionaryType = MagicConverter.convert(dossierTemplateType, Type.class); - dossierDictionaryType.setVersion(0); - dossierDictionaryType.setDossierId(getDossierIdFromTypeId(typeId)); - var returnedType = this.addType(dossierDictionaryType); - log.info("Type added: " + returnedType.toString()); - } + Type dossierDictionaryType = MagicConverter.convert(dossierTemplateType, Type.class); + dossierDictionaryType.setVersion(0); + dossierDictionaryType.setDossierId(getDossierIdFromTypeId(typeId)); + var returnedType = this.addType(dossierDictionaryType); + log.info("Type added: " + returnedType.toString()); } } } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TypeIdUtils.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TypeIdUtils.java index 73c47c649..e7a76e2e6 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TypeIdUtils.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TypeIdUtils.java @@ -16,7 +16,7 @@ public class TypeIdUtils { public static boolean isDossierTypeId(String typeId) { long count = typeId.chars().filter(ch -> ch == ':').count(); - return (count == 2); + return count == 2; }