From f4b1f08eeca1d36f0685744aefdb02e73e43ea4e Mon Sep 17 00:00:00 2001 From: ialbert Date: Sat, 27 May 2023 19:26:35 +0300 Subject: [PATCH] execution uploading logging fix --- .../java/ru/spcex/clearing/service/ClearingService.java | 2 ++ .../service/{ => execution}/ExecutionDepositComponent.java | 7 +++++-- .../service/{ => execution}/ExecutionFondComponent.java | 2 +- .../clearing-service/src/main/resources/logback.xml | 5 +++++ .../ru/spcex/clearing/service/AbstractClearingTest.java | 1 + .../{ => execution}/ExecutionDepositComponentTest.java | 4 +++- 6 files changed, 17 insertions(+), 4 deletions(-) rename clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/{ => execution}/ExecutionDepositComponent.java (97%) rename clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/{ => execution}/ExecutionFondComponent.java (99%) rename clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/{ => execution}/ExecutionDepositComponentTest.java (96%) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java index 50cf5d56f..2d20b69c9 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java @@ -8,6 +8,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Service; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest; +import ru.spcex.clearing.service.execution.ExecutionDepositComponent; +import ru.spcex.clearing.service.execution.ExecutionFondComponent; import ru.spcex.platform.utils.log.ExceptionUtils; import java.util.concurrent.ExecutorService; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionDepositComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java similarity index 97% rename from clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionDepositComponent.java rename to clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java index d7756f23a..e42996875 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionDepositComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.service; +package ru.spcex.clearing.service.execution; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; @@ -25,7 +25,10 @@ import ru.spcex.clearing.service.validation.ValidationStored; import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.utils.enumeration.*; +import ru.spcex.platform.utils.enumeration.EnumMessage; +import ru.spcex.platform.utils.enumeration.IEnumId; +import ru.spcex.platform.utils.enumeration.IEnumKey; +import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.log.ExceptionUtils; import ru.spcex.platform.utils.time.TimeUtil; import ru.spcex.platform.utils.validation.IValidator; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionFondComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java similarity index 99% rename from clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionFondComponent.java rename to clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java index c5170df92..4f533e9fc 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionFondComponent.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.service; +package ru.spcex.clearing.service.execution; import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; diff --git a/clearing-parent/clearing-service/src/main/resources/logback.xml b/clearing-parent/clearing-service/src/main/resources/logback.xml index 39d4ebcaa..25bfcafba 100644 --- a/clearing-parent/clearing-service/src/main/resources/logback.xml +++ b/clearing-parent/clearing-service/src/main/resources/logback.xml @@ -39,4 +39,9 @@ + + + + + \ No newline at end of file diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/AbstractClearingTest.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/AbstractClearingTest.java index 3dc3ab16e..fd58ce008 100644 --- a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/AbstractClearingTest.java +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/AbstractClearingTest.java @@ -13,6 +13,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.spcex.clearing.config.*; import ru.spcex.clearing.service.builder.LiabilitiesClaimsAssetsCreator; import ru.spcex.clearing.service.builder.LiabilitiesClaimsMoneyCreator; +import ru.spcex.clearing.service.execution.ExecutionDepositComponent; import ru.spcex.clearing.service.order.ExecutionDepositSorter; import ru.spcex.clearing.service.order.PaymentInstructionSorter; import ru.spcex.clearing.utils.TestUtils; diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ExecutionDepositComponentTest.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/execution/ExecutionDepositComponentTest.java similarity index 96% rename from clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ExecutionDepositComponentTest.java rename to clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/execution/ExecutionDepositComponentTest.java index 3cc096ed0..55007f097 100644 --- a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ExecutionDepositComponentTest.java +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/execution/ExecutionDepositComponentTest.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.service; +package ru.spcex.clearing.service.execution; import org.apache.kafka.clients.consumer.MockConsumer; import org.junit.jupiter.api.Test; @@ -11,6 +11,8 @@ import ru.clearing.classes.statics.data.misc.STrades; import ru.clearing.classes.statics.data.security.Security; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; +import ru.spcex.clearing.service.AbstractClearingTest; +import ru.spcex.clearing.service.EventsReceiver; import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.imdg.api.Imdg;