From d4656dc15eb6ce7b720d07ae7aa51e4bfc2feffd Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Thu, 20 Apr 2023 15:13:58 +0200 Subject: [PATCH] RED-6467: Removed debugging code --- .../service/DossierTemplateImportService.java | 31 ------------------- .../utils/TransactionDebugPrinter.java | 21 ------------- 2 files changed, 52 deletions(-) delete mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TransactionDebugPrinter.java diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java index eefb9d4f9..01c3cc447 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java @@ -58,7 +58,6 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository; import com.iqser.red.service.persistence.management.v1.processor.settings.FileManagementServiceSettings; import com.iqser.red.service.persistence.management.v1.processor.utils.FileUtils; -import com.iqser.red.service.persistence.management.v1.processor.utils.TransactionDebugPrinter; import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext; import com.iqser.red.service.persistence.service.v1.api.shared.model.WatermarkModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig; @@ -112,12 +111,8 @@ public class DossierTemplateImportService { @Transactional public String importDossierTemplate(ImportDossierTemplateRequest request) { - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Starting dossier template import"); - ImportTemplateResult archiveResult = this.handleArchive(request); - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Extracted dossier template archive"); - return this.importDossierTemplate(archiveResult); } @@ -302,27 +297,20 @@ public class DossierTemplateImportService { } if (existingDossierTemplate != null) { - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Existing dossier found, importing into it"); dossierTemplateId = existingDossierTemplate.getId(); - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Updating dossier template entity"); // override the existing dossier template updateDossierTemplateMeta(existingDossierTemplate, dossierTemplateMeta, request.getUserId()); - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing rules"); // set rules rulesPersistenceService.setRules(request.getRuleSet(), dossierTemplateId); existingDossierTemplate.setDossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplatePersistenceService.computeDossierTemplateStatus(existingDossierTemplate) .name())); - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing colors"); - // set colors this.setColors(dossierTemplateId, request.getColors()); - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing watermarks"); - // set watermarks if (CollectionUtils.isNotEmpty(request.getWatermarks())) { Set toSetWatermarks = request.getWatermarks().stream().map(WatermarkModel::getName).filter(Objects::nonNull).collect(Collectors.toSet()); @@ -344,8 +332,6 @@ public class DossierTemplateImportService { configsToRemove.forEach(watermark -> watermarkService.deleteWatermark(watermark.getId())); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing dossier status"); - // dossier status if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) { this.updateDossierStates(request, dossierTemplateId); @@ -354,8 +340,6 @@ public class DossierTemplateImportService { currentStates.forEach(state -> dossierStatusPersistenceService.deleteDossierStatus(state.getId(), null)); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing dossier attributes"); - // update dossier attributes if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) { this.updateDossierAttributes(request, dossierTemplateId); @@ -364,8 +348,6 @@ public class DossierTemplateImportService { currentConfigs.forEach(da -> dossierAttributeConfigPersistenceService.deleteDossierAttribute(da.getId())); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing file attributes"); - //update file attributes if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) { this.updateFileAttributes(request, dossierTemplateId); @@ -374,8 +356,6 @@ public class DossierTemplateImportService { currentConfigs.forEach(fa -> fileAttributeConfigPersistenceService.deleteFileAttribute(fa.getId())); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing types"); - // update the types if (CollectionUtils.isNotEmpty(request.getTypes())) { this.updateTypes(request, dossierTemplateId); @@ -388,8 +368,6 @@ public class DossierTemplateImportService { this.deleteTypes(currentTypes, new HashSet<>()); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing report templates"); - //set report templates var existingReports = reportTemplatePersistenceService.findByDossierTemplateId(dossierTemplateId); @@ -402,8 +380,6 @@ public class DossierTemplateImportService { }); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Delete reports"); - // delete the reports that were not in the import existingReports.forEach(r -> { String storageId = r.getStorageId(); @@ -413,8 +389,6 @@ public class DossierTemplateImportService { } }); - TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing legal basis"); - // set legal basis if (CollectionUtils.isNotEmpty(request.getLegalBases())) { legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases()); @@ -427,7 +401,6 @@ public class DossierTemplateImportService { } } else { - TransactionDebugPrinter.printTransactionRollbackStatus(log, "No existing dossier found, importing into new dossier"); // creates new dossier template if (StringUtils.isEmpty(dossierTemplateMeta.getName())) { throw new ConflictException("DossierTemplate name must be set"); @@ -548,13 +521,9 @@ public class DossierTemplateImportService { private void updateDossierTemplateMeta(DossierTemplateEntity dossierTemplateEntity, DossierTemplate dossierTemplate, String userId) { if (!dossierTemplateEntity.getName().equalsIgnoreCase(dossierTemplate.getName())) { - TransactionDebugPrinter.printTransactionRollbackStatus(log, "validating dossier template name"); - this.validateDossierTemplateName(dossierTemplate); } - TransactionDebugPrinter.printTransactionRollbackStatus(log, "template name validated, updating other properties"); - OffsetDateTime now = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS); dossierTemplateEntity.setName(dossierTemplate.getName()); dossierTemplateEntity.setDescription(dossierTemplate.getDescription()); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TransactionDebugPrinter.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TransactionDebugPrinter.java deleted file mode 100644 index 395bfc481..000000000 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TransactionDebugPrinter.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.iqser.red.service.persistence.management.v1.processor.utils; - -import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.interceptor.TransactionAspectSupport; -import org.springframework.transaction.support.TransactionSynchronizationManager; - -import lombok.experimental.UtilityClass; - -@UtilityClass -public class TransactionDebugPrinter { - - public void printTransactionRollbackStatus(org.slf4j.Logger log, String message) { - - if (TransactionSynchronizationManager.isActualTransactionActive()) { - TransactionStatus status = TransactionAspectSupport.currentTransactionStatus(); - - log.info(message + " -- transaction isRollbackOnly {}", status.isRollbackOnly()); - } - } - -}