diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/config/DbConnectionConfig.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/config/DbConnectionConfig.java index 103dd0497..e04bab31d 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/config/DbConnectionConfig.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/config/DbConnectionConfig.java @@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory; 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 org.springframework.jdbc.datasource.DriverManagerDataSource; import ru.spcex.clearing.trade.importer.config.settings.DatabaseSettings; import ru.spcex.clearing.trade.importer.config.settings.ImportTradeServiceSettings; import ru.spcex.clearing.trade.importer.error.ModuleInitializeException; @@ -26,14 +26,14 @@ public class DbConnectionConfig { this.settings = settings.getDatabase(); } - @Bean(destroyMethod = "destroy") - public SingleConnectionDataSource dataSource() { + @Bean + public DataSource dataSource() { String login = settings.getLogin(); String password = settings.getPassword(); String dbUrl = settings.getUrl(); String driver = settings.getDriver(); - SingleConnectionDataSource ds = new SingleConnectionDataSource(); + DriverManagerDataSource ds = new DriverManagerDataSource(); try { ds.setDriverClassName(driver); } catch (Exception ue) { diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/ValidationError.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/TradeImporterError.java similarity index 74% rename from clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/ValidationError.java rename to clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/TradeImporterError.java index dbbbbb8c3..6ccf7ac8a 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/ValidationError.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/TradeImporterError.java @@ -2,13 +2,13 @@ package ru.spcex.clearing.trade.importer.error; import ru.spcex.platform.utils.enumeration.IErrorEnumId; -public enum ValidationError implements IErrorEnumId { +public enum TradeImporterError implements IErrorEnumId { sTradesNotValid(10001L), ; private final Long id; - ValidationError(Long id) { + TradeImporterError(Long id) { this.id = id; } diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/LauncherCommandReceiver.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/LauncherCommandReceiver.java index 0d92824f2..5c37e06be 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/LauncherCommandReceiver.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/LauncherCommandReceiver.java @@ -27,6 +27,7 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi callback(LauncherCommandRequest.class) .setConsumer(action -> importer.process(true)) .forDestination(Task.getOfTrades.topic(), callbacks::put); // GTRD + importer.process(true); init(); } } diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java index 08f00d9cf..12ff78487 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.Map; import static ru.spcex.clearing.platform.messaging.domain.Consts.S_TRADES_IMPORTED; -import static ru.spcex.clearing.trade.importer.error.ValidationError.sTradesNotValid; +import static ru.spcex.clearing.trade.importer.error.TradeImporterError.sTradesNotValid; @Service @EnableScheduling @@ -64,6 +64,7 @@ public class TradeImporterService { if (byCommand) { STradesImportedRequest sTradesImportedRequest = new STradesImportedRequest(); producer.send(new ProducerRecord<>(S_TRADES_IMPORTED, sTradesImportedRequest)); + log.debug("successfully import STrades from DB by command"); } }