From d06a0efeece63edc8dba05fd79cd514184168da8 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 9 Feb 2024 13:52:47 +0300 Subject: [PATCH] =?UTF-8?q?extdb-importer=20http://jira.mfd.msk:8088/brows?= =?UTF-8?q?e/CLS-641=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extdb/importer/ExtDBImporterApplication.java | 2 +- .../extdb/importer/config/DbConnectionConfig.java | 8 ++++---- .../extdb/importer/config/ErrorResolverConfig.java | 2 +- .../extdb/importer/config/ExtDBImporterConfig.java | 4 ++-- .../clearing/extdb/importer/config/ImdgConfig.java | 4 ++-- .../clearing/extdb/importer/config/KafkaConfig.java | 4 ++-- .../extdb/importer/config/settings/Cron.java | 2 +- .../importer/config/settings/DatabaseSettings.java | 2 +- .../config/settings/ImportExtDBServiceSettings.java | 2 +- .../extdb/importer/error/ExtDBImporterError.java | 2 +- .../importer/error/ModuleInitializeException.java | 2 +- .../importer/services/ExtDBImporterService.java | 5 ++--- .../importer/services/LauncherCommandReceiver.java | 2 +- .../clearing/extdb/importer/AbstractServiceTest.java | 12 ++++++------ .../importer/config/DbTestConnectionConfig.java | 4 ++-- .../importer/services/ExtDBImporterServiceTest.java | 9 ++------- .../src/main/resources/distr/sh/extdb-importer.sh | 2 +- z-distr/src/main/resources/distr/sh/kill_all.sh | 2 +- .../src/main/resources/distr/sh/trade-importer.sh | 2 +- 19 files changed, 33 insertions(+), 39 deletions(-) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/ExtDBImporterApplication.java (89%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/DbConnectionConfig.java (88%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/ErrorResolverConfig.java (90%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/ExtDBImporterConfig.java (83%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/ImdgConfig.java (93%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/KafkaConfig.java (94%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/settings/Cron.java (81%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/settings/DatabaseSettings.java (92%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java (96%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/error/ExtDBImporterError.java (88%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/error/ModuleInitializeException.java (89%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/services/ExtDBImporterService.java (96%) rename clearing-parent/extdb-importer/src/main/java/ru/{spex => spcex}/clearing/extdb/importer/services/LauncherCommandReceiver.java (95%) rename clearing-parent/extdb-importer/src/test/java/ru/{spex => spcex}/clearing/extdb/importer/AbstractServiceTest.java (82%) rename clearing-parent/extdb-importer/src/test/java/ru/{spex => spcex}/clearing/extdb/importer/config/DbTestConnectionConfig.java (93%) rename clearing-parent/extdb-importer/src/test/java/ru/{spex => spcex}/clearing/extdb/importer/services/ExtDBImporterServiceTest.java (93%) diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/ExtDBImporterApplication.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/ExtDBImporterApplication.java similarity index 89% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/ExtDBImporterApplication.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/ExtDBImporterApplication.java index 09fb1c38e..91508c772 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/ExtDBImporterApplication.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/ExtDBImporterApplication.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer; +package ru.spcex.clearing.extdb.importer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/DbConnectionConfig.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/DbConnectionConfig.java similarity index 88% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/DbConnectionConfig.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/DbConnectionConfig.java index 2710ef99d..82d1f4b8c 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/DbConnectionConfig.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/DbConnectionConfig.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config; +package ru.spcex.clearing.extdb.importer.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,9 +6,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DriverManagerDataSource; -import ru.spex.clearing.extdb.importer.config.settings.DatabaseSettings; -import ru.spex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; -import ru.spex.clearing.extdb.importer.error.ModuleInitializeException; +import ru.spcex.clearing.extdb.importer.config.settings.DatabaseSettings; +import ru.spcex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; +import ru.spcex.clearing.extdb.importer.error.ModuleInitializeException; import javax.sql.DataSource; import java.sql.Connection; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ErrorResolverConfig.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ErrorResolverConfig.java similarity index 90% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ErrorResolverConfig.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ErrorResolverConfig.java index b4d05494b..5f5b5a65e 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ErrorResolverConfig.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ErrorResolverConfig.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config; +package ru.spcex.clearing.extdb.importer.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ExtDBImporterConfig.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ExtDBImporterConfig.java similarity index 83% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ExtDBImporterConfig.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ExtDBImporterConfig.java index d7113e635..a1be52ac3 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ExtDBImporterConfig.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ExtDBImporterConfig.java @@ -1,10 +1,10 @@ -package ru.spex.clearing.extdb.importer.config; +package ru.spcex.clearing.extdb.importer.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import ru.spex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; +import ru.spcex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; @Configuration @EnableConfigurationProperties diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ImdgConfig.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ImdgConfig.java similarity index 93% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ImdgConfig.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ImdgConfig.java index c4daa4120..4b41f4281 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ImdgConfig.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ImdgConfig.java @@ -1,11 +1,11 @@ -package ru.spex.clearing.extdb.importer.config; +package ru.spcex.clearing.extdb.importer.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import ru.spex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; +import ru.spcex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/KafkaConfig.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/KafkaConfig.java similarity index 94% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/KafkaConfig.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/KafkaConfig.java index 47b1062e0..86b0b43c2 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/KafkaConfig.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/KafkaConfig.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config; +package ru.spcex.clearing.extdb.importer.config; import org.apache.kafka.clients.consumer.Consumer; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ import ru.spcex.clearing.platform.messaging.config.KafkaProducerFactory; import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings; import ru.spcex.clearing.platform.messaging.service.RequestInfo; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; -import ru.spex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; +import ru.spcex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/Cron.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/Cron.java similarity index 81% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/Cron.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/Cron.java index 7d2106330..02a4d46fd 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/Cron.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/Cron.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config.settings; +package ru.spcex.clearing.extdb.importer.config.settings; public class Cron { diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/DatabaseSettings.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/DatabaseSettings.java similarity index 92% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/DatabaseSettings.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/DatabaseSettings.java index aad33da81..5486a4980 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/DatabaseSettings.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/DatabaseSettings.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config.settings; +package ru.spcex.clearing.extdb.importer.config.settings; public class DatabaseSettings { private String login; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java similarity index 96% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java index 4ca564ad7..9097e77ef 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config.settings; +package ru.spcex.clearing.extdb.importer.config.settings; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ExtDBImporterError.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ExtDBImporterError.java similarity index 88% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ExtDBImporterError.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ExtDBImporterError.java index 9b7e68fbd..84164aae5 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ExtDBImporterError.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ExtDBImporterError.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.error; +package ru.spcex.clearing.extdb.importer.error; import ru.spcex.platform.utils.enumeration.IErrorEnumId; diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ModuleInitializeException.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ModuleInitializeException.java similarity index 89% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ModuleInitializeException.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ModuleInitializeException.java index 688bbc0e4..87d937b47 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ModuleInitializeException.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ModuleInitializeException.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.error; +package ru.spcex.clearing.extdb.importer.error; public class ModuleInitializeException extends RuntimeException { public ModuleInitializeException() { diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java similarity index 96% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java index 8aece7bf3..05da3be52 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.services; +package ru.spcex.clearing.extdb.importer.services; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,7 +10,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import ru.clearing.classes.statics.data.misc.SCrossRate; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.platform.messaging.domain.cud.utilities.STradesImportedRequest; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -29,7 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; -import static ru.spex.clearing.extdb.importer.error.ExtDBImporterError.crossRateNotValid; +import static ru.spcex.clearing.extdb.importer.error.ExtDBImporterError.crossRateNotValid; @Service @EnableScheduling diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/LauncherCommandReceiver.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/LauncherCommandReceiver.java similarity index 95% rename from clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/LauncherCommandReceiver.java rename to clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/LauncherCommandReceiver.java index 1d1e10283..5bf61a9f7 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/LauncherCommandReceiver.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/LauncherCommandReceiver.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.services; +package ru.spcex.clearing.extdb.importer.services; import org.apache.kafka.clients.consumer.Consumer; import org.slf4j.Logger; diff --git a/clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/AbstractServiceTest.java b/clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/AbstractServiceTest.java similarity index 82% rename from clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/AbstractServiceTest.java rename to clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/AbstractServiceTest.java index c48964a6b..5d6e3f5d0 100644 --- a/clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/AbstractServiceTest.java +++ b/clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/AbstractServiceTest.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer; +package ru.spcex.clearing.extdb.importer; import com.hazelcast.core.Hazelcast; import org.junit.jupiter.api.AfterAll; @@ -9,14 +9,14 @@ import org.springframework.kafka.core.KafkaTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.clearing.classes.statics.data.misc.SCrossRate; +import ru.spcex.clearing.extdb.importer.services.ExtDBImporterService; +import ru.spcex.clearing.extdb.importer.services.LauncherCommandReceiver; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.test.config.ImdgTestConfig; import ru.spcex.clearing.test.config.KafkaTestConfig; -import ru.spex.clearing.extdb.importer.config.ErrorResolverConfig; -import ru.spex.clearing.extdb.importer.config.DbTestConnectionConfig; -import ru.spex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; -import ru.spex.clearing.extdb.importer.services.LauncherCommandReceiver; -import ru.spex.clearing.extdb.importer.services.ExtDBImporterService; +import ru.spcex.clearing.extdb.importer.config.ErrorResolverConfig; +import ru.spcex.clearing.extdb.importer.config.DbTestConnectionConfig; +import ru.spcex.clearing.extdb.importer.config.settings.ImportExtDBServiceSettings; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; diff --git a/clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/config/DbTestConnectionConfig.java b/clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/config/DbTestConnectionConfig.java similarity index 93% rename from clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/config/DbTestConnectionConfig.java rename to clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/config/DbTestConnectionConfig.java index d497179be..6b100084d 100644 --- a/clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/config/DbTestConnectionConfig.java +++ b/clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/config/DbTestConnectionConfig.java @@ -1,4 +1,4 @@ -package ru.spex.clearing.extdb.importer.config; +package ru.spcex.clearing.extdb.importer.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.SingleConnectionDataSource; -import ru.spex.clearing.extdb.importer.error.ModuleInitializeException; +import ru.spcex.clearing.extdb.importer.error.ModuleInitializeException; import javax.sql.DataSource; import java.sql.Connection; diff --git a/clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java b/clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java similarity index 93% rename from clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java rename to clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java index 581fdb607..eee2151bb 100644 --- a/clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java +++ b/clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java @@ -1,18 +1,14 @@ -package ru.spex.clearing.extdb.importer.services; +package ru.spcex.clearing.extdb.importer.services; -import com.hazelcast.core.Hazelcast; import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.misc.SCrossRate; +import ru.spcex.clearing.extdb.importer.AbstractServiceTest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.test.MatcherFactory; -import ru.spex.clearing.extdb.importer.AbstractServiceTest; import ru.spcex.platform.enumeration.Task; import javax.annotation.PostConstruct; @@ -23,7 +19,6 @@ import java.time.LocalDate; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; diff --git a/z-distr/src/main/resources/distr/sh/extdb-importer.sh b/z-distr/src/main/resources/distr/sh/extdb-importer.sh index 3e4a60f8c..2398a0d54 100644 --- a/z-distr/src/main/resources/distr/sh/extdb-importer.sh +++ b/z-distr/src/main/resources/distr/sh/extdb-importer.sh @@ -3,7 +3,7 @@ CLEARING_HOME=/opt/mfd/clearing/ cd $CLEARING_HOME/bin -CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7100 -jar trade-importer.jar --spring.config.location=$CLEARING_HOME/settings/trade-importer/" +CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7140 -jar extdb-importer.jar --spring.config.location=$CLEARING_HOME/settings/extdb-importer/" $CMD >/dev/null 2>&1 & diff --git a/z-distr/src/main/resources/distr/sh/kill_all.sh b/z-distr/src/main/resources/distr/sh/kill_all.sh index a8a23bd81..46da22a76 100644 --- a/z-distr/src/main/resources/distr/sh/kill_all.sh +++ b/z-distr/src/main/resources/distr/sh/kill_all.sh @@ -10,7 +10,7 @@ kill -9 $(ps -ef | grep java | grep lim-exporter.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep swt-exporter.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep dbf-importer.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep trade-importer.jar | awk '{print $2}') -kill -9 $(ps -ef | grep java | grep extdb-service.jar | awk '{print $2}') +kill -9 $(ps -ef | grep java | grep extdb-importer.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep imdg.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep imdg-hist.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep securities-service.jar | awk '{print $2}') diff --git a/z-distr/src/main/resources/distr/sh/trade-importer.sh b/z-distr/src/main/resources/distr/sh/trade-importer.sh index 2398a0d54..3e4a60f8c 100644 --- a/z-distr/src/main/resources/distr/sh/trade-importer.sh +++ b/z-distr/src/main/resources/distr/sh/trade-importer.sh @@ -3,7 +3,7 @@ CLEARING_HOME=/opt/mfd/clearing/ cd $CLEARING_HOME/bin -CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7140 -jar extdb-importer.jar --spring.config.location=$CLEARING_HOME/settings/extdb-importer/" +CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7100 -jar trade-importer.jar --spring.config.location=$CLEARING_HOME/settings/trade-importer/" $CMD >/dev/null 2>&1 &