treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extdb-importer http://jira.mfd.msk:8088/browse/CLS-641 поправил опечатку

Browse source
This commit is contained in:
AKurakin 2024-02-09 13:52:47 +03:00
parent 9e5d54b130
commit d06a0efeec
19 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/ExtDBImporterApplication.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/ExtDBImporterApplication.java
View file

@ -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;

8
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/DbConnectionConfig.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/DbConnectionConfig.java
View file

@ -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;

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ErrorResolverConfig.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ErrorResolverConfig.java
View file

@ -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;

4
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ExtDBImporterConfig.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ExtDBImporterConfig.java
View file

@ -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

4
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/ImdgConfig.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/ImdgConfig.java
View file

@ -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;

4
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/KafkaConfig.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/KafkaConfig.java
View file

@ -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;

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/Cron.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/Cron.java
View file

@ -1,4 +1,4 @@
package ru.spex.clearing.extdb.importer.config.settings;
package ru.spcex.clearing.extdb.importer.config.settings;
public class Cron {

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/DatabaseSettings.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/DatabaseSettings.java
View file

@ -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;

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/config/settings/ImportExtDBServiceSettings.java
View file

@ -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;

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ExtDBImporterError.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ExtDBImporterError.java
View file

@ -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;

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/error/ModuleInitializeException.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/error/ModuleInitializeException.java
View file

@ -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() {

5
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java
View file

@ -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

2
clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/LauncherCommandReceiver.java → clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/LauncherCommandReceiver.java
View file

@ -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;

12
clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/AbstractServiceTest.java → clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/AbstractServiceTest.java
View file

@ -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;

4
clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/config/DbTestConnectionConfig.java → clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/config/DbTestConnectionConfig.java
View file

@ -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;

9
clearing-parent/extdb-importer/src/test/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java → clearing-parent/extdb-importer/src/test/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterServiceTest.java
View file

@ -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.*;

2
z-distr/src/main/resources/distr/sh/extdb-importer.sh
View file

@ -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 &

2
z-distr/src/main/resources/distr/sh/kill_all.sh
View file

@ -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}')

2
z-distr/src/main/resources/distr/sh/trade-importer.sh
View file

@ -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 &