From f4c53c722e68febc0a15700febebc5163532a37f Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Wed, 19 Apr 2023 17:31:16 +0200 Subject: [PATCH] RED-6467: Remove debug config and add some debugging output --- .../service/persistence/EntryPersistenceService.java | 9 +++++++++ .../src/main/resources/application.yml | 9 --------- 2 files changed, 9 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/persistence/EntryPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java index dfdeda868..ac1e6c3ce 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java @@ -8,6 +8,9 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; import org.springframework.stereotype.Service; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.interceptor.TransactionAspectSupport; +import org.springframework.transaction.support.TransactionSynchronizationManager; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.BaseDictionaryEntry; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity; @@ -106,6 +109,12 @@ public class EntryPersistenceService { var type = typeRepository.getById(typeId); + if (TransactionSynchronizationManager.isActualTransactionActive()) { + TransactionStatus status = TransactionAspectSupport.currentTransactionStatus(); + + log.info("Importing entries for typeEntity: {} type: {} -- transaction has rollback {}", type, dictionaryEntryType, status.isRollbackOnly()); + } + switch (dictionaryEntryType) { case ENTRY -> { var undeletedEntries = entryRepository.undeleteEntries(typeId, entries, version); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml index 6a0f90383..0318e0a80 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml @@ -170,12 +170,3 @@ springdoc: swagger: enabled: true - -# TODO remove after testing -log4j: - logger: - org: - springframework: - orm: - jpa: INFO - transaction: INFO