From 128b5b681b455150d836d6fa2bbbd49b040dccd9 Mon Sep 17 00:00:00 2001 From: akulikov Date: Thu, 3 Oct 2024 20:20:49 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-765 fix (property must be unnecessary) --- .../exporter/services/CurrencyExporterService.java | 2 +- .../exporter/services/MoneyExporterService.java | 2 +- .../src/main/resources/application.properties | 2 +- .../services/AbstractExporterServiceTest.java | 14 ++------------ .../services/MoneyExporterServiceTest.java | 2 +- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java index 0c15a5de3..6c382c479 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java @@ -32,7 +32,7 @@ public class CurrencyExporterService extends AbstractExporterService { public CurrencyExporterService(SFTPConfig.LimGateway gateway, KafkaSender kafkaSender, ImdgProvider imdgProvider, - @Value("${export-lim.include-ck}") String includeCKStrValue) { + @Value("${export-lim-service.include-ck}") String includeCKStrValue) { super(gateway, kafkaSender, imdgProvider); includeCK = Boolean.parseBoolean(includeCKStrValue); } diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java index 20078fe4f..d9ca5535a 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java @@ -32,7 +32,7 @@ public class MoneyExporterService extends AbstractExporterService { public MoneyExporterService(SFTPConfig.LimGateway gateway, KafkaSender kafkaSender, ImdgProvider imdgProvider, - @Value("${export-lim.include-ck}") String includeCKStrValue) { + @Value("${export-lim-service.include-ck}") String includeCKStrValue) { super(gateway, kafkaSender, imdgProvider); includeCK = Boolean.parseBoolean(includeCKStrValue); } diff --git a/clearing-parent/lim-exporter/src/main/resources/application.properties b/clearing-parent/lim-exporter/src/main/resources/application.properties index 80cc1312f..c04988f10 100644 --- a/clearing-parent/lim-exporter/src/main/resources/application.properties +++ b/clearing-parent/lim-exporter/src/main/resources/application.properties @@ -28,4 +28,4 @@ export-lim-service.kafka-producer.batch-size=16384 export-lim-service.kafka-producer.linger-ms=1 export-lim-service.kafka-producer.buffer-memory=33554432 -export-lim.include-ck=true \ No newline at end of file +export-lim-service.include-ck=true \ No newline at end of file diff --git a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java index bc857354d..b309ec410 100644 --- a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java +++ b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java @@ -1,18 +1,8 @@ package ru.spcex.clearing.lim.exporter.services; +import javax.annotation.PostConstruct; import org.junit.jupiter.api.Test; import ru.spcex.clearing.lim.exporter.AbstractServiceTest; -import ru.spcex.clearing.lim.exporter.config.KafkaConfig; -import ru.spcex.clearing.lim.exporter.config.settings.ExportLimServiceSettings; -import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; -import ru.spcex.clearing.platform.messaging.service.sender.KafkaSenderBuilderImpl; -import ru.spcex.clearing.test.TestUtils; - -import javax.annotation.PostConstruct; - -import java.time.LocalDateTime; - -import static org.junit.jupiter.api.Assertions.*; class AbstractExporterServiceTest extends AbstractServiceTest { @PostConstruct @@ -22,7 +12,7 @@ class AbstractExporterServiceTest extends AbstractServiceTest { @Test void sendLimExportedNotification() { - AbstractExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider); + AbstractExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider, "true"); String fileName = "limits_money_202305241832.lim"; moneyExporterService.sendLimExportedNotification(fileName); diff --git a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java index fbf7dd270..49034cf85 100644 --- a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java +++ b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java @@ -63,7 +63,7 @@ class MoneyExporterServiceTest extends AbstractServiceTest { registryImdg.insert(registryT_2); - MoneyExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider); + MoneyExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider, "true"); Collection limFileRows = moneyExporterService.getLimFileRows(); assertEquals(0, limFileRows.size());