From a19a2252006a15a70eb80c2f830e500b7d43eaa6 Mon Sep 17 00:00:00 2001 From: Gretchen-z <68681408+Gretchen-z@users.noreply.github.com> Date: Fri, 25 Sep 2026 14:22:47 +0300 Subject: [PATCH 1/2] Bump SB4, damsel, add provider guarantee deposit --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- pom.xml | 53 +++++++++++++++---- .../dev/vality/daway/DawayApplication.java | 2 +- .../dev/vality/daway/config/KafkaConfig.java | 2 +- .../impl/DepositAdjustmentDaoImpl.java | 4 +- .../dao/deposit/impl/DepositDaoImpl.java | 4 +- .../revert/impl/DepositRevertDaoImpl.java | 4 +- .../destination/impl/DestinationDaoImpl.java | 4 +- .../dao/dominant/impl/CategoryDaoImpl.java | 2 + .../dao/dominant/impl/CurrencyDaoImpl.java | 2 + .../daway/dao/dominant/impl/PartyDaoImpl.java | 2 + .../impl/PaymentInstitutionDaoImpl.java | 2 + .../impl/PaymentRoutingRulesDaoImpl.java | 2 + .../dao/dominant/impl/ProviderDaoImpl.java | 2 + .../daway/dao/dominant/impl/ProxyDaoImpl.java | 2 + .../daway/dao/dominant/impl/ShopDaoImpl.java | 2 + .../impl/TermSetHierarchyDaoImpl.java | 2 + .../dao/dominant/impl/TerminalDaoImpl.java | 2 + .../dao/dominant/impl/WalletDaoImpl.java | 4 +- .../dao/exrate/impl/ExchangeRateDaoImpl.java | 4 +- .../dao/invoicing/impl/AdjustmentDaoImpl.java | 4 +- .../dao/invoicing/impl/CashFlowDaoImpl.java | 2 + .../invoicing/impl/CashFlowLinkDaoImpl.java | 2 + .../dao/invoicing/impl/ChargebackDaoImpl.java | 4 +- .../invoicing/impl/InvoiceCartDaoImpl.java | 4 +- .../dao/invoicing/impl/InvoiceDaoImpl.java | 4 +- .../impl/InvoiceStatusInfoDaoImpl.java | 2 + .../impl/PaymentAdditionalInfoDaoImpl.java | 2 + .../impl/PaymentCashChangeDaoImpl.java | 2 + .../dao/invoicing/impl/PaymentDaoImpl.java | 4 +- .../impl/PaymentExchangeContextDaoImpl.java | 2 + .../dao/invoicing/impl/PaymentFeeDaoImpl.java | 2 + .../impl/PaymentPayerInfoDaoImpl.java | 2 + .../impl/PaymentRecurrentInfoDaoImpl.java | 2 + .../impl/PaymentRiskDataDaoImpl.java | 2 + .../invoicing/impl/PaymentRouteDaoImpl.java | 2 + .../impl/PaymentSessionInfoDaoImpl.java | 2 + .../impl/PaymentStatusInfoDaoImpl.java | 2 + .../dao/invoicing/impl/RefundDaoImpl.java | 4 +- .../daway/dao/limiter/LimitConfigDaoImpl.java | 4 +- .../daway/dao/rate/impl/RateDaoImpl.java | 4 +- .../daway/dao/source/impl/SourceDaoImpl.java | 4 +- .../impl/FistfulCashFlowDaoImpl.java | 2 + .../impl/WithdrawalAdjustmentDaoImpl.java | 4 +- .../impl/WithdrawalCashChangeDaoImpl.java | 2 + .../withdrawal/impl/WithdrawalDaoImpl.java | 4 +- .../impl/WithdrawalValidationDaoImpl.java | 2 + .../impl/WithdrawalSessionDaoImpl.java | 4 +- .../dominant/impl/ProviderHandler.java | 19 +++++-- .../DestinationCreatedHandler.java | 2 +- .../mapper/invoice/InvoiceCreatedMapper.java | 2 +- .../dev/vality/daway/service/FileService.java | 4 +- .../java/dev/vality/daway/util/JsonUtil.java | 20 +++---- src/main/resources/application.yml | 11 ++-- .../config/PostgresqlJooqSpringBootITest.java | 2 +- .../java/dev/vality/daway/dao/DaoTests.java | 2 +- .../dev/vality/daway/dao/DepositDaoTest.java | 2 +- .../vality/daway/dao/DestinationDaoTest.java | 2 +- .../dev/vality/daway/dao/SourceDaoTest.java | 2 +- .../dev/vality/daway/dao/WalletDaoTest.java | 2 +- .../dominant/impl/ProviderHandlerTest.java | 21 ++++++-- .../vality/daway/service/FileServiceTest.java | 7 +-- .../daway/service/InvoicingServiceTest.java | 16 +++--- .../java/dev/vality/daway/utils/JdbcUtil.java | 4 +- 65 files changed, 207 insertions(+), 96 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4af9d57e..854a0b7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v4 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 385233c5..ca853440 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,7 +9,7 @@ on: jobs: build-and-deploy: - uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3 + uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v4 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }} diff --git a/pom.xml b/pom.xml index 868d9a73..0afac2e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.vality service-parent-pom - 3.1.11 + 4.0.1 daway @@ -49,7 +49,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.hibernate @@ -59,6 +59,14 @@ org.yaml snakeyaml + + org.hibernate.validator + hibernate-validator + + + org.hibernate.orm + hibernate-* + @@ -70,13 +78,17 @@ spring-boot-starter-validation - org.springframework.kafka - spring-kafka + org.springframework.boot + spring-boot-starter-kafka org.springframework.boot spring-boot-starter-cache + + org.springframework.boot + spring-boot-starter-flyway + org.springframework.boot spring-boot-starter-actuator @@ -102,10 +114,10 @@ net.logstash.logback logstash-logback-encoder - 7.4 + 9.0 - com.fasterxml.jackson.core + tools.jackson.core jackson-databind @@ -152,7 +164,6 @@ org.yaml snakeyaml - 2.0 @@ -177,7 +188,7 @@ dev.vality damsel - 1.701-6e28041 + 1.703-8d6174b dev.vality @@ -214,10 +225,14 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-jooq-test + test + org.awaitility awaitility - 4.2.0 test @@ -230,6 +245,12 @@ testcontainers-annotations 4.1.3 test + + + org.junit.vintage + junit-vintage-engine + + @@ -248,6 +269,7 @@ true Dockerfile + opentelemetry-javaagent.jar @@ -399,6 +421,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + ${lombok.version} + + + + diff --git a/src/main/java/dev/vality/daway/DawayApplication.java b/src/main/java/dev/vality/daway/DawayApplication.java index 90df312f..2fc1d728 100644 --- a/src/main/java/dev/vality/daway/DawayApplication.java +++ b/src/main/java/dev/vality/daway/DawayApplication.java @@ -2,7 +2,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.boot.web.server.servlet.context.ServletComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling diff --git a/src/main/java/dev/vality/daway/config/KafkaConfig.java b/src/main/java/dev/vality/daway/config/KafkaConfig.java index f6b50739..0d23c979 100644 --- a/src/main/java/dev/vality/daway/config/KafkaConfig.java +++ b/src/main/java/dev/vality/daway/config/KafkaConfig.java @@ -6,7 +6,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.StringDeserializer; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; diff --git a/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java b/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java index 760a24ba..13c2f835 100644 --- a/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java @@ -7,7 +7,7 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -18,11 +18,11 @@ import static dev.vality.daway.domain.tables.DepositAdjustment.DEPOSIT_ADJUSTMENT; @Component +@DependsOnDatabaseInitialization public class DepositAdjustmentDaoImpl extends AbstractGenericDao implements DepositAdjustmentDao { private final RowMapper depositRowMapper; - @Autowired public DepositAdjustmentDaoImpl(DataSource dataSource) { super(dataSource); depositRowMapper = new RecordRowMapper<>(DEPOSIT_ADJUSTMENT, DepositAdjustment.class); diff --git a/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java b/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java index 34a40c13..ae366032 100644 --- a/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Deposit.DEPOSIT; @Component +@DependsOnDatabaseInitialization public class DepositDaoImpl extends AbstractGenericDao implements DepositDao { private final RowMapper depositRowMapper; - @Autowired public DepositDaoImpl(DataSource dataSource) { super(dataSource); depositRowMapper = new RecordRowMapper<>(DEPOSIT, Deposit.class); diff --git a/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java b/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java index 2e358494..0d0f39ff 100644 --- a/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java @@ -7,7 +7,7 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -18,11 +18,11 @@ import static dev.vality.daway.domain.tables.DepositRevert.DEPOSIT_REVERT; @Component +@DependsOnDatabaseInitialization public class DepositRevertDaoImpl extends AbstractGenericDao implements DepositRevertDao { private final RowMapper depositRowMapper; - @Autowired public DepositRevertDaoImpl(DataSource dataSource) { super(dataSource); depositRowMapper = new RecordRowMapper<>(DEPOSIT_REVERT, DepositRevert.class); diff --git a/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java b/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java index 5caf3cdb..ff864385 100644 --- a/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Destination.DESTINATION; @Component +@DependsOnDatabaseInitialization public class DestinationDaoImpl extends AbstractGenericDao implements DestinationDao { private final RowMapper destinationRowMapper; - @Autowired public DestinationDaoImpl(DataSource dataSource) { super(dataSource); destinationRowMapper = new RecordRowMapper<>(DESTINATION, Destination.class); diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java index 567161ae..684ea263 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.CategoryRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class CategoryDaoImpl extends AbstractGenericDao implements DomainObjectDao { public CategoryDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java index 47b86d78..07acba8d 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.CurrencyRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class CurrencyDaoImpl extends AbstractGenericDao implements DomainObjectDao { public CurrencyDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java index 06b5cd9c..15a8e4b0 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java @@ -9,6 +9,7 @@ import dev.vality.mapper.RecordRowMapper; import lombok.extern.slf4j.Slf4j; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ @Slf4j @Component +@DependsOnDatabaseInitialization public class PartyDaoImpl extends AbstractGenericDao implements DomainObjectDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java index b1e422cd..6dcd7ae3 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.PaymentInstitutionRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class PaymentInstitutionDaoImpl extends AbstractGenericDao implements DomainObjectDao { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java index 9fe902a1..552203e9 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java @@ -8,12 +8,14 @@ import dev.vality.daway.domain.tables.records.PaymentRoutingRuleRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class PaymentRoutingRulesDaoImpl extends AbstractGenericDao implements DomainObjectDao { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java index b0e70308..5c116629 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.ProviderRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class ProviderDaoImpl extends AbstractGenericDao implements DomainObjectDao { public ProviderDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java index e6d0b83c..4d2fdc44 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.ProxyRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class ProxyDaoImpl extends AbstractGenericDao implements DomainObjectDao { public ProxyDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java index 1f22e070..eaa47051 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java @@ -9,6 +9,7 @@ import dev.vality.mapper.RecordRowMapper; import lombok.extern.slf4j.Slf4j; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ @Slf4j @Component +@DependsOnDatabaseInitialization public class ShopDaoImpl extends AbstractGenericDao implements DomainObjectDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java index 6ca3218a..b74e6f88 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.TermSetHierarchyRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class TermSetHierarchyDaoImpl extends AbstractGenericDao implements DomainObjectDao { public TermSetHierarchyDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java index 126cfad3..e2891b54 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.domain.tables.records.TerminalRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.util.Optional; @Component +@DependsOnDatabaseInitialization public class TerminalDaoImpl extends AbstractGenericDao implements DomainObjectDao { public TerminalDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java index 52afe3fc..e6f15f78 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Wallet.WALLET; @Component +@DependsOnDatabaseInitialization public class WalletDaoImpl extends AbstractGenericDao implements DomainObjectDao { private final RowMapper walletRowMapper; - @Autowired public WalletDaoImpl(DataSource dataSource) { super(dataSource); walletRowMapper = new RecordRowMapper<>(WALLET, Wallet.class); diff --git a/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java b/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java index 43760527..471221c4 100644 --- a/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java @@ -6,8 +6,8 @@ import dev.vality.daway.domain.tables.pojos.ExRate; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -18,11 +18,11 @@ import static dev.vality.daway.domain.tables.ExRate.EX_RATE; @Component +@DependsOnDatabaseInitialization public class ExchangeRateDaoImpl extends AbstractGenericDao implements ExchangeRateDao { private final RowMapper rowMapper; - @Autowired public ExchangeRateDaoImpl(@Qualifier("dataSource") DataSource dataSource) { super(dataSource); this.rowMapper = new RecordRowMapper<>(EX_RATE, ExRate.class); diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java index fd7dd782..4fa96d47 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Adjustment.ADJUSTMENT; @Component +@DependsOnDatabaseInitialization public class AdjustmentDaoImpl extends AbstractGenericDao implements AdjustmentDao { private final RowMapper adjustmentRowMapper; - @Autowired public AdjustmentDaoImpl(DataSource dataSource) { super(dataSource); adjustmentRowMapper = new RecordRowMapper<>(ADJUSTMENT, Adjustment.class); diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java index 56704058..d69f81be 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java @@ -8,6 +8,7 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -18,6 +19,7 @@ import static dev.vality.daway.domain.tables.CashFlow.CASH_FLOW; @Component +@DependsOnDatabaseInitialization public class CashFlowDaoImpl extends AbstractGenericDao implements CashFlowDao { private final RowMapper cashFlowRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java index 2da06a97..ab366fe8 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java @@ -11,6 +11,7 @@ import org.jooq.Field; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.DataClassRowMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -25,6 +26,7 @@ import static dev.vality.daway.domain.Tables.CASH_FLOW_LINK; @Component +@DependsOnDatabaseInitialization public class CashFlowLinkDaoImpl extends AbstractGenericDao implements CashFlowLinkDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java index 4701f0dc..764b94cd 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Chargeback.CHARGEBACK; @Component +@DependsOnDatabaseInitialization public class ChargebackDaoImpl extends AbstractGenericDao implements ChargebackDao { private final RowMapper chargebackRowMapper; - @Autowired public ChargebackDaoImpl(DataSource dataSource) { super(dataSource); this.chargebackRowMapper = new RecordRowMapper<>(CHARGEBACK, Chargeback.class); diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java index a3c6bb0b..e096a309 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java @@ -7,7 +7,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SingleColumnRowMapper; import org.springframework.stereotype.Component; @@ -21,11 +21,11 @@ import static dev.vality.daway.domain.tables.InvoiceCart.INVOICE_CART; @Component +@DependsOnDatabaseInitialization public class InvoiceCartDaoImpl extends AbstractGenericDao implements InvoiceCartDao { private final RowMapper invoiceCartRowMapper; - @Autowired public InvoiceCartDaoImpl(DataSource dataSource) { super(dataSource); invoiceCartRowMapper = new RecordRowMapper<>(INVOICE_CART, InvoiceCart.class); diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java index 247f38a2..4d38456e 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -20,11 +20,11 @@ import static dev.vality.daway.domain.tables.Invoice.INVOICE; @Component +@DependsOnDatabaseInitialization public class InvoiceDaoImpl extends AbstractGenericDao implements InvoiceDao { private final RowMapper invoiceRowMapper; - @Autowired public InvoiceDaoImpl(DataSource dataSource) { super(dataSource); invoiceRowMapper = new RecordRowMapper<>(INVOICE, Invoice.class); diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java index 7e11ef31..8319be90 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java @@ -9,6 +9,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ import static dev.vality.daway.domain.Tables.INVOICE_STATUS_INFO; @Component +@DependsOnDatabaseInitialization public class InvoiceStatusInfoDaoImpl extends AbstractGenericDao implements InvoiceStatusInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java index 61716493..c284182b 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java @@ -10,6 +10,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import static dev.vality.daway.domain.tables.PaymentAdditionalInfo.PAYMENT_ADDITIONAL_INFO; @Component +@DependsOnDatabaseInitialization public class PaymentAdditionalInfoDaoImpl extends AbstractGenericDao implements PaymentAdditionalInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java index ae72fc7c..6c6b769c 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java @@ -9,6 +9,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ import static dev.vality.daway.domain.Tables.PAYMENT_CASH_CHANGE; @Component +@DependsOnDatabaseInitialization public class PaymentCashChangeDaoImpl extends AbstractGenericDao implements PaymentCashChangeDao { private final RowMapper cashChangeRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java index 8e8a5a91..9a2309bb 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Payment.PAYMENT; @Component +@DependsOnDatabaseInitialization public class PaymentDaoImpl extends AbstractGenericDao implements PaymentDao { private final RowMapper paymentRowMapper; - @Autowired public PaymentDaoImpl(DataSource dataSource) { super(dataSource); paymentRowMapper = new RecordRowMapper<>(PAYMENT, Payment.class); diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java index 65099d34..e6592ebe 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java @@ -9,6 +9,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -20,6 +21,7 @@ import static dev.vality.daway.domain.Tables.PAYMENT_EXCHANGE_CONTEXT; @Component +@DependsOnDatabaseInitialization public class PaymentExchangeContextDaoImpl extends AbstractGenericDao implements PaymentExchangeContextDao { private final RowMapper paymentExchangeContextRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java index 643ca933..6a5ba134 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java @@ -10,6 +10,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import static dev.vality.daway.domain.tables.PaymentFee.PAYMENT_FEE; @Component +@DependsOnDatabaseInitialization public class PaymentFeeDaoImpl extends AbstractGenericDao implements PaymentFeeDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java index 274165a4..64da5d8f 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java @@ -8,6 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -19,6 +20,7 @@ import static dev.vality.daway.domain.tables.PaymentPayerInfo.PAYMENT_PAYER_INFO; @Component +@DependsOnDatabaseInitialization public class PaymentPayerInfoDaoImpl extends AbstractGenericDao implements PaymentPayerInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java index 8541aaaf..02aad588 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java @@ -10,6 +10,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import static dev.vality.daway.domain.tables.PaymentRecurrentInfo.PAYMENT_RECURRENT_INFO; @Component +@DependsOnDatabaseInitialization public class PaymentRecurrentInfoDaoImpl extends AbstractGenericDao implements PaymentRecurrentInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java index d3868483..359e332d 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java @@ -10,6 +10,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import static dev.vality.daway.domain.tables.PaymentRiskData.PAYMENT_RISK_DATA; @Component +@DependsOnDatabaseInitialization public class PaymentRiskDataDaoImpl extends AbstractGenericDao implements PaymentRiskDataDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java index e0310de0..e32682db 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java @@ -10,6 +10,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import static dev.vality.daway.domain.tables.PaymentRoute.PAYMENT_ROUTE; @Component +@DependsOnDatabaseInitialization public class PaymentRouteDaoImpl extends AbstractGenericDao implements PaymentRouteDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java index 0778fc21..363e4b72 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java @@ -8,6 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -19,6 +20,7 @@ import static dev.vality.daway.domain.tables.PaymentSessionInfo.PAYMENT_SESSION_INFO; @Component +@DependsOnDatabaseInitialization public class PaymentSessionInfoDaoImpl extends AbstractGenericDao implements PaymentSessionInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java index 0b970b80..54c5fb5f 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java @@ -10,6 +10,7 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,6 +23,7 @@ import static dev.vality.daway.domain.tables.PaymentStatusInfo.PAYMENT_STATUS_INFO; @Component +@DependsOnDatabaseInitialization public class PaymentStatusInfoDaoImpl extends AbstractGenericDao implements PaymentStatusInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java index 61ac6692..bbccda31 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java @@ -9,7 +9,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -21,11 +21,11 @@ import static dev.vality.daway.domain.tables.Refund.REFUND; @Component +@DependsOnDatabaseInitialization public class RefundDaoImpl extends AbstractGenericDao implements RefundDao { private final RowMapper refundRowMapper; - @Autowired public RefundDaoImpl(DataSource dataSource) { super(dataSource); refundRowMapper = new RecordRowMapper<>(REFUND, Refund.class); diff --git a/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java b/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java index 770f200a..46feffa3 100644 --- a/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java @@ -4,7 +4,7 @@ import dev.vality.daway.domain.tables.pojos.LimitConfig; import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,11 +15,11 @@ import static dev.vality.daway.domain.Tables.LIMIT_CONFIG; @Component +@DependsOnDatabaseInitialization public class LimitConfigDaoImpl extends AbstractGenericDao implements LimitConfigDao { private final RowMapper limitConfigRowMapper; - @Autowired public LimitConfigDaoImpl(DataSource dataSource) { super(dataSource); limitConfigRowMapper = new RecordRowMapper<>(LIMIT_CONFIG, LimitConfig.class); diff --git a/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java b/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java index f1022754..f427bcda 100644 --- a/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java @@ -6,8 +6,8 @@ import dev.vality.daway.domain.tables.records.RateRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,9 +19,9 @@ import static dev.vality.daway.domain.tables.Rate.RATE; @Component +@DependsOnDatabaseInitialization public class RateDaoImpl extends AbstractGenericDao implements RateDao { - @Autowired public RateDaoImpl(@Qualifier("dataSource") DataSource dataSource) { super(dataSource); } diff --git a/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java b/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java index 5c0dd262..68fb77ac 100644 --- a/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.Source.SOURCE; @Component +@DependsOnDatabaseInitialization public class SourceDaoImpl extends AbstractGenericDao implements SourceDao { private final RowMapper sourceRowMapper; - @Autowired public SourceDaoImpl(DataSource dataSource) { super(dataSource); sourceRowMapper = new RecordRowMapper<>(SOURCE, Source.class); diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java index f109278a..8b403da9 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java @@ -8,6 +8,7 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -17,6 +18,7 @@ import static dev.vality.daway.domain.tables.FistfulCashFlow.FISTFUL_CASH_FLOW; @Component +@DependsOnDatabaseInitialization public class FistfulCashFlowDaoImpl extends AbstractGenericDao implements FistfulCashFlowDao { private final RowMapper cashFlowRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java index d576409f..3d300d70 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,11 +19,11 @@ import static dev.vality.daway.domain.tables.WithdrawalAdjustment.WITHDRAWAL_ADJUSTMENT; @Component +@DependsOnDatabaseInitialization public class WithdrawalAdjustmentDaoImpl extends AbstractGenericDao implements WithdrawalAdjustmentDao { private final RowMapper withdrawalAdjustmentRowMapper; - @Autowired public WithdrawalAdjustmentDaoImpl(DataSource dataSource) { super(dataSource); withdrawalAdjustmentRowMapper = new RecordRowMapper<>(WITHDRAWAL_ADJUSTMENT, WithdrawalAdjustment.class); diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java index 298ef9b9..262a94ff 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java @@ -7,6 +7,7 @@ import dev.vality.daway.exception.DaoException; import org.jooq.Query; import org.jooq.impl.DSL; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.stereotype.Component; import javax.sql.DataSource; @@ -14,6 +15,7 @@ import static dev.vality.daway.domain.Tables.WITHDRAWAL_CASH_CHANGE; @Component +@DependsOnDatabaseInitialization public class WithdrawalCashChangeDaoImpl extends AbstractGenericDao implements WithdrawalCashChangeDao { public WithdrawalCashChangeDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java index 8f33d8d5..8380573b 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java @@ -8,7 +8,7 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -20,11 +20,11 @@ import static dev.vality.daway.domain.tables.Withdrawal.WITHDRAWAL; @Component +@DependsOnDatabaseInitialization public class WithdrawalDaoImpl extends AbstractGenericDao implements WithdrawalDao { private final RowMapper withdrawalRowMapper; - @Autowired public WithdrawalDaoImpl(DataSource dataSource) { super(dataSource); withdrawalRowMapper = new RecordRowMapper<>(WITHDRAWAL, Withdrawal.class); diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java index 626555bc..5658b912 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java @@ -6,6 +6,7 @@ import dev.vality.daway.domain.tables.records.WithdrawalValidationRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -16,6 +17,7 @@ import static dev.vality.daway.domain.tables.WithdrawalValidation.WITHDRAWAL_VALIDATION; @Component +@DependsOnDatabaseInitialization public class WithdrawalValidationDaoImpl extends AbstractGenericDao implements WithdrawalValidationDao { public WithdrawalValidationDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java index 2ad63e68..25392af7 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java @@ -8,8 +8,8 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -21,11 +21,11 @@ import static dev.vality.daway.domain.tables.WithdrawalSession.WITHDRAWAL_SESSION; @Component +@DependsOnDatabaseInitialization public class WithdrawalSessionDaoImpl extends AbstractGenericDao implements WithdrawalSessionDao { private final RowMapper withdrawalSessionRowMapper; - @Autowired public WithdrawalSessionDaoImpl(@Qualifier("dataSource") DataSource dataSource) { super(dataSource); withdrawalSessionRowMapper = new RecordRowMapper<>(WITHDRAWAL_SESSION, WithdrawalSession.class); diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java index af49ca02..baf27b24 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java @@ -1,15 +1,15 @@ package dev.vality.daway.handler.dominant.impl; import dev.vality.damsel.domain.ProviderObject; +import dev.vality.damsel.domain.ProviderAccount; import dev.vality.daway.dao.dominant.iface.DomainObjectDao; import dev.vality.daway.dao.dominant.impl.ProviderDaoImpl; import dev.vality.daway.domain.tables.pojos.Provider; import dev.vality.daway.handler.dominant.AbstractDominantHandler; import dev.vality.daway.util.JsonUtil; -import dev.vality.geck.common.util.TypeUtil; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; +import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; @@ -85,12 +85,23 @@ public Provider convertToDatabaseObject(ProviderObject providerObject, Long vers } if (data.isSetAccounts()) { - Map accountsMap = data.getAccounts().entrySet() + Map> accountsMap = data.getAccounts().entrySet() .stream() - .collect(Collectors.toMap(e -> e.getKey().getSymbolicCode(), e -> e.getValue().getSettlement())); + .collect(Collectors.toMap( + entry -> entry.getKey().getSymbolicCode(), + entry -> convertProviderAccounts(entry.getValue()))); provider.setAccountsJson(JsonUtil.objectToJsonString(accountsMap)); } provider.setCurrent(current); return provider; } + + private Map convertProviderAccounts(ProviderAccount providerAccount) { + Map accounts = new LinkedHashMap<>(); + accounts.put("settlement", providerAccount.getSettlement()); + if (providerAccount.isSetGuarantee()) { + accounts.put("guarantee", providerAccount.getGuarantee()); + } + return accounts; + } } diff --git a/src/main/java/dev/vality/daway/handler/event/stock/impl/destination/DestinationCreatedHandler.java b/src/main/java/dev/vality/daway/handler/event/stock/impl/destination/DestinationCreatedHandler.java index fb92f008..0b749a81 100644 --- a/src/main/java/dev/vality/daway/handler/event/stock/impl/destination/DestinationCreatedHandler.java +++ b/src/main/java/dev/vality/daway/handler/event/stock/impl/destination/DestinationCreatedHandler.java @@ -1,6 +1,6 @@ package dev.vality.daway.handler.event.stock.impl.destination; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import dev.vality.daway.dao.destination.iface.DestinationDao; import dev.vality.daway.domain.enums.DestinationResourceType; import dev.vality.daway.domain.enums.DestinationStatus; diff --git a/src/main/java/dev/vality/daway/mapper/invoice/InvoiceCreatedMapper.java b/src/main/java/dev/vality/daway/mapper/invoice/InvoiceCreatedMapper.java index 565eb8a7..b4494296 100644 --- a/src/main/java/dev/vality/daway/mapper/invoice/InvoiceCreatedMapper.java +++ b/src/main/java/dev/vality/daway/mapper/invoice/InvoiceCreatedMapper.java @@ -1,6 +1,6 @@ package dev.vality.daway.mapper.invoice; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import dev.vality.damsel.domain.Invoice; import dev.vality.damsel.payment_processing.InvoiceChange; import dev.vality.daway.domain.enums.InvoiceStatus; diff --git a/src/main/java/dev/vality/daway/service/FileService.java b/src/main/java/dev/vality/daway/service/FileService.java index 14e3ae26..85e2f214 100644 --- a/src/main/java/dev/vality/daway/service/FileService.java +++ b/src/main/java/dev/vality/daway/service/FileService.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.Objects; @Slf4j @@ -25,7 +25,7 @@ public String getClientRack(String path) { private String getProperty(String stringFilePath) { try { - var path = Paths.get(stringFilePath); + var path = Path.of(stringFilePath); String content = Files.readString(path); return content.split(DELIMITER)[1]; } catch (IOException e) { diff --git a/src/main/java/dev/vality/daway/util/JsonUtil.java b/src/main/java/dev/vality/daway/util/JsonUtil.java index 5ef34004..39bc9340 100644 --- a/src/main/java/dev/vality/daway/util/JsonUtil.java +++ b/src/main/java/dev/vality/daway/util/JsonUtil.java @@ -1,17 +1,18 @@ package dev.vality.daway.util; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.geck.serializer.kit.json.JsonHandler; import dev.vality.geck.serializer.kit.tbase.TBaseProcessor; import org.apache.thrift.TBase; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.json.JsonMapper; import java.io.IOException; import java.util.Objects; public class JsonUtil { - private static final ObjectMapper objectMapper = new ObjectMapper(); + private static final ObjectMapper objectMapper = new JsonMapper(); public static String thriftBaseToJsonString(TBase thriftBase) { try { @@ -23,8 +24,9 @@ public static String thriftBaseToJsonString(TBase thriftBase) { public static JsonNode thriftBaseToJsonNode(TBase thriftBase) { try { - return new TBaseProcessor().process(thriftBase, new JsonHandler()); - } catch (IOException e) { + var legacyJsonNode = new TBaseProcessor().process(thriftBase, new JsonHandler()); + return objectMapper.readTree(legacyJsonNode.toString()); + } catch (IOException | JacksonException e) { throw new RuntimeException("Couldn't convert to json node: " + thriftBase, e); } } @@ -32,7 +34,7 @@ public static JsonNode thriftBaseToJsonNode(TBase thriftBase) { public static String objectToJsonString(Object o) { try { return objectMapper.writeValueAsString(o); - } catch (JsonProcessingException e) { + } catch (JacksonException e) { throw new RuntimeException("Couldn't convert object to json string: " + o, e); } } @@ -40,7 +42,7 @@ public static String objectToJsonString(Object o) { public static T stringToObject(byte[] stringObject, Class type) { try { return objectMapper.readValue(stringObject, type); - } catch (IOException e) { + } catch (JacksonException e) { throw new IllegalStateException("Couldn't convert json string to object: ", e); } } @@ -51,7 +53,7 @@ public static byte[] toBytes(T object) { return new byte[0]; } return objectMapper.writeValueAsBytes(object); - } catch (IOException e) { + } catch (JacksonException e) { throw new IllegalStateException("Couldn't convert object to byte array: ", e); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a3c4a332..5aee8911 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,9 +34,6 @@ management: server: port: "${management.port}" metrics: - export: - prometheus: - enabled: false tags: application: "${project.name}" endpoint: @@ -45,13 +42,17 @@ management: enabled: true show-details: always metrics: - enabled: true + access: read-only prometheus: - enabled: true + access: read-only endpoints: web: exposure: include: health,info,prometheus + prometheus: + metrics: + export: + enabled: false kafka: consumer: diff --git a/src/test/java/dev/vality/daway/config/PostgresqlJooqSpringBootITest.java b/src/test/java/dev/vality/daway/config/PostgresqlJooqSpringBootITest.java index 0682a9a7..c61875fd 100644 --- a/src/test/java/dev/vality/daway/config/PostgresqlJooqSpringBootITest.java +++ b/src/test/java/dev/vality/daway/config/PostgresqlJooqSpringBootITest.java @@ -1,7 +1,7 @@ package dev.vality.daway.config; import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton; -import org.springframework.boot.test.autoconfigure.jooq.JooqTest; +import org.springframework.boot.jooq.test.autoconfigure.JooqTest; import org.springframework.boot.test.context.SpringBootTest; import java.lang.annotation.ElementType; diff --git a/src/test/java/dev/vality/daway/dao/DaoTests.java b/src/test/java/dev/vality/daway/dao/DaoTests.java index 57e26679..83387714 100644 --- a/src/test/java/dev/vality/daway/dao/DaoTests.java +++ b/src/test/java/dev/vality/daway/dao/DaoTests.java @@ -25,8 +25,8 @@ import java.util.*; -import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; @Slf4j @PostgresqlSpringBootITest diff --git a/src/test/java/dev/vality/daway/dao/DepositDaoTest.java b/src/test/java/dev/vality/daway/dao/DepositDaoTest.java index fa8f3096..979c6c18 100644 --- a/src/test/java/dev/vality/daway/dao/DepositDaoTest.java +++ b/src/test/java/dev/vality/daway/dao/DepositDaoTest.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; @PostgresqlSpringBootITest public class DepositDaoTest { diff --git a/src/test/java/dev/vality/daway/dao/DestinationDaoTest.java b/src/test/java/dev/vality/daway/dao/DestinationDaoTest.java index de80d8e1..73b1789f 100644 --- a/src/test/java/dev/vality/daway/dao/DestinationDaoTest.java +++ b/src/test/java/dev/vality/daway/dao/DestinationDaoTest.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; @PostgresqlSpringBootITest public class DestinationDaoTest { diff --git a/src/test/java/dev/vality/daway/dao/SourceDaoTest.java b/src/test/java/dev/vality/daway/dao/SourceDaoTest.java index 4eb83ae3..9812b583 100644 --- a/src/test/java/dev/vality/daway/dao/SourceDaoTest.java +++ b/src/test/java/dev/vality/daway/dao/SourceDaoTest.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; @PostgresqlSpringBootITest public class SourceDaoTest { diff --git a/src/test/java/dev/vality/daway/dao/WalletDaoTest.java b/src/test/java/dev/vality/daway/dao/WalletDaoTest.java index 122dc7a0..d78e0d55 100644 --- a/src/test/java/dev/vality/daway/dao/WalletDaoTest.java +++ b/src/test/java/dev/vality/daway/dao/WalletDaoTest.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; @PostgresqlSpringBootITest public class WalletDaoTest { diff --git a/src/test/java/dev/vality/daway/handler/dominant/impl/ProviderHandlerTest.java b/src/test/java/dev/vality/daway/handler/dominant/impl/ProviderHandlerTest.java index e912d98b..787da66e 100644 --- a/src/test/java/dev/vality/daway/handler/dominant/impl/ProviderHandlerTest.java +++ b/src/test/java/dev/vality/daway/handler/dominant/impl/ProviderHandlerTest.java @@ -8,6 +8,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.json.JsonMapper; import java.io.IOException; import java.time.LocalDateTime; @@ -22,6 +24,10 @@ @ExtendWith(MockitoExtension.class) class ProviderHandlerTest { + private static final String PROVIDER_ACCOUNT_CURRENCY = "RUB"; + private static final long SETTLEMENT_ACCOUNT_ID = 10L; + private static final long GUARANTEE_ACCOUNT_ID = 20L; + @Mock private ProviderDaoImpl providerDao; @@ -46,6 +52,13 @@ void convertToDatabaseObjectTest() throws IOException { Assertions.assertEquals(provider.getDescription(), providerObject.getData().getDescription()); Assertions.assertFalse(provider.getPaymentTermsJson().isEmpty()); Assertions.assertFalse(provider.getRecurrentPaytoolTermsJson().isEmpty()); + JsonNode providerAccounts = new JsonMapper().readTree(provider.getAccountsJson()); + Assertions.assertEquals( + SETTLEMENT_ACCOUNT_ID, + providerAccounts.get(PROVIDER_ACCOUNT_CURRENCY).get("settlement").asLong()); + Assertions.assertEquals( + GUARANTEE_ACCOUNT_ID, + providerAccounts.get(PROVIDER_ACCOUNT_CURRENCY).get("guarantee").asLong()); } private ProviderObject buildProviderObject() throws IOException { @@ -62,11 +75,9 @@ private ProviderObject buildProviderObject() throws IOException { dev.vality.testcontainers.annotations.util.RandomBeans.random(String.class))) ) .setAccounts( - Map.of(new CurrencyRef( - dev.vality.testcontainers.annotations.util.RandomBeans.random(String.class)), - new ProviderAccount( - dev.vality.testcontainers.annotations.util.RandomBeans.random( - Long.class)))) + Map.of(new CurrencyRef(PROVIDER_ACCOUNT_CURRENCY), + new ProviderAccount(SETTLEMENT_ACCOUNT_ID) + .setGuarantee(GUARANTEE_ACCOUNT_ID))) .setTerms(new ProvisionTermSet() .setPayments(buildProvisionTermSet()) .setRecurrentPaytools(buildRecurrentPaytools()) diff --git a/src/test/java/dev/vality/daway/service/FileServiceTest.java b/src/test/java/dev/vality/daway/service/FileServiceTest.java index 0118709e..2bb01e9c 100644 --- a/src/test/java/dev/vality/daway/service/FileServiceTest.java +++ b/src/test/java/dev/vality/daway/service/FileServiceTest.java @@ -1,15 +1,12 @@ package dev.vality.daway.service; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.junit.jupiter.api.Assertions.*; -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {FileService.class}) +@SpringJUnitConfig(classes = {FileService.class}) class FileServiceTest { @Autowired diff --git a/src/test/java/dev/vality/daway/service/InvoicingServiceTest.java b/src/test/java/dev/vality/daway/service/InvoicingServiceTest.java index 5670c739..5e1da171 100644 --- a/src/test/java/dev/vality/daway/service/InvoicingServiceTest.java +++ b/src/test/java/dev/vality/daway/service/InvoicingServiceTest.java @@ -25,27 +25,29 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.quality.Strictness; import java.time.Instant; import java.util.*; import static org.mockito.Mockito.*; -@ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class InvoicingServiceTest { private final List> wrongHandlers = new ArrayList<>(); private final List> rightHandlers = new ArrayList<>(); - @MockitoBean + @Mock private InvoiceWrapperService invoiceWrapperService; - @MockitoBean + @Mock private PaymentWrapperService paymentWrapperService; - @MockitoBean + @Mock private PartyShopCacheService partyShopCacheService; - @MockitoBean + @Mock private PaymentRouteDao paymentRouteDao; @Mock private MachineEventCopyFactory machineEventCopyFactory; diff --git a/src/test/java/dev/vality/daway/utils/JdbcUtil.java b/src/test/java/dev/vality/daway/utils/JdbcUtil.java index 7f85a6df..8c59628b 100644 --- a/src/test/java/dev/vality/daway/utils/JdbcUtil.java +++ b/src/test/java/dev/vality/daway/utils/JdbcUtil.java @@ -26,7 +26,7 @@ public static int countPaymentEntity(JdbcTemplate jdbcTemplate, query += " AND current"; } return Objects.requireNonNull( - jdbcTemplate.queryForObject(query, new Object[]{invoiceId, paymentId}, Integer.class)); + jdbcTemplate.queryForObject(query, Integer.class,invoiceId, paymentId)); } public static int countInvoiceEntity(JdbcTemplate jdbcTemplate, @@ -37,6 +37,6 @@ public static int countInvoiceEntity(JdbcTemplate jdbcTemplate, if (withCurrent) { query += " AND current"; } - return Objects.requireNonNull(jdbcTemplate.queryForObject(query, new Object[]{invoiceId}, Integer.class)); + return Objects.requireNonNull(jdbcTemplate.queryForObject(query, Integer.class,invoiceId)); } } From 5bb32801447d52a78d123b42a14158ac09425d0a Mon Sep 17 00:00:00 2001 From: Gretchen-z <68681408+Gretchen-z@users.noreply.github.com> Date: Mon, 28 Sep 2026 11:27:30 +0300 Subject: [PATCH 2/2] Remove useless annotations --- .../dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java | 2 -- .../dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java | 2 -- .../daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java | 2 -- .../vality/daway/dao/destination/impl/DestinationDaoImpl.java | 2 -- .../dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java | 2 -- .../dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java | 2 -- .../java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java | 2 -- .../daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java | 2 -- .../daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java | 2 -- .../dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java | 2 -- .../java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java | 2 -- .../java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java | 2 -- .../daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java | 2 -- .../dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java | 2 -- .../dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java | 4 +--- .../dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java | 2 -- .../vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java | 2 -- .../dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java | 2 -- .../vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java | 2 -- .../vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java | 2 -- .../vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java | 2 -- .../dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java | 2 -- .../dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java | 2 -- .../dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java | 2 -- .../dao/invoicing/impl/PaymentExchangeContextDaoImpl.java | 2 -- .../vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java | 2 -- .../vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java | 2 -- .../daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java | 2 -- .../dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java | 2 -- .../java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java | 2 -- src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java | 2 -- .../java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java | 2 -- .../daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java | 2 -- .../dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java | 2 -- .../dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java | 2 -- .../vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java | 2 -- .../dao/withdrawal/impl/WithdrawalValidationDaoImpl.java | 2 -- .../dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java | 2 -- 44 files changed, 1 insertion(+), 89 deletions(-) diff --git a/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java b/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java index 13c2f835..40ed683e 100644 --- a/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -18,7 +17,6 @@ import static dev.vality.daway.domain.tables.DepositAdjustment.DEPOSIT_ADJUSTMENT; @Component -@DependsOnDatabaseInitialization public class DepositAdjustmentDaoImpl extends AbstractGenericDao implements DepositAdjustmentDao { private final RowMapper depositRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java b/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java index ae366032..b1a4e734 100644 --- a/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/deposit/impl/DepositDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Deposit.DEPOSIT; @Component -@DependsOnDatabaseInitialization public class DepositDaoImpl extends AbstractGenericDao implements DepositDao { private final RowMapper depositRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java b/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java index 0d0f39ff..ca4954cb 100644 --- a/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/deposit/revert/impl/DepositRevertDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -18,7 +17,6 @@ import static dev.vality.daway.domain.tables.DepositRevert.DEPOSIT_REVERT; @Component -@DependsOnDatabaseInitialization public class DepositRevertDaoImpl extends AbstractGenericDao implements DepositRevertDao { private final RowMapper depositRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java b/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java index ff864385..76653e7e 100644 --- a/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/destination/impl/DestinationDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Destination.DESTINATION; @Component -@DependsOnDatabaseInitialization public class DestinationDaoImpl extends AbstractGenericDao implements DestinationDao { private final RowMapper destinationRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java index 684ea263..567161ae 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/CategoryDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.CategoryRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class CategoryDaoImpl extends AbstractGenericDao implements DomainObjectDao { public CategoryDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java index 07acba8d..47b86d78 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/CurrencyDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.CurrencyRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class CurrencyDaoImpl extends AbstractGenericDao implements DomainObjectDao { public CurrencyDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java index 15a8e4b0..06b5cd9c 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/PartyDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.mapper.RecordRowMapper; import lombok.extern.slf4j.Slf4j; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -21,7 +20,6 @@ @Slf4j @Component -@DependsOnDatabaseInitialization public class PartyDaoImpl extends AbstractGenericDao implements DomainObjectDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java index 6dcd7ae3..b1e422cd 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentInstitutionDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.PaymentInstitutionRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class PaymentInstitutionDaoImpl extends AbstractGenericDao implements DomainObjectDao { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java index 552203e9..9fe902a1 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java @@ -8,14 +8,12 @@ import dev.vality.daway.domain.tables.records.PaymentRoutingRuleRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class PaymentRoutingRulesDaoImpl extends AbstractGenericDao implements DomainObjectDao { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java index 5c116629..b0e70308 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/ProviderDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.ProviderRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class ProviderDaoImpl extends AbstractGenericDao implements DomainObjectDao { public ProviderDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java index 4d2fdc44..e6d0b83c 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/ProxyDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.ProxyRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class ProxyDaoImpl extends AbstractGenericDao implements DomainObjectDao { public ProxyDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java index eaa47051..1f22e070 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/ShopDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.mapper.RecordRowMapper; import lombok.extern.slf4j.Slf4j; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -21,7 +20,6 @@ @Slf4j @Component -@DependsOnDatabaseInitialization public class ShopDaoImpl extends AbstractGenericDao implements DomainObjectDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java index b74e6f88..6ca3218a 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/TermSetHierarchyDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.TermSetHierarchyRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class TermSetHierarchyDaoImpl extends AbstractGenericDao implements DomainObjectDao { public TermSetHierarchyDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java index e2891b54..126cfad3 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/TerminalDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.domain.tables.records.TerminalRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import java.util.Optional; @Component -@DependsOnDatabaseInitialization public class TerminalDaoImpl extends AbstractGenericDao implements DomainObjectDao { public TerminalDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java b/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java index e6f15f78..a3afe49a 100644 --- a/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/dominant/impl/WalletDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Wallet.WALLET; @Component -@DependsOnDatabaseInitialization public class WalletDaoImpl extends AbstractGenericDao implements DomainObjectDao { private final RowMapper walletRowMapper; @@ -59,4 +57,4 @@ public Wallet get(String walletId) throws DaoException { .orElseThrow( () -> new NotFoundException(String.format("Wallet not found, walletId='%s'", walletId))); } -} \ No newline at end of file +} diff --git a/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java b/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java index 471221c4..10ad5be6 100644 --- a/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/exrate/impl/ExchangeRateDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -18,7 +17,6 @@ import static dev.vality.daway.domain.tables.ExRate.EX_RATE; @Component -@DependsOnDatabaseInitialization public class ExchangeRateDaoImpl extends AbstractGenericDao implements ExchangeRateDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java index 4fa96d47..4de69f1f 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/AdjustmentDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Adjustment.ADJUSTMENT; @Component -@DependsOnDatabaseInitialization public class AdjustmentDaoImpl extends AbstractGenericDao implements AdjustmentDao { private final RowMapper adjustmentRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java index d69f81be..56704058 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.CashFlow.CASH_FLOW; @Component -@DependsOnDatabaseInitialization public class CashFlowDaoImpl extends AbstractGenericDao implements CashFlowDao { private final RowMapper cashFlowRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java index ab366fe8..2da06a97 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/CashFlowLinkDaoImpl.java @@ -11,7 +11,6 @@ import org.jooq.Field; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.DataClassRowMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import static dev.vality.daway.domain.Tables.CASH_FLOW_LINK; @Component -@DependsOnDatabaseInitialization public class CashFlowLinkDaoImpl extends AbstractGenericDao implements CashFlowLinkDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java index 764b94cd..3fbe660c 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/ChargebackDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Chargeback.CHARGEBACK; @Component -@DependsOnDatabaseInitialization public class ChargebackDaoImpl extends AbstractGenericDao implements ChargebackDao { private final RowMapper chargebackRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java index e096a309..c8b01279 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceCartDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SingleColumnRowMapper; import org.springframework.stereotype.Component; @@ -21,7 +20,6 @@ import static dev.vality.daway.domain.tables.InvoiceCart.INVOICE_CART; @Component -@DependsOnDatabaseInitialization public class InvoiceCartDaoImpl extends AbstractGenericDao implements InvoiceCartDao { private final RowMapper invoiceCartRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java index 4d38456e..26a7401a 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -20,7 +19,6 @@ import static dev.vality.daway.domain.tables.Invoice.INVOICE; @Component -@DependsOnDatabaseInitialization public class InvoiceDaoImpl extends AbstractGenericDao implements InvoiceDao { private final RowMapper invoiceRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java index 8319be90..7e11ef31 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/InvoiceStatusInfoDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -22,7 +21,6 @@ import static dev.vality.daway.domain.Tables.INVOICE_STATUS_INFO; @Component -@DependsOnDatabaseInitialization public class InvoiceStatusInfoDaoImpl extends AbstractGenericDao implements InvoiceStatusInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java index c284182b..61716493 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentAdditionalInfoDaoImpl.java @@ -10,7 +10,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -23,7 +22,6 @@ import static dev.vality.daway.domain.tables.PaymentAdditionalInfo.PAYMENT_ADDITIONAL_INFO; @Component -@DependsOnDatabaseInitialization public class PaymentAdditionalInfoDaoImpl extends AbstractGenericDao implements PaymentAdditionalInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java index 6c6b769c..ae72fc7c 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentCashChangeDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -21,7 +20,6 @@ import static dev.vality.daway.domain.Tables.PAYMENT_CASH_CHANGE; @Component -@DependsOnDatabaseInitialization public class PaymentCashChangeDaoImpl extends AbstractGenericDao implements PaymentCashChangeDao { private final RowMapper cashChangeRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java index 9a2309bb..fe505710 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Payment.PAYMENT; @Component -@DependsOnDatabaseInitialization public class PaymentDaoImpl extends AbstractGenericDao implements PaymentDao { private final RowMapper paymentRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java index e6592ebe..65099d34 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentExchangeContextDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -21,7 +20,6 @@ import static dev.vality.daway.domain.Tables.PAYMENT_EXCHANGE_CONTEXT; @Component -@DependsOnDatabaseInitialization public class PaymentExchangeContextDaoImpl extends AbstractGenericDao implements PaymentExchangeContextDao { private final RowMapper paymentExchangeContextRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java index 6a5ba134..643ca933 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentFeeDaoImpl.java @@ -10,7 +10,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -23,7 +22,6 @@ import static dev.vality.daway.domain.tables.PaymentFee.PAYMENT_FEE; @Component -@DependsOnDatabaseInitialization public class PaymentFeeDaoImpl extends AbstractGenericDao implements PaymentFeeDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java index 64da5d8f..274165a4 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentPayerInfoDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -20,7 +19,6 @@ import static dev.vality.daway.domain.tables.PaymentPayerInfo.PAYMENT_PAYER_INFO; @Component -@DependsOnDatabaseInitialization public class PaymentPayerInfoDaoImpl extends AbstractGenericDao implements PaymentPayerInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java index 02aad588..8541aaaf 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRecurrentInfoDaoImpl.java @@ -10,7 +10,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -23,7 +22,6 @@ import static dev.vality.daway.domain.tables.PaymentRecurrentInfo.PAYMENT_RECURRENT_INFO; @Component -@DependsOnDatabaseInitialization public class PaymentRecurrentInfoDaoImpl extends AbstractGenericDao implements PaymentRecurrentInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java index 359e332d..d3868483 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRiskDataDaoImpl.java @@ -10,7 +10,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -23,7 +22,6 @@ import static dev.vality.daway.domain.tables.PaymentRiskData.PAYMENT_RISK_DATA; @Component -@DependsOnDatabaseInitialization public class PaymentRiskDataDaoImpl extends AbstractGenericDao implements PaymentRiskDataDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java index e32682db..e0310de0 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentRouteDaoImpl.java @@ -10,7 +10,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -23,7 +22,6 @@ import static dev.vality.daway.domain.tables.PaymentRoute.PAYMENT_ROUTE; @Component -@DependsOnDatabaseInitialization public class PaymentRouteDaoImpl extends AbstractGenericDao implements PaymentRouteDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java index 363e4b72..0778fc21 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentSessionInfoDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -20,7 +19,6 @@ import static dev.vality.daway.domain.tables.PaymentSessionInfo.PAYMENT_SESSION_INFO; @Component -@DependsOnDatabaseInitialization public class PaymentSessionInfoDaoImpl extends AbstractGenericDao implements PaymentSessionInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java index 54c5fb5f..0b970b80 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/PaymentStatusInfoDaoImpl.java @@ -10,7 +10,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -23,7 +22,6 @@ import static dev.vality.daway.domain.tables.PaymentStatusInfo.PAYMENT_STATUS_INFO; @Component -@DependsOnDatabaseInitialization public class PaymentStatusInfoDaoImpl extends AbstractGenericDao implements PaymentStatusInfoDao { private final RowMapper rowMapper; diff --git a/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java b/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java index bbccda31..aa675db6 100644 --- a/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/invoicing/impl/RefundDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -21,7 +20,6 @@ import static dev.vality.daway.domain.tables.Refund.REFUND; @Component -@DependsOnDatabaseInitialization public class RefundDaoImpl extends AbstractGenericDao implements RefundDao { private final RowMapper refundRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java b/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java index 46feffa3..e20d2dac 100644 --- a/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/limiter/LimitConfigDaoImpl.java @@ -4,7 +4,6 @@ import dev.vality.daway.domain.tables.pojos.LimitConfig; import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -15,7 +14,6 @@ import static dev.vality.daway.domain.Tables.LIMIT_CONFIG; @Component -@DependsOnDatabaseInitialization public class LimitConfigDaoImpl extends AbstractGenericDao implements LimitConfigDao { private final RowMapper limitConfigRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java b/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java index f427bcda..baa7742e 100644 --- a/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/rate/impl/RateDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.exception.DaoException; import org.jooq.Query; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Rate.RATE; @Component -@DependsOnDatabaseInitialization public class RateDaoImpl extends AbstractGenericDao implements RateDao { public RateDaoImpl(@Qualifier("dataSource") DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java b/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java index 68fb77ac..b9c4918e 100644 --- a/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/source/impl/SourceDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.Source.SOURCE; @Component -@DependsOnDatabaseInitialization public class SourceDaoImpl extends AbstractGenericDao implements SourceDao { private final RowMapper sourceRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java index 8b403da9..f109278a 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.DaoException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -18,7 +17,6 @@ import static dev.vality.daway.domain.tables.FistfulCashFlow.FISTFUL_CASH_FLOW; @Component -@DependsOnDatabaseInitialization public class FistfulCashFlowDaoImpl extends AbstractGenericDao implements FistfulCashFlowDao { private final RowMapper cashFlowRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java index 3d300d70..1895ff88 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalAdjustmentDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -19,7 +18,6 @@ import static dev.vality.daway.domain.tables.WithdrawalAdjustment.WITHDRAWAL_ADJUSTMENT; @Component -@DependsOnDatabaseInitialization public class WithdrawalAdjustmentDaoImpl extends AbstractGenericDao implements WithdrawalAdjustmentDao { private final RowMapper withdrawalAdjustmentRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java index 262a94ff..298ef9b9 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalCashChangeDaoImpl.java @@ -7,7 +7,6 @@ import dev.vality.daway.exception.DaoException; import org.jooq.Query; import org.jooq.impl.DSL; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.stereotype.Component; import javax.sql.DataSource; @@ -15,7 +14,6 @@ import static dev.vality.daway.domain.Tables.WITHDRAWAL_CASH_CHANGE; @Component -@DependsOnDatabaseInitialization public class WithdrawalCashChangeDaoImpl extends AbstractGenericDao implements WithdrawalCashChangeDao { public WithdrawalCashChangeDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java index 8380573b..e91a2b6c 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalDaoImpl.java @@ -8,7 +8,6 @@ import dev.vality.daway.exception.NotFoundException; import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -20,7 +19,6 @@ import static dev.vality.daway.domain.tables.Withdrawal.WITHDRAWAL; @Component -@DependsOnDatabaseInitialization public class WithdrawalDaoImpl extends AbstractGenericDao implements WithdrawalDao { private final RowMapper withdrawalRowMapper; diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java index 5658b912..626555bc 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/impl/WithdrawalValidationDaoImpl.java @@ -6,7 +6,6 @@ import dev.vality.daway.domain.tables.records.WithdrawalValidationRecord; import dev.vality.daway.exception.DaoException; import org.jooq.Query; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -17,7 +16,6 @@ import static dev.vality.daway.domain.tables.WithdrawalValidation.WITHDRAWAL_VALIDATION; @Component -@DependsOnDatabaseInitialization public class WithdrawalValidationDaoImpl extends AbstractGenericDao implements WithdrawalValidationDao { public WithdrawalValidationDaoImpl(DataSource dataSource) { diff --git a/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java b/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java index 25392af7..59803b9d 100644 --- a/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java +++ b/src/main/java/dev/vality/daway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java @@ -9,7 +9,6 @@ import dev.vality.mapper.RecordRowMapper; import org.jooq.Query; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.stereotype.Component; @@ -21,7 +20,6 @@ import static dev.vality.daway.domain.tables.WithdrawalSession.WITHDRAWAL_SESSION; @Component -@DependsOnDatabaseInitialization public class WithdrawalSessionDaoImpl extends AbstractGenericDao implements WithdrawalSessionDao { private final RowMapper withdrawalSessionRowMapper;