diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index eb9016e..360a8f1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,13 +6,9 @@ on: - 'master' - 'main' -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - jobs: deploy: uses: valitydev/base-workflow/.github/workflows/maven-service-deploy.yml@v1 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} - mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }} \ No newline at end of file + mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }} diff --git a/pom.xml b/pom.xml index 4ce839f..a344ece 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ dev.vality service-parent-pom - 1.0.1 + 1.0.8 @@ -29,7 +29,7 @@ nw jdbc:postgresql://localhost:5432/newway 5432 - 1.128-d331fce + 1.133-c484877 0.0.8 4.31.0 @@ -120,13 +120,13 @@ - com.rbkmoney + dev.vality db-common-lib - com.rbkmoney + dev.vality payout-manager-proto - 1.21-bdd9888 + 1.25-cfe2120 com.rbkmoney @@ -134,18 +134,18 @@ 1.2.12 - com.rbkmoney + dev.vality kafka-common-lib - com.rbkmoney + dev.vality sink-common-lib - ${sink-common-lib.version} + 0.0.1 - com.rbkmoney + dev.vality machinegun-proto - 1.19-f77367a + 1.21-e4784ab com.rbkmoney @@ -153,11 +153,11 @@ 1.2.12 - com.rbkmoney + dev.vality damsel - com.rbkmoney + dev.vality fistful-proto ${fistful-proto.version} @@ -167,25 +167,17 @@ 1.16-66906cd - com.rbkmoney + dev.vality shared-resources - com.rbkmoney.geck + dev.vality.geck serializer - com.rbkmoney - custom-actuator-endpoints - - - com.rbkmoney - custom-metrics-spring-boot-starter - - - com.rbkmoney + dev.vality mamsel - 0.1.2 + 0.2.1 @@ -370,7 +362,7 @@ - com.rbkmoney:shared-resources:${shared-resources.version} + dev.vality:shared-resources:${shared-resources.version} false false diff --git a/src/main/java/com/rbkmoney/newway/config/ApplicationConfig.java b/src/main/java/com/rbkmoney/newway/config/ApplicationConfig.java index 0512367..01520eb 100644 --- a/src/main/java/com/rbkmoney/newway/config/ApplicationConfig.java +++ b/src/main/java/com/rbkmoney/newway/config/ApplicationConfig.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.config; -import com.rbkmoney.damsel.domain_config.RepositorySrv; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolEventSinkSrv; +import dev.vality.damsel.domain_config.RepositorySrv; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolEventSinkSrv; import com.rbkmoney.newway.domain.Nw; import com.rbkmoney.woody.thrift.impl.http.THSpawnClientBuilder; import org.jooq.Schema; diff --git a/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java b/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java index 30b3f02..38756ca 100644 --- a/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java +++ b/src/main/java/com/rbkmoney/newway/config/KafkaConfig.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.config; -import com.rbkmoney.kafka.common.exception.handler.SeekToCurrentWithSleepBatchErrorHandler; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.kafka.common.exception.handler.SeekToCurrentWithSleepBatchErrorHandler; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.config.properties.KafkaConsumerProperties; import com.rbkmoney.newway.config.properties.KafkaSslProperties; import com.rbkmoney.newway.serde.PayoutEventDeserializer; import com.rbkmoney.newway.serde.SinkEventDeserializer; -import com.rbkmoney.payout.manager.Event; +import dev.vality.payout.manager.Event; import lombok.RequiredArgsConstructor; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/src/main/java/com/rbkmoney/newway/config/SchedulerConfig.java b/src/main/java/com/rbkmoney/newway/config/SchedulerConfig.java index bbf0524..d4ed1a8 100644 --- a/src/main/java/com/rbkmoney/newway/config/SchedulerConfig.java +++ b/src/main/java/com/rbkmoney/newway/config/SchedulerConfig.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.config; -import com.rbkmoney.damsel.domain_config.RepositorySrv; +import dev.vality.damsel.domain_config.RepositorySrv; import com.rbkmoney.newway.handler.dominant.DominantPoller; import com.rbkmoney.newway.service.DominantService; import net.javacrumbs.shedlock.core.LockProvider; diff --git a/src/main/java/com/rbkmoney/newway/config/SerializationConfig.java b/src/main/java/com/rbkmoney/newway/config/SerializationConfig.java index fc680d2..144f9b9 100644 --- a/src/main/java/com/rbkmoney/newway/config/SerializationConfig.java +++ b/src/main/java/com/rbkmoney/newway/config/SerializationConfig.java @@ -1,16 +1,16 @@ package com.rbkmoney.newway.config; -import com.rbkmoney.damsel.payment_processing.EventPayload; -import com.rbkmoney.damsel.payment_processing.PartyEventData; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolEventData; +import dev.vality.damsel.payment_processing.EventPayload; +import dev.vality.damsel.payment_processing.PartyEventData; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolEventData; import com.rbkmoney.geck.serializer.Geck; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.parser.impl.PartyEventDataMachineEventParser; -import com.rbkmoney.sink.common.parser.impl.PaymentEventPayloadMachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; -import com.rbkmoney.sink.common.serialization.impl.PartyEventDataDeserializer; -import com.rbkmoney.sink.common.serialization.impl.PaymentEventPayloadDeserializer; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.PartyEventDataMachineEventParser; +import dev.vality.sink.common.parser.impl.PaymentEventPayloadMachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.sink.common.serialization.impl.PartyEventDataDeserializer; +import dev.vality.sink.common.serialization.impl.PaymentEventPayloadDeserializer; import com.rbkmoney.xrates.rate.Change; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -69,114 +69,114 @@ public class SerializationConfig { } @Bean - public BinaryDeserializer depositEventDataBinaryDeserializer() { + public BinaryDeserializer depositEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.deposit.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.deposit.Event.class); + public dev.vality.fistful.deposit.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.deposit.Event.class); } }; } @Bean - public MachineEventParser depositEventDataMachineEventParser( - BinaryDeserializer depositEventDataBinaryDeserializer) { + public MachineEventParser depositEventDataMachineEventParser( + BinaryDeserializer depositEventDataBinaryDeserializer) { return new MachineEventParser<>(depositEventDataBinaryDeserializer); } @Bean - public BinaryDeserializer destinationEventDataBinaryDeserializer() { + public BinaryDeserializer destinationEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.destination.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.destination.Event.class); + public dev.vality.fistful.destination.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.destination.Event.class); } }; } @Bean - public MachineEventParser destinationEventDataMachineEventParser( - BinaryDeserializer destinationEventDataBinaryDeserializer) { + public MachineEventParser destinationEventDataMachineEventParser( + BinaryDeserializer destinationEventDataBinaryDeserializer) { return new MachineEventParser<>(destinationEventDataBinaryDeserializer); } @Bean - public BinaryDeserializer identityEventDataBinaryDeserializer() { + public BinaryDeserializer identityEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.identity.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.identity.Event.class); + public dev.vality.fistful.identity.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.identity.Event.class); } }; } @Bean - public MachineEventParser identityEventDataMachineEventParser( - BinaryDeserializer identityEventDataBinaryDeserializer) { + public MachineEventParser identityEventDataMachineEventParser( + BinaryDeserializer identityEventDataBinaryDeserializer) { return new MachineEventParser<>(identityEventDataBinaryDeserializer); } @Bean - public BinaryDeserializer sourceEventDataBinaryDeserializer() { + public BinaryDeserializer sourceEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.source.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.source.Event.class); + public dev.vality.fistful.source.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.source.Event.class); } }; } @Bean - public MachineEventParser sourceEventDataMachineEventParser( - BinaryDeserializer sourceEventDataBinaryDeserializer) { + public MachineEventParser sourceEventDataMachineEventParser( + BinaryDeserializer sourceEventDataBinaryDeserializer) { return new MachineEventParser<>(sourceEventDataBinaryDeserializer); } @Bean - public BinaryDeserializer walletEventDataBinaryDeserializer() { + public BinaryDeserializer walletEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.wallet.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.wallet.Event.class); + public dev.vality.fistful.wallet.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.wallet.Event.class); } }; } @Bean - public MachineEventParser walletEventDataMachineEventParser( - BinaryDeserializer walletEventDataBinaryDeserializer) { + public MachineEventParser walletEventDataMachineEventParser( + BinaryDeserializer walletEventDataBinaryDeserializer) { return new MachineEventParser<>(walletEventDataBinaryDeserializer); } @Bean - public BinaryDeserializer withdrawalEventDataBinaryDeserializer() { + public BinaryDeserializer withdrawalEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.withdrawal.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.withdrawal.Event.class); + public dev.vality.fistful.withdrawal.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.withdrawal.Event.class); } }; } @Bean - public MachineEventParser withdrawalEventDataMachineEventParser( - BinaryDeserializer withdrawalEventDataBinaryDeserializer) { + public MachineEventParser withdrawalEventDataMachineEventParser( + BinaryDeserializer withdrawalEventDataBinaryDeserializer) { return new MachineEventParser<>(withdrawalEventDataBinaryDeserializer); } @Bean - public BinaryDeserializer withdrawalSessionEventDataBinaryDeserializer() { + public BinaryDeserializer withdrawalSessionEventDataBinaryDeserializer() { return new AbstractThriftBinaryDeserializer<>() { @Override - public com.rbkmoney.fistful.withdrawal_session.Event deserialize(byte[] bytes) { - return Geck.msgPackToTBase(bytes, com.rbkmoney.fistful.withdrawal_session.Event.class); + public dev.vality.fistful.withdrawal_session.Event deserialize(byte[] bytes) { + return Geck.msgPackToTBase(bytes, dev.vality.fistful.withdrawal_session.Event.class); } }; } @Bean - public MachineEventParser withdrawalSessionEventDataMachineEventParser( - BinaryDeserializer withdrawalSessionEventDataBinaryDeserializer) { + public MachineEventParser withdrawalSessionEventDataMachineEventParser( + BinaryDeserializer withdrawalSessionEventDataBinaryDeserializer) { return new MachineEventParser<>(withdrawalSessionEventDataBinaryDeserializer); } } diff --git a/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/iface/DepositAdjustmentDao.java b/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/iface/DepositAdjustmentDao.java index 69a2ddd..7fd4441 100644 --- a/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/iface/DepositAdjustmentDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/iface/DepositAdjustmentDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.deposit.adjustment.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.DepositAdjustment; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java index cb04fba..2e69b3f 100644 --- a/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/deposit/adjustment/impl/DepositAdjustmentDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.deposit.adjustment.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.deposit.adjustment.iface.DepositAdjustmentDao; import com.rbkmoney.newway.domain.tables.pojos.DepositAdjustment; import com.rbkmoney.newway.domain.tables.records.DepositAdjustmentRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/deposit/iface/DepositDao.java b/src/main/java/com/rbkmoney/newway/dao/deposit/iface/DepositDao.java index de98b72..abdf292 100644 --- a/src/main/java/com/rbkmoney/newway/dao/deposit/iface/DepositDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/deposit/iface/DepositDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.deposit.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Deposit; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/deposit/impl/DepositDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/deposit/impl/DepositDaoImpl.java index af9cc38..9a23a53 100644 --- a/src/main/java/com/rbkmoney/newway/dao/deposit/impl/DepositDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/deposit/impl/DepositDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.deposit.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.deposit.iface.DepositDao; import com.rbkmoney.newway.domain.tables.pojos.Deposit; import com.rbkmoney.newway.domain.tables.records.DepositRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/deposit/revert/iface/DepositRevertDao.java b/src/main/java/com/rbkmoney/newway/dao/deposit/revert/iface/DepositRevertDao.java index 903fa55..e317460 100644 --- a/src/main/java/com/rbkmoney/newway/dao/deposit/revert/iface/DepositRevertDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/deposit/revert/iface/DepositRevertDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.deposit.revert.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.DepositRevert; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/deposit/revert/impl/DepositRevertDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/deposit/revert/impl/DepositRevertDaoImpl.java index 7340376..7990460 100644 --- a/src/main/java/com/rbkmoney/newway/dao/deposit/revert/impl/DepositRevertDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/deposit/revert/impl/DepositRevertDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.deposit.revert.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.deposit.revert.iface.DepositRevertDao; import com.rbkmoney.newway.domain.tables.pojos.DepositRevert; import com.rbkmoney.newway.domain.tables.records.DepositRevertRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/destination/iface/DestinationDao.java b/src/main/java/com/rbkmoney/newway/dao/destination/iface/DestinationDao.java index aead640..ed514e3 100644 --- a/src/main/java/com/rbkmoney/newway/dao/destination/iface/DestinationDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/destination/iface/DestinationDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.destination.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/destination/impl/DestinationDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/destination/impl/DestinationDaoImpl.java index 368497e..616395a 100644 --- a/src/main/java/com/rbkmoney/newway/dao/destination/impl/DestinationDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/destination/impl/DestinationDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.destination.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.destination.iface.DestinationDao; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.domain.tables.records.DestinationRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DomainObjectDao.java b/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DomainObjectDao.java index 3764b4a..364762e 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DomainObjectDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DomainObjectDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.exception.DaoException; public interface DomainObjectDao extends GenericDao { diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DominantDao.java b/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DominantDao.java index 75f86dc..f87a233 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DominantDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/iface/DominantDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.exception.DaoException; public interface DominantDao extends GenericDao { diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CalendarDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CalendarDaoImpl.java index 2eda4ea..f69ffe4 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CalendarDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CalendarDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Calendar; import com.rbkmoney.newway.domain.tables.records.CalendarRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CategoryDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CategoryDaoImpl.java index c4fd190..62ee07f 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CategoryDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CategoryDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Category; import com.rbkmoney.newway.domain.tables.records.CategoryRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CountryDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CountryDaoImpl.java index 649a440..c22f1a7 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CountryDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CountryDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Country; import com.rbkmoney.newway.domain.tables.records.CountryRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CurrencyDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CurrencyDaoImpl.java index 8199e1f..697ab11 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CurrencyDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/CurrencyDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Currency; import com.rbkmoney.newway.domain.tables.records.CurrencyRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/DominantDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/DominantDaoImpl.java index 95ac4fa..a00af04 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/DominantDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/DominantDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DominantDao; import com.rbkmoney.newway.exception.DaoException; import org.jooq.Query; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/InspectorDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/InspectorDaoImpl.java index feffe2c..e3cad62 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/InspectorDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/InspectorDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Inspector; import com.rbkmoney.newway.domain.tables.records.InspectorRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentInstitutionDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentInstitutionDaoImpl.java index b4a0a7c..99dc668 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentInstitutionDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentInstitutionDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.PaymentInstitution; import com.rbkmoney.newway.domain.tables.records.PaymentInstitutionRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentMethodDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentMethodDaoImpl.java index 1767fc3..0744574 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentMethodDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentMethodDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.PaymentMethod; import com.rbkmoney.newway.domain.tables.records.PaymentMethodRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java index f4a7a0f..c2f889b 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PaymentRoutingRulesDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.PaymentRoutingRule; import com.rbkmoney.newway.domain.tables.records.PaymentRoutingRuleRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PayoutMethodDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PayoutMethodDaoImpl.java index e8a66d2..9729843 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PayoutMethodDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/PayoutMethodDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.PayoutMethod; import com.rbkmoney.newway.domain.tables.records.PayoutMethodRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProviderDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProviderDaoImpl.java index 063c4ba..c14f3db 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProviderDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProviderDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Provider; import com.rbkmoney.newway.domain.tables.records.ProviderRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProxyDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProxyDaoImpl.java index fbeddda..6f23baa 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProxyDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/ProxyDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Proxy; import com.rbkmoney.newway.domain.tables.records.ProxyRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TermSetHierarchyDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TermSetHierarchyDaoImpl.java index ffcfc18..3c043aa 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TermSetHierarchyDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TermSetHierarchyDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.TermSetHierarchy; import com.rbkmoney.newway.domain.tables.records.TermSetHierarchyRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TerminalDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TerminalDaoImpl.java index 9b98f6a..e15acb6 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TerminalDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TerminalDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.Terminal; import com.rbkmoney.newway.domain.tables.records.TerminalRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TradeBlocDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TradeBlocDaoImpl.java index 4b958ea..431258e 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TradeBlocDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/TradeBlocDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.TradeBloc; import com.rbkmoney.newway.domain.tables.records.TradeBlocRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/WithdrawalProviderDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/WithdrawalProviderDaoImpl.java index 56d1b23..c566502 100644 --- a/src/main/java/com/rbkmoney/newway/dao/dominant/impl/WithdrawalProviderDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/dominant/impl/WithdrawalProviderDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.dominant.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalProvider; import com.rbkmoney.newway.domain.tables.records.WithdrawalProviderRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/identity/iface/ChallengeDao.java b/src/main/java/com/rbkmoney/newway/dao/identity/iface/ChallengeDao.java index 0701767..67cec2a 100644 --- a/src/main/java/com/rbkmoney/newway/dao/identity/iface/ChallengeDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/identity/iface/ChallengeDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.identity.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Challenge; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/identity/iface/IdentityDao.java b/src/main/java/com/rbkmoney/newway/dao/identity/iface/IdentityDao.java index b8e94d3..ac702bf 100644 --- a/src/main/java/com/rbkmoney/newway/dao/identity/iface/IdentityDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/identity/iface/IdentityDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.identity.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/identity/impl/ChallengeDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/identity/impl/ChallengeDaoImpl.java index 785d8fd..f3d8db4 100644 --- a/src/main/java/com/rbkmoney/newway/dao/identity/impl/ChallengeDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/identity/impl/ChallengeDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.identity.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.identity.iface.ChallengeDao; import com.rbkmoney.newway.domain.tables.pojos.Challenge; import com.rbkmoney.newway.domain.tables.records.ChallengeRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/identity/impl/IdentityDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/identity/impl/IdentityDaoImpl.java index 91c4b9c..02e23af 100644 --- a/src/main/java/com/rbkmoney/newway/dao/identity/impl/IdentityDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/identity/impl/IdentityDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.identity.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; import com.rbkmoney.newway.domain.tables.records.IdentityRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/AdjustmentDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/AdjustmentDao.java index e795257..2a7dd4b 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/AdjustmentDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/AdjustmentDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Adjustment; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/CashFlowDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/CashFlowDao.java index c504266..f02fc55 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/CashFlowDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/CashFlowDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.enums.AdjustmentCashFlowType; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.CashFlow; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/ChargebackDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/ChargebackDao.java index 7272549..0528205 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/ChargebackDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/ChargebackDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Chargeback; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceCartDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceCartDao.java index 9b5d0d9..f49fc6b 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceCartDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceCartDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.InvoiceCart; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceDao.java index 647046a..d24768c 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/InvoiceDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Invoice; import com.rbkmoney.newway.exception.DaoException; import com.rbkmoney.newway.model.InvoicingKey; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/PaymentDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/PaymentDao.java index 314badd..11726a6 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/PaymentDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/PaymentDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.exception.DaoException; import com.rbkmoney.newway.model.InvoicingKey; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/RefundDao.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/RefundDao.java index 73d03f5..0a665d9 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/RefundDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/iface/RefundDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.invoicing.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Refund; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/AdjustmentDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/AdjustmentDaoImpl.java index c2c0a1c..0631b58 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/AdjustmentDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/AdjustmentDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.AdjustmentDao; import com.rbkmoney.newway.domain.tables.pojos.Adjustment; import com.rbkmoney.newway.domain.tables.records.AdjustmentRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/CashFlowDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/CashFlowDaoImpl.java index 411ee97..c9b749f 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/CashFlowDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/CashFlowDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.CashFlowDao; import com.rbkmoney.newway.domain.enums.AdjustmentCashFlowType; import com.rbkmoney.newway.domain.enums.PaymentChangeType; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/ChargebackDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/ChargebackDaoImpl.java index 76a7763..7444253 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/ChargebackDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/ChargebackDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.domain.tables.pojos.Chargeback; import com.rbkmoney.newway.domain.tables.records.ChargebackRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceCartDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceCartDaoImpl.java index 9338f8c..2897e0e 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceCartDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceCartDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.InvoiceCartDao; import com.rbkmoney.newway.domain.tables.pojos.InvoiceCart; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceDaoImpl.java index bee605e..5e0c848 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/InvoiceDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.InvoiceDao; import com.rbkmoney.newway.domain.tables.pojos.Invoice; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/PaymentDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/PaymentDaoImpl.java index 9a81ea5..ebc9ebb 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/PaymentDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/PaymentDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.PaymentDao; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/RefundDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/RefundDaoImpl.java index 4947636..64b6aac 100644 --- a/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/RefundDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/invoicing/impl/RefundDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.invoicing.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.invoicing.iface.RefundDao; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.Refund; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractAdjustmentDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractAdjustmentDao.java index ce612fa..e02c27f 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractAdjustmentDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractAdjustmentDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.ContractAdjustment; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractDao.java index 627ea11..c4b4fde 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractorDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractorDao.java index 5067806..d674b9a 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractorDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/ContractorDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Contractor; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/PartyDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/PartyDao.java index 469e83d..485446f 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/PartyDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/PartyDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Party; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/PayoutToolDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/PayoutToolDao.java index e52494b..b4f0ebe 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/PayoutToolDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/PayoutToolDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.PayoutTool; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/RevisionDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/RevisionDao.java index 5359608..34799ca 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/RevisionDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/RevisionDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.exception.DaoException; public interface RevisionDao extends GenericDao { diff --git a/src/main/java/com/rbkmoney/newway/dao/party/iface/ShopDao.java b/src/main/java/com/rbkmoney/newway/dao/party/iface/ShopDao.java index 93a991c..4083775 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/iface/ShopDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/iface/ShopDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractAdjustmentDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractAdjustmentDaoImpl.java index 72a57f5..6db6ef7 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractAdjustmentDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractAdjustmentDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.party.iface.ContractAdjustmentDao; import com.rbkmoney.newway.domain.tables.pojos.ContractAdjustment; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractDaoImpl.java index 99ec256..8858213 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; import com.rbkmoney.newway.domain.tables.records.ContractRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractorDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractorDaoImpl.java index 4ae6a75..56f0d10 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractorDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/ContractorDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.party.iface.ContractorDao; import com.rbkmoney.newway.domain.tables.pojos.Contractor; import com.rbkmoney.newway.domain.tables.records.ContractorRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/PartyDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/PartyDaoImpl.java index 28574a9..32684bb 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/PartyDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/PartyDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.domain.tables.pojos.Party; import com.rbkmoney.newway.domain.tables.records.PartyRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/PayoutToolDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/PayoutToolDaoImpl.java index 97da1c2..346ac38 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/PayoutToolDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/PayoutToolDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.party.iface.PayoutToolDao; import com.rbkmoney.newway.domain.tables.pojos.PayoutTool; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/RevisionDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/RevisionDaoImpl.java index d0bbfd1..c3263be 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/RevisionDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/RevisionDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.party.iface.RevisionDao; import com.rbkmoney.newway.exception.DaoException; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; diff --git a/src/main/java/com/rbkmoney/newway/dao/party/impl/ShopDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/party/impl/ShopDaoImpl.java index 9e202e6..1280bfc 100644 --- a/src/main/java/com/rbkmoney/newway/dao/party/impl/ShopDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/party/impl/ShopDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.party.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.domain.tables.records.ShopRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/payout/iface/PayoutDao.java b/src/main/java/com/rbkmoney/newway/dao/payout/iface/PayoutDao.java index 903d8a7..9f3dda4 100644 --- a/src/main/java/com/rbkmoney/newway/dao/payout/iface/PayoutDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/payout/iface/PayoutDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.payout.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Payout; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/payout/impl/PayoutDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/payout/impl/PayoutDaoImpl.java index 2c0a6cd..6905f05 100644 --- a/src/main/java/com/rbkmoney/newway/dao/payout/impl/PayoutDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/payout/impl/PayoutDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.payout.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.payout.iface.PayoutDao; import com.rbkmoney.newway.domain.tables.pojos.Payout; import com.rbkmoney.newway.domain.tables.records.PayoutRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/rate/iface/RateDao.java b/src/main/java/com/rbkmoney/newway/dao/rate/iface/RateDao.java index 3e276ad..417018d 100644 --- a/src/main/java/com/rbkmoney/newway/dao/rate/iface/RateDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/rate/iface/RateDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.rate.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Rate; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/rate/impl/RateDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/rate/impl/RateDaoImpl.java index fb41091..e4e0f12 100644 --- a/src/main/java/com/rbkmoney/newway/dao/rate/impl/RateDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/rate/impl/RateDaoImpl.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.rate.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; +import dev.vality.dao.impl.AbstractGenericDao; import com.rbkmoney.newway.dao.rate.iface.RateDao; import com.rbkmoney.newway.domain.tables.pojos.Rate; import com.rbkmoney.newway.domain.tables.records.RateRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/iface/RecurrentPaymentToolDao.java b/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/iface/RecurrentPaymentToolDao.java index 9663317..35dbcc3 100644 --- a/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/iface/RecurrentPaymentToolDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/iface/RecurrentPaymentToolDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.recurrent.payment.tool.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/impl/RecurrentPaymentToolDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/impl/RecurrentPaymentToolDaoImpl.java index 1efd446..90208cf 100644 --- a/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/impl/RecurrentPaymentToolDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/recurrent/payment/tool/impl/RecurrentPaymentToolDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.recurrent.payment.tool.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; import com.rbkmoney.newway.domain.tables.records.RecurrentPaymentToolRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/source/iface/SourceDao.java b/src/main/java/com/rbkmoney/newway/dao/source/iface/SourceDao.java index 71497d3..9539927 100644 --- a/src/main/java/com/rbkmoney/newway/dao/source/iface/SourceDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/source/iface/SourceDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.source.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Source; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/source/impl/SourceDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/source/impl/SourceDaoImpl.java index 34f0d56..a5801fb 100644 --- a/src/main/java/com/rbkmoney/newway/dao/source/impl/SourceDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/source/impl/SourceDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.source.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.source.iface.SourceDao; import com.rbkmoney.newway.domain.tables.pojos.Source; import com.rbkmoney.newway.domain.tables.records.SourceRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/wallet/iface/WalletDao.java b/src/main/java/com/rbkmoney/newway/dao/wallet/iface/WalletDao.java index 86693de..f08b920 100644 --- a/src/main/java/com/rbkmoney/newway/dao/wallet/iface/WalletDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/wallet/iface/WalletDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.wallet.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Wallet; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/wallet/impl/WalletDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/wallet/impl/WalletDaoImpl.java index 2477943..cea2ed4 100644 --- a/src/main/java/com/rbkmoney/newway/dao/wallet/impl/WalletDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/wallet/impl/WalletDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.wallet.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.wallet.iface.WalletDao; import com.rbkmoney.newway.domain.tables.pojos.Wallet; import com.rbkmoney.newway.domain.tables.records.WalletRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/FistfulCashFlowDao.java b/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/FistfulCashFlowDao.java index b514293..b2d3800 100644 --- a/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/FistfulCashFlowDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/FistfulCashFlowDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.withdrawal.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; import com.rbkmoney.newway.domain.tables.pojos.FistfulCashFlow; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/WithdrawalDao.java b/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/WithdrawalDao.java index 7d6cb7c..1e5f903 100644 --- a/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/WithdrawalDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/withdrawal/iface/WithdrawalDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.withdrawal.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.Withdrawal; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java index 067c756..5ca4877 100644 --- a/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/FistfulCashFlowDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.withdrawal.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; import com.rbkmoney.newway.domain.tables.pojos.FistfulCashFlow; diff --git a/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/WithdrawalDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/WithdrawalDaoImpl.java index 8bfe70e..dd41a1f 100644 --- a/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/WithdrawalDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/withdrawal/impl/WithdrawalDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.withdrawal.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.withdrawal.iface.WithdrawalDao; import com.rbkmoney.newway.domain.tables.pojos.Withdrawal; import com.rbkmoney.newway.domain.tables.records.WithdrawalRecord; diff --git a/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/iface/WithdrawalSessionDao.java b/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/iface/WithdrawalSessionDao.java index dbb945f..1beb63b 100644 --- a/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/iface/WithdrawalSessionDao.java +++ b/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/iface/WithdrawalSessionDao.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao.withdrawal.session.iface; -import com.rbkmoney.dao.GenericDao; +import dev.vality.dao.GenericDao; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java b/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java index e8bafdc..4499de9 100644 --- a/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java +++ b/src/main/java/com/rbkmoney/newway/dao/withdrawal/session/impl/WithdrawalSessionDaoImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.dao.withdrawal.session.impl; -import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.dao.impl.AbstractGenericDao; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.withdrawal.session.iface.WithdrawalSessionDao; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.domain.tables.records.WithdrawalSessionRecord; diff --git a/src/main/java/com/rbkmoney/newway/factory/AdjustmentMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/AdjustmentMachineEventCopyFactoryImpl.java index 45d5ae5..49bd9d2 100644 --- a/src/main/java/com/rbkmoney/newway/factory/AdjustmentMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/AdjustmentMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Adjustment; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/ChallengeMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/ChallengeMachineEventCopyFactoryImpl.java index 0a6f38f..2e59be3 100644 --- a/src/main/java/com/rbkmoney/newway/factory/ChallengeMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/ChallengeMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Challenge; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/ChargebackMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/ChargebackMachineEventCopyFactoryImpl.java index 8635246..1f8a360 100644 --- a/src/main/java/com/rbkmoney/newway/factory/ChargebackMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/ChargebackMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Chargeback; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/DepositAjustmentMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/DepositAjustmentMachineEventCopyFactoryImpl.java index 95e849d..9b5997d 100644 --- a/src/main/java/com/rbkmoney/newway/factory/DepositAjustmentMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/DepositAjustmentMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.DepositAdjustment; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/DepositMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/DepositMachineEventCopyFactoryImpl.java index ce97a11..961069d 100644 --- a/src/main/java/com/rbkmoney/newway/factory/DepositMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/DepositMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Deposit; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/DepositRevertMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/DepositRevertMachineEventCopyFactoryImpl.java index cb80aa6..5b095b3 100644 --- a/src/main/java/com/rbkmoney/newway/factory/DepositRevertMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/DepositRevertMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.DepositRevert; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/DestinationMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/DestinationMachineEventCopyFactoryImpl.java index 8a11635..5df9890 100644 --- a/src/main/java/com/rbkmoney/newway/factory/DestinationMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/DestinationMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Destination; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/IdentityMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/IdentityMachineEventCopyFactoryImpl.java index 992efa9..2288564 100644 --- a/src/main/java/com/rbkmoney/newway/factory/IdentityMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/IdentityMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Identity; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/MachineEventCopyFactory.java b/src/main/java/com/rbkmoney/newway/factory/MachineEventCopyFactory.java index 7138d26..faf8eea 100644 --- a/src/main/java/com/rbkmoney/newway/factory/MachineEventCopyFactory.java +++ b/src/main/java/com/rbkmoney/newway/factory/MachineEventCopyFactory.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.factory; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; public interface MachineEventCopyFactory { diff --git a/src/main/java/com/rbkmoney/newway/factory/PartyMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/PartyMachineEventCopyFactoryImpl.java index fe5abc8..4053e03 100644 --- a/src/main/java/com/rbkmoney/newway/factory/PartyMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/PartyMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Party; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/RecurrentPaymentToolCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/RecurrentPaymentToolCopyFactoryImpl.java index e1d4d4a..0dfbde3 100644 --- a/src/main/java/com/rbkmoney/newway/factory/RecurrentPaymentToolCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/RecurrentPaymentToolCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/RefundMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/RefundMachineEventCopyFactoryImpl.java index 4020476..7f26c0b 100644 --- a/src/main/java/com/rbkmoney/newway/factory/RefundMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/RefundMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Refund; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/SourceMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/SourceMachineEventCopyFactoryImpl.java index 7f99180..a13c51a 100644 --- a/src/main/java/com/rbkmoney/newway/factory/SourceMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/SourceMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Source; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/WalletMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/WalletMachineEventCopyFactoryImpl.java index 3a6b2ee..89dfbc8 100644 --- a/src/main/java/com/rbkmoney/newway/factory/WalletMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/WalletMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Wallet; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/WithdrawalMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/WithdrawalMachineEventCopyFactoryImpl.java index bed9fed..ec946e8 100644 --- a/src/main/java/com/rbkmoney/newway/factory/WithdrawalMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/WithdrawalMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Withdrawal; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/WithdrawalSessionMachineEventCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/WithdrawalSessionMachineEventCopyFactoryImpl.java index f7c7ffc..5be2a2c 100644 --- a/src/main/java/com/rbkmoney/newway/factory/WithdrawalSessionMachineEventCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/WithdrawalSessionMachineEventCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ClaimEffectCopyFactory.java b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ClaimEffectCopyFactory.java index b9ce6b1..d0e6cc7 100644 --- a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ClaimEffectCopyFactory.java +++ b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ClaimEffectCopyFactory.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.factory.claim.effect; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; public interface ClaimEffectCopyFactory { diff --git a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractClaimEffectCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractClaimEffectCopyFactoryImpl.java index 1e8d7ad..ac3335e 100644 --- a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractClaimEffectCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractClaimEffectCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory.claim.effect; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Contract; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractorClaimEffectCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractorClaimEffectCopyFactoryImpl.java index 4a4e9a9..3501330 100644 --- a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractorClaimEffectCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ContractorClaimEffectCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory.claim.effect; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Contractor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ShopClaimEffectCopyFactoryImpl.java b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ShopClaimEffectCopyFactoryImpl.java index 8a122c9..a7170c0 100644 --- a/src/main/java/com/rbkmoney/newway/factory/claim/effect/ShopClaimEffectCopyFactoryImpl.java +++ b/src/main/java/com/rbkmoney/newway/factory/claim/effect/ShopClaimEffectCopyFactoryImpl.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.factory.claim.effect; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Shop; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/handler/dominant/AbstractDominantHandler.java b/src/main/java/com/rbkmoney/newway/handler/dominant/AbstractDominantHandler.java index f2c3986..5b574d8 100644 --- a/src/main/java/com/rbkmoney/newway/handler/dominant/AbstractDominantHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/dominant/AbstractDominantHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.dominant; -import com.rbkmoney.damsel.domain.DomainObject; -import com.rbkmoney.damsel.domain_config.Operation; +import dev.vality.damsel.domain.DomainObject; +import dev.vality.damsel.domain_config.Operation; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/dominant/DominantPoller.java b/src/main/java/com/rbkmoney/newway/handler/dominant/DominantPoller.java index 078a21c..0ebabfc 100644 --- a/src/main/java/com/rbkmoney/newway/handler/dominant/DominantPoller.java +++ b/src/main/java/com/rbkmoney/newway/handler/dominant/DominantPoller.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.dominant; -import com.rbkmoney.damsel.domain_config.Commit; -import com.rbkmoney.damsel.domain_config.RepositorySrv; +import dev.vality.damsel.domain_config.Commit; +import dev.vality.damsel.domain_config.RepositorySrv; import com.rbkmoney.newway.service.DominantService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/CalendarHandler.java b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/CalendarHandler.java index 96ef05f..eec8cc3 100644 --- a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/CalendarHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/CalendarHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.dominant.impl; import com.fasterxml.jackson.databind.JsonNode; -import com.rbkmoney.damsel.domain.CalendarObject; +import dev.vality.damsel.domain.CalendarObject; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.dao.dominant.impl.CalendarDaoImpl; import com.rbkmoney.newway.domain.tables.pojos.Calendar; @@ -47,7 +47,7 @@ public class CalendarHandler extends AbstractDominantHandler> wrapPaymentMethod( - @NotNull com.rbkmoney.damsel.domain.PaymentMethod paymentMethod) { + private Supplier> wrapPaymentMethod( + @NotNull dev.vality.damsel.domain.PaymentMethod paymentMethod) { return () -> Optional.of(paymentMethod); } diff --git a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRoutingRulesHandler.java b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRoutingRulesHandler.java index 837cb11..d42880e 100644 --- a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRoutingRulesHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRoutingRulesHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.RoutingRulesObject; -import com.rbkmoney.damsel.domain.RoutingRuleset; +import dev.vality.damsel.domain.RoutingRulesObject; +import dev.vality.damsel.domain.RoutingRuleset; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.domain.tables.pojos.PaymentRoutingRule; import com.rbkmoney.newway.handler.dominant.AbstractDominantHandler; diff --git a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PayoutMethodHandler.java b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PayoutMethodHandler.java index 1869b7d..86f6011 100644 --- a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PayoutMethodHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/PayoutMethodHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.PayoutMethodDefinition; -import com.rbkmoney.damsel.domain.PayoutMethodObject; +import dev.vality.damsel.domain.PayoutMethodDefinition; +import dev.vality.damsel.domain.PayoutMethodObject; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.dao.dominant.impl.PayoutMethodDaoImpl; import com.rbkmoney.newway.domain.tables.pojos.PayoutMethod; diff --git a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandler.java b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandler.java index 96890b0..5cf15b9 100644 --- a/src/main/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandler.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.ProviderObject; +import dev.vality.damsel.domain.ProviderObject; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.dao.dominant.impl.ProviderDaoImpl; import com.rbkmoney.newway.domain.tables.pojos.Provider; @@ -45,7 +45,7 @@ public class ProviderHandler extends AbstractDominantHandler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositStatusChangedHandler.java index b848f3f..13231cf 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.deposit.status.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.deposit.status.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.iface.DepositDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferCreatedHandler.java index 4635ff7..f086a1c 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit; -import com.rbkmoney.fistful.cashflow.FinalCashFlowPosting; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; +import dev.vality.fistful.cashflow.FinalCashFlowPosting; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.iface.DepositDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositTransferStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferStatusChangedHandler.java index f9a4ca3..c290b28 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/DepositTransferStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.transfer.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.transfer.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.iface.DepositDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositTransferStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentCreatedHandler.java index 2eb5366..30ad23a 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentCreatedHandler.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.adjustment; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.deposit.adjustment.CashFlowChangePlan; -import com.rbkmoney.fistful.deposit.status.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.deposit.adjustment.CashFlowChangePlan; +import dev.vality.fistful.deposit.status.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.adjustment.iface.DepositAdjustmentDao; import com.rbkmoney.newway.dao.deposit.iface.DepositDao; import com.rbkmoney.newway.domain.enums.DepositAdjustmentStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentStatusChangedHandler.java index beaefdc..dee5b26 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.adjustment; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.deposit.adjustment.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.deposit.adjustment.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.adjustment.iface.DepositAdjustmentDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositAdjustmentStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferCreatedHandler.java index 83842c8..18b57c3 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.adjustment; -import com.rbkmoney.fistful.cashflow.FinalCashFlowPosting; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; +import dev.vality.fistful.cashflow.FinalCashFlowPosting; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.adjustment.iface.DepositAdjustmentDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositTransferStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferStatusChangedHandler.java index baae31b..c9713ce 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/adjustment/DepositAdjustmentTransferStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.adjustment; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.transfer.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.transfer.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.adjustment.iface.DepositAdjustmentDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositTransferStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertCreatedHandler.java index 267b2e0..72f879e 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertCreatedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.revert; -import com.rbkmoney.fistful.base.Cash; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; +import dev.vality.fistful.base.Cash; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.revert.iface.DepositRevertDao; import com.rbkmoney.newway.domain.enums.DepositRevertStatus; import com.rbkmoney.newway.domain.tables.pojos.DepositRevert; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertStatusChangedHandler.java index 9d65ffb..93734b5 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.revert; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.deposit.revert.status.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.deposit.revert.status.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.revert.iface.DepositRevertDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositRevertStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferCreatedHandler.java index c29c22c..7002f99 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.revert; -import com.rbkmoney.fistful.cashflow.FinalCashFlowPosting; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; +import dev.vality.fistful.cashflow.FinalCashFlowPosting; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.revert.iface.DepositRevertDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositTransferStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferStatusChangedHandler.java index f5d1540..5983e20 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/deposit/revert/DepositRevertTransferStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.deposit.revert; -import com.rbkmoney.fistful.deposit.Change; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.fistful.transfer.Status; +import dev.vality.fistful.deposit.Change; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.fistful.transfer.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.deposit.revert.iface.DepositRevertDao; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.domain.enums.DepositTransferStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationAccountCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationAccountCreatedHandler.java index c30f27f..9dec66b 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationAccountCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationAccountCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; -import com.rbkmoney.fistful.account.Account; -import com.rbkmoney.fistful.destination.Change; -import com.rbkmoney.fistful.destination.TimestampedChange; +import dev.vality.fistful.account.Account; +import dev.vality.fistful.destination.Change; +import dev.vality.fistful.destination.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.destination.iface.DestinationDao; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.domain.tables.pojos.Destination; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedHandler.java index 710b938..e2db245 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedHandler.java @@ -1,16 +1,16 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; import com.fasterxml.jackson.databind.JsonNode; -import com.rbkmoney.fistful.base.*; -import com.rbkmoney.fistful.destination.Change; -import com.rbkmoney.fistful.destination.TimestampedChange; +import dev.vality.fistful.base.*; +import dev.vality.fistful.destination.Change; +import dev.vality.fistful.destination.TimestampedChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.destination.iface.DestinationDao; import com.rbkmoney.newway.domain.enums.DestinationResourceType; import com.rbkmoney.newway.domain.enums.DestinationStatus; @@ -91,8 +91,8 @@ public class DestinationCreatedHandler implements DestinationHandler { ResourceDigitalWallet resourceDigitalWallet = resource.getDigitalWallet(); DigitalWallet digitalWallet = resourceDigitalWallet.getDigitalWallet(); destination.setResourceDigitalWalletId(digitalWallet.getId()); - if (digitalWallet.isSetData()) { - destination.setResourceDigitalWalletData(digitalWallet.getData().getSetField().getFieldName()); + if (digitalWallet.isSetPaymentService()) { + destination.setResourceDigitalWalletData(digitalWallet.getPaymentService().getId()); } } diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationHandler.java index 289df64..1f43972 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; -import com.rbkmoney.fistful.destination.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.destination.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface DestinationHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationStatusChangedHandler.java index e77af44..ea9279e 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; -import com.rbkmoney.fistful.destination.Change; -import com.rbkmoney.fistful.destination.Status; -import com.rbkmoney.fistful.destination.TimestampedChange; +import dev.vality.fistful.destination.Change; +import dev.vality.fistful.destination.Status; +import dev.vality.fistful.destination.TimestampedChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.destination.iface.DestinationDao; import com.rbkmoney.newway.domain.enums.DestinationStatus; import com.rbkmoney.newway.domain.tables.pojos.Destination; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeCreatedHandler.java index e15903e..4f4101f 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeCreatedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.identity; -import com.rbkmoney.fistful.identity.ChallengeChange; -import com.rbkmoney.fistful.identity.ChallengeChangePayload; -import com.rbkmoney.fistful.identity.Change; -import com.rbkmoney.fistful.identity.TimestampedChange; +import dev.vality.fistful.identity.ChallengeChange; +import dev.vality.fistful.identity.ChallengeChangePayload; +import dev.vality.fistful.identity.Change; +import dev.vality.fistful.identity.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.ChallengeDao; import com.rbkmoney.newway.domain.enums.ChallengeStatus; import com.rbkmoney.newway.domain.tables.pojos.Challenge; @@ -48,7 +48,7 @@ public class IdentityChallengeCreatedHandler implements IdentityHandler { challenge.setChallengeId(challengeChange.getId()); ChallengeChangePayload challengePayload = challengeChange.getPayload(); - com.rbkmoney.fistful.identity.Challenge challengePayloadCreated = challengePayload.getCreated(); + dev.vality.fistful.identity.Challenge challengePayloadCreated = challengePayload.getCreated(); challenge.setChallengeClassId(challengePayloadCreated.getCls()); if (challengePayloadCreated.isSetProofs()) { challenge.setProofsJson(JsonUtil.objectToJsonString( diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeStatusChangedHandler.java index 35b0747..19773b8 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityChallengeStatusChangedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.identity; -import com.rbkmoney.fistful.identity.*; +import dev.vality.fistful.identity.*; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.ChallengeDao; import com.rbkmoney.newway.domain.enums.ChallengeResolution; import com.rbkmoney.newway.domain.tables.pojos.Challenge; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityCreatedHandler.java index 9c852e9..feac278 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.identity; import com.fasterxml.jackson.databind.JsonNode; -import com.rbkmoney.fistful.identity.Change; -import com.rbkmoney.fistful.identity.TimestampedChange; +import dev.vality.fistful.identity.Change; +import dev.vality.fistful.identity.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; import com.rbkmoney.newway.factory.MachineEventCopyFactory; @@ -42,7 +42,7 @@ public class IdentityCreatedHandler implements IdentityHandler { identityMachineEventCopyFactory.create(event, sequenceId, identityId, timestampedChange.getOccuredAt()); Change change = timestampedChange.getChange(); - com.rbkmoney.fistful.identity.Identity changeCreated = change.getCreated(); + dev.vality.fistful.identity.Identity changeCreated = change.getCreated(); identity.setPartyId(changeCreated.getParty()); identity.setPartyContractId(changeCreated.getContract()); identity.setIdentityProviderId(changeCreated.getProvider()); diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityEffectiveChallengeChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityEffectiveChallengeChangedHandler.java index 12d5e76..ab2572f 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityEffectiveChallengeChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityEffectiveChallengeChangedHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.identity; -import com.rbkmoney.fistful.identity.Change; -import com.rbkmoney.fistful.identity.TimestampedChange; +import dev.vality.fistful.identity.Change; +import dev.vality.fistful.identity.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityHandler.java index 6feab75..35652e6 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.identity; -import com.rbkmoney.fistful.identity.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.identity.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface IdentityHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityLevelChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityLevelChangedHandler.java index a084bca..902ff19 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityLevelChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/identity/IdentityLevelChangedHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.identity; -import com.rbkmoney.fistful.identity.Change; -import com.rbkmoney.fistful.identity.TimestampedChange; +import dev.vality.fistful.identity.Change; +import dev.vality.fistful.identity.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/InvoicingHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/InvoicingHandler.java index 2a9168e..c767c27 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/InvoicingHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/InvoicingHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface InvoicingHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentCreatedHandler.java index 842947d..6719539 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentCreatedHandler.java @@ -1,17 +1,17 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.adjustment; -import com.rbkmoney.damsel.domain.InvoicePaymentAdjustment; -import com.rbkmoney.damsel.domain.InvoicePaymentAdjustmentState; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentAdjustmentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.domain.InvoicePaymentAdjustment; +import dev.vality.damsel.domain.InvoicePaymentAdjustmentState; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.AdjustmentDao; import com.rbkmoney.newway.dao.invoicing.iface.CashFlowDao; import com.rbkmoney.newway.dao.invoicing.iface.PaymentDao; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentStatusChangedHandler.java index 21eadca..937d7c6 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/adjustment/InvoicePaymentAdjustmentStatusChangedHandler.java @@ -1,16 +1,16 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.adjustment; -import com.rbkmoney.damsel.domain.InvoicePaymentAdjustmentStatus; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentAdjustmentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.domain.InvoicePaymentAdjustmentStatus; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.AdjustmentDao; import com.rbkmoney.newway.dao.invoicing.iface.CashFlowDao; import com.rbkmoney.newway.domain.enums.AdjustmentCashFlowType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackBodyChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackBodyChangedHandler.java index f4e9c25..76ed05b 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackBodyChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackBodyChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackBodyChanged; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackChange; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackBodyChanged; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.Chargeback; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCashFlowChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCashFlowChangedHandler.java index 2ca6ccf..a34f072 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCashFlowChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCashFlowChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackCashFlowChanged; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackChange; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackCashFlowChanged; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.CashFlowDao; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.domain.enums.PaymentChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCreatedHandler.java index 0589dd7..0f198c0 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackCreatedHandler.java @@ -1,17 +1,17 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback; -import com.rbkmoney.damsel.domain.InvoicePaymentChargeback; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackCreated; +import dev.vality.damsel.domain.InvoicePaymentChargeback; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackCreated; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.dao.invoicing.iface.PaymentDao; import com.rbkmoney.newway.domain.enums.ChargebackCategory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackLevyChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackLevyChangedHandler.java index 05a2139..ef0f9d2 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackLevyChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackLevyChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackLevyChanged; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackLevyChanged; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.Chargeback; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStageChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStageChangedHandler.java index 49cb691..43846bf 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStageChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStageChangedHandler.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackStageChanged; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackStageChanged; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.domain.enums.ChargebackStage; import com.rbkmoney.newway.domain.enums.PaymentChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStatusChangedHandler.java index 4bbb4e9..cca7a72 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/chargeback/InvoicePaymentChargebackStatusChangedHandler.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChargebackStatusChanged; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChargebackStatusChanged; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; import com.rbkmoney.newway.domain.enums.ChargebackStatus; import com.rbkmoney.newway.domain.enums.PaymentChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundCreatedHandler.java index e460f5d..f285b92 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundCreatedHandler.java @@ -1,17 +1,17 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.refund; -import com.rbkmoney.damsel.domain.InvoicePaymentRefund; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentRefundChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentRefundCreated; +import dev.vality.damsel.domain.InvoicePaymentRefund; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentRefundChange; +import dev.vality.damsel.payment_processing.InvoicePaymentRefundCreated; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.CashFlowDao; import com.rbkmoney.newway.dao.invoicing.iface.PaymentDao; import com.rbkmoney.newway.dao.invoicing.iface.RefundDao; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundSessionChangeTransactionBoundHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundSessionChangeTransactionBoundHandler.java index ad042b1..cb2b0b4 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundSessionChangeTransactionBoundHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundSessionChangeTransactionBoundHandler.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.refund; -import com.rbkmoney.damsel.domain.TransactionInfo; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentRefundChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentSessionChange; +import dev.vality.damsel.domain.TransactionInfo; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentRefundChange; +import dev.vality.damsel.payment_processing.InvoicePaymentSessionChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.RefundDao; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.Refund; @@ -59,7 +59,7 @@ public class InvoicePaymentRefundSessionChangeTransactionBoundHandler implements InvoicePaymentSessionChange sessionChange = invoicePaymentRefundChange.getPayload().getInvoicePaymentSessionChange(); - com.rbkmoney.damsel.payment_processing.SessionChangePayload payload = sessionChange.getPayload(); + dev.vality.damsel.payment_processing.SessionChangePayload payload = sessionChange.getPayload(); TransactionInfo transactionInfo = payload.getSessionTransactionBound().getTrx(); refundNew.setSessionPayloadTransactionBoundTrxId(transactionInfo.getId()); refundNew diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundStatusChangedHandler.java index 79beb71..f457f62 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/invoicing/refund/InvoicePaymentRefundStatusChangedHandler.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.handler.event.stock.impl.invoicing.refund; -import com.rbkmoney.damsel.domain.InvoicePaymentRefundStatus; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentRefundChange; +import dev.vality.damsel.domain.InvoicePaymentRefundStatus; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentRefundChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.invoicing.iface.RefundDao; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.enums.RefundStatus; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/AbstractClaimChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/AbstractClaimChangedHandler.java index bd71654..a136e4a 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/AbstractClaimChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/AbstractClaimChangedHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt; -import com.rbkmoney.damsel.payment_processing.ClaimStatus; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ClaimStatus; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/PartyManagementHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/PartyManagementHandler.java index 4d44ca1..2cc9a62 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/PartyManagementHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/PartyManagementHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface PartyManagementHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractAdjustmentCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractAdjustmentCreatedHandler.java index 2ba2758..5f33fdf 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractAdjustmentCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractAdjustmentCreatedHandler.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractAdjustmentDao; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.dao.party.iface.PayoutToolDao; @@ -49,7 +49,7 @@ public class ContractAdjustmentCreatedHandler extends AbstractClaimChangedHandle private void handleEvent(MachineEvent event, Integer changeId, long sequenceId, ClaimEffect claimEffect, Integer claimEffectId) { ContractEffectUnit contractEffectUnit = claimEffect.getContractEffect(); - com.rbkmoney.damsel.domain.ContractAdjustment adjustmentCreated = + dev.vality.damsel.domain.ContractAdjustment adjustmentCreated = contractEffectUnit.getEffect().getAdjustmentCreated(); String contractId = contractEffectUnit.getContractId(); String partyId = event.getSourceId(); @@ -74,7 +74,7 @@ public class ContractAdjustmentCreatedHandler extends AbstractClaimChangedHandle ); } - private void updateContractReference(com.rbkmoney.damsel.domain.ContractAdjustment adjustmentCreated, + private void updateContractReference(dev.vality.damsel.domain.ContractAdjustment adjustmentCreated, Long contractSourceId, Long cntrctId) { List adjustments = new ArrayList<>(contractAdjustmentDao.getByCntrctId(contractSourceId)); adjustments.forEach(a -> { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractContractorIDChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractContractorIDChangedHandler.java index 062b861..56f7b41 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractContractorIDChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractContractorIDChangedHandler.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractCreatedHandler.java index d2b4c69..956d2e5 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractCreatedHandler.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.*; import com.rbkmoney.newway.domain.enums.ContractStatus; import com.rbkmoney.newway.domain.tables.pojos.Contract; @@ -65,7 +65,7 @@ public class ContractCreatedHandler extends AbstractClaimChangedHandler { contract.setContractId(contractId); contract.setPartyId(partyId); - com.rbkmoney.damsel.domain.Contract contractCreated = contractEffectUnit.getEffect().getCreated(); + dev.vality.damsel.domain.Contract contractCreated = contractEffectUnit.getEffect().getCreated(); if (contractCreated.isSetPaymentInstitution()) { contract.setPaymentInstitutionId(contractCreated.getPaymentInstitution().getId()); } @@ -102,7 +102,7 @@ public class ContractCreatedHandler extends AbstractClaimChangedHandler { ); } - private String initContractorId(com.rbkmoney.damsel.domain.Contract contractCreated) { + private String initContractorId(dev.vality.damsel.domain.Contract contractCreated) { String contractorId = ""; if (contractCreated.isSetContractorId()) { contractorId = contractCreated.getContractorId(); @@ -113,7 +113,7 @@ public class ContractCreatedHandler extends AbstractClaimChangedHandler { } private void updateContractReference(MachineEvent event, Integer changeId, long sequenceId, - com.rbkmoney.damsel.domain.Contract contractCreated, + dev.vality.damsel.domain.Contract contractCreated, String contractId, String partyId, String contractorId, Long cntrctId, Integer claimEffectId) { if (contractCreated.isSetContractor()) { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractLegalAgreementBoundHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractLegalAgreementBoundHandler.java index 8085ae5..61d1f4a 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractLegalAgreementBoundHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractLegalAgreementBoundHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.domain.LegalAgreement; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.LegalAgreement; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolCreatedHandler.java index ad437ad..8144de8 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolCreatedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.domain.PayoutTool; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.PayoutTool; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.dao.party.iface.PayoutToolDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolInfoChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolInfoChangedHandler.java index 295cd46..93cb01b 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolInfoChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractPayoutToolInfoChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.PayoutToolInfoChanged; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.PayoutToolInfoChanged; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.dao.party.iface.PayoutToolDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractReportPreferencesChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractReportPreferencesChangedHandler.java index cfb99d0..154df27 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractReportPreferencesChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractReportPreferencesChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.domain.ReportPreferences; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.ReportPreferences; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractStatusChangedHandler.java index 850b8cf..59bb256 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contract/ContractStatusChangedHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contract; -import com.rbkmoney.damsel.domain.ContractStatus; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.domain.ContractStatus; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractDao; import com.rbkmoney.newway.domain.tables.pojos.Contract; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorCreatedHandler.java index 547d8ac..5adacf1 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorCreatedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contractor; -import com.rbkmoney.damsel.domain.PartyContractor; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractorEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.PartyContractor; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractorEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractorDao; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.domain.tables.pojos.Contractor; @@ -48,7 +48,7 @@ public class ContractorCreatedHandler extends AbstractClaimChangedHandler { ClaimEffect claimEffect, Integer claimEffectId) { ContractorEffectUnit contractorEffect = claimEffect.getContractorEffect(); PartyContractor partyContractor = contractorEffect.getEffect().getCreated(); - com.rbkmoney.damsel.domain.Contractor contractorCreated = partyContractor.getContractor(); + dev.vality.damsel.domain.Contractor contractorCreated = partyContractor.getContractor(); String contractorId = contractorEffect.getId(); String partyId = event.getSourceId(); log.info("Start contractor created handling, eventId={}, partyId={}, contractorId={}", diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorIdentificationalLevelChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorIdentificationalLevelChangedHandler.java index 9dfa1dc..6e0438f 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorIdentificationalLevelChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/contractor/ContractorIdentificationalLevelChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.contractor; -import com.rbkmoney.damsel.domain.ContractorIdentificationLevel; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.ContractorEffectUnit; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.ContractorIdentificationLevel; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.ContractorEffectUnit; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ContractorDao; import com.rbkmoney.newway.domain.tables.pojos.Contractor; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyBlockingHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyBlockingHandler.java index 95ac264..5de2223 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyBlockingHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyBlockingHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party; -import com.rbkmoney.damsel.domain.Blocking; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.domain.Blocking; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.domain.tables.pojos.Party; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyCreatedHandler.java index aa68843..0993678 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.PartyCreated; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.PartyCreated; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.domain.enums.Blocking; import com.rbkmoney.newway.domain.enums.Suspension; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyMetaSetHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyMetaSetHandler.java index 2bf1205..f891fd2 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyMetaSetHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyMetaSetHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.PartyMetaSet; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.PartyMetaSet; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.domain.tables.pojos.Party; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyRevisionChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyRevisionChangedHandler.java index 71a47e9..374c111 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyRevisionChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartyRevisionChangedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.PartyRevisionChanged; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.PartyRevisionChanged; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.dao.party.iface.RevisionDao; import com.rbkmoney.newway.domain.tables.pojos.Party; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartySuspensionHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartySuspensionHandler.java index 0a2dff1..96d957e 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartySuspensionHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/party/PartySuspensionHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party; -import com.rbkmoney.damsel.domain.Suspension; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.domain.Suspension; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.domain.tables.pojos.Party; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopAccountCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopAccountCreatedHandler.java index 8bd1e4c..2829e5e 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopAccountCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopAccountCreatedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.domain.ShopAccount; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.ShopAccount; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopBlockingHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopBlockingHandler.java index 434dcff..6a28203 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopBlockingHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopBlockingHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.domain.Blocking; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.domain.Blocking; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCategoryChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCategoryChangedHandler.java index 5382358..41df859 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCategoryChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCategoryChangedHandler.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopContractChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopContractChangedHandler.java index a95e0a0..5101bfa 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopContractChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopContractChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopContractChanged; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopContractChanged; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCreatedHandler.java index 1439797..6acde2f 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopCreatedHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.domain.Shop; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; +import dev.vality.damsel.domain.Shop; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopEffectUnit; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.AbstractClaimChangedHandler; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopDetailsChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopDetailsChangedHandler.java index 47b56e2..bc3ea0b 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopDetailsChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopDetailsChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.domain.ShopDetails; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.ShopDetails; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopLocationChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopLocationChangedHandler.java index a83316a..d5f200b 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopLocationChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopLocationChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.domain.ShopLocation; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.domain.ShopLocation; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutScheduleChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutScheduleChangedHandler.java index a75db7f..6e1362a 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutScheduleChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutScheduleChangedHandler.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ScheduleChanged; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ScheduleChanged; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutToolChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutToolChangedHandler.java index 1a11df9..47ccd63 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutToolChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopPayoutToolChangedHandler.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.payment_processing.ClaimEffect; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.ShopEffectUnit; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.ClaimEffect; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.ShopEffectUnit; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopSuspensionHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopSuspensionHandler.java index 7283056..d26a0a3 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopSuspensionHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/partymngmnt/shop/ShopSuspensionHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.shop; -import com.rbkmoney.damsel.domain.Suspension; -import com.rbkmoney.damsel.payment_processing.PartyChange; +import dev.vality.damsel.domain.Suspension; +import dev.vality.damsel.payment_processing.PartyChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.party.iface.ShopDao; import com.rbkmoney.newway.domain.tables.pojos.Shop; import com.rbkmoney.newway.factory.claim.effect.ClaimEffectCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutCreatedHandler.java index f2a6727..99e0983 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutCreatedHandler.java @@ -9,8 +9,8 @@ import com.rbkmoney.geck.filter.rule.PathConditionRule; import com.rbkmoney.newway.dao.payout.iface.PayoutDao; import com.rbkmoney.newway.domain.enums.PayoutStatus; import com.rbkmoney.newway.domain.tables.pojos.Payout; -import com.rbkmoney.payout.manager.Event; -import com.rbkmoney.payout.manager.PayoutChange; +import dev.vality.payout.manager.Event; +import dev.vality.payout.manager.PayoutChange; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutHandler.java index 785ae9c..86cb357 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutHandler.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.handler.event.stock.impl.payout; import com.rbkmoney.newway.handler.event.stock.Handler; -import com.rbkmoney.payout.manager.Event; -import com.rbkmoney.payout.manager.PayoutChange; +import dev.vality.payout.manager.Event; +import dev.vality.payout.manager.PayoutChange; public interface PayoutHandler extends Handler { } diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutStatusChangedHandler.java index 4c54257..bb6f233 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/payout/PayoutStatusChangedHandler.java @@ -8,7 +8,7 @@ import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; import com.rbkmoney.newway.dao.payout.iface.PayoutDao; import com.rbkmoney.newway.domain.tables.pojos.Payout; -import com.rbkmoney.payout.manager.*; +import dev.vality.payout.manager.*; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateCreatedHandler.java index 88870ac..45596c3 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateCreatedHandler.java @@ -5,7 +5,7 @@ import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.rate.iface.RateDao; import com.rbkmoney.newway.domain.tables.pojos.Rate; import com.rbkmoney.xrates.base.Rational; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateHandler.java index 2432161..7958f68 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/rate/RateHandler.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.event.stock.impl.rate; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; import com.rbkmoney.xrates.rate.Change; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHandler.java index d7cea8f..7821511 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface RecurrentPaymentToolHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAbandonedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAbandonedHandler.java index f283fd3..cf478de 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAbandonedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAbandonedHandler.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.enums.RecurrentPaymentToolStatus; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAcquiredHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAcquiredHandler.java index c50dd62..efd39bf 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAcquiredHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasAcquiredHandler.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.enums.RecurrentPaymentToolStatus; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasCreatedHandler.java index b9ee8d5..0d1a280 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasCreatedHandler.java @@ -1,19 +1,19 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.domain.BankCard; -import com.rbkmoney.damsel.domain.DigitalWallet; -import com.rbkmoney.damsel.domain.DisposablePaymentResource; -import com.rbkmoney.damsel.domain.PaymentTool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolHasCreated; +import dev.vality.damsel.domain.BankCard; +import dev.vality.damsel.domain.DigitalWallet; +import dev.vality.damsel.domain.DisposablePaymentResource; +import dev.vality.damsel.domain.PaymentTool; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolHasCreated; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.mamsel.*; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.mamsel.*; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.enums.MobileOperatorType; import com.rbkmoney.newway.domain.enums.PaymentToolType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasFailedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasFailedHandler.java index a650168..72e9425 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasFailedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolHasFailedHandler.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.enums.RecurrentPaymentToolStatus; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRiskScoreChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRiskScoreChangedHandler.java index c0056a0..1200fdc 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRiskScoreChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRiskScoreChangedHandler.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRouteChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRouteChangedHandler.java index 4fb3c93..6d18378 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRouteChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolRouteChangedHandler.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolSessionChangedTransactionBoundHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolSessionChangedTransactionBoundHandler.java index 61cd1a9..fbacc21 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolSessionChangedTransactionBoundHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/recurrent/payment/tool/RecurrentPaymentToolSessionChangedTransactionBoundHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool; -import com.rbkmoney.damsel.domain.TransactionInfo; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolChange; +import dev.vality.damsel.domain.TransactionInfo; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.recurrent.payment.tool.iface.RecurrentPaymentToolDao; import com.rbkmoney.newway.domain.tables.pojos.RecurrentPaymentTool; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceAccountCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceAccountCreatedHandler.java index cc2782c..aa09766 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceAccountCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceAccountCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.source; -import com.rbkmoney.fistful.account.Account; -import com.rbkmoney.fistful.source.Change; -import com.rbkmoney.fistful.source.TimestampedChange; +import dev.vality.fistful.account.Account; +import dev.vality.fistful.source.Change; +import dev.vality.fistful.source.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.dao.source.iface.SourceDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceCreatedHandler.java index d6a17a4..00c1fe8 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceCreatedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.source; -import com.rbkmoney.fistful.source.Change; -import com.rbkmoney.fistful.source.Internal; -import com.rbkmoney.fistful.source.Resource; -import com.rbkmoney.fistful.source.TimestampedChange; +import dev.vality.fistful.source.Change; +import dev.vality.fistful.source.Internal; +import dev.vality.fistful.source.Resource; +import dev.vality.fistful.source.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.source.iface.SourceDao; import com.rbkmoney.newway.domain.enums.SourceStatus; import com.rbkmoney.newway.domain.tables.pojos.Source; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceHandler.java index b22fbdf..78aeb74 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.source; -import com.rbkmoney.fistful.source.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.source.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface SourceHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceStatusChangedHandler.java index ceb4f8d..6bad39c 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/source/SourceStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.source; -import com.rbkmoney.fistful.source.Change; -import com.rbkmoney.fistful.source.Status; -import com.rbkmoney.fistful.source.TimestampedChange; +import dev.vality.fistful.source.Change; +import dev.vality.fistful.source.Status; +import dev.vality.fistful.source.TimestampedChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.source.iface.SourceDao; import com.rbkmoney.newway.domain.enums.SourceStatus; import com.rbkmoney.newway.domain.tables.pojos.Source; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletAccountCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletAccountCreatedHandler.java index 8c5c626..7530078 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletAccountCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletAccountCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.wallet; -import com.rbkmoney.fistful.account.Account; -import com.rbkmoney.fistful.wallet.Change; -import com.rbkmoney.fistful.wallet.TimestampedChange; +import dev.vality.fistful.account.Account; +import dev.vality.fistful.wallet.Change; +import dev.vality.fistful.wallet.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.identity.iface.IdentityDao; import com.rbkmoney.newway.dao.wallet.iface.WalletDao; import com.rbkmoney.newway.domain.tables.pojos.Identity; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletCreatedHandler.java index 92ae1f1..997bb23 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletCreatedHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.wallet; -import com.rbkmoney.fistful.wallet.Change; -import com.rbkmoney.fistful.wallet.TimestampedChange; +import dev.vality.fistful.wallet.Change; +import dev.vality.fistful.wallet.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.wallet.iface.WalletDao; import com.rbkmoney.newway.domain.tables.pojos.Wallet; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletHandler.java index e966775..94398b6 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/wallet/WalletHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.wallet; -import com.rbkmoney.fistful.wallet.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.wallet.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface WalletHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalCreatedHandler.java index e38b895..c4881c5 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal; -import com.rbkmoney.fistful.base.Cash; -import com.rbkmoney.fistful.withdrawal.Change; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; +import dev.vality.fistful.base.Cash; +import dev.vality.fistful.withdrawal.Change; +import dev.vality.fistful.withdrawal.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.iface.WithdrawalDao; import com.rbkmoney.newway.domain.enums.WithdrawalStatus; import com.rbkmoney.newway.domain.tables.pojos.Withdrawal; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalHandler.java index 76124f8..f7bd626 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalHandler.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.withdrawal.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface WithdrawalHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java index 0941935..e032a1b 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalRouteChangeHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal; -import com.rbkmoney.fistful.withdrawal.Change; -import com.rbkmoney.fistful.withdrawal.Route; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; +import dev.vality.fistful.withdrawal.Change; +import dev.vality.fistful.withdrawal.Route; +import dev.vality.fistful.withdrawal.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.dao.withdrawal.iface.WithdrawalDao; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java index 3e819f9..f248fea 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal; -import com.rbkmoney.fistful.withdrawal.Change; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; -import com.rbkmoney.fistful.withdrawal.status.Status; +import dev.vality.fistful.withdrawal.Change; +import dev.vality.fistful.withdrawal.TimestampedChange; +import dev.vality.fistful.withdrawal.status.Status; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.dao.withdrawal.iface.WithdrawalDao; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java index 30b1db2..ea1adb1 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferCreatedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal; -import com.rbkmoney.fistful.cashflow.FinalCashFlowPosting; -import com.rbkmoney.fistful.withdrawal.Change; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; +import dev.vality.fistful.cashflow.FinalCashFlowPosting; +import dev.vality.fistful.withdrawal.Change; +import dev.vality.fistful.withdrawal.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.dao.withdrawal.iface.WithdrawalDao; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java index 76496e2..c932337 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/WithdrawalTransferStatusChangedHandler.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal; -import com.rbkmoney.fistful.transfer.Status; -import com.rbkmoney.fistful.withdrawal.Change; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; +import dev.vality.fistful.transfer.Status; +import dev.vality.fistful.withdrawal.Change; +import dev.vality.fistful.withdrawal.TimestampedChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.iface.FistfulCashFlowDao; import com.rbkmoney.newway.dao.withdrawal.iface.WithdrawalDao; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedHandler.java index 06fbd66..895050d 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedHandler.java @@ -1,17 +1,17 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.fistful.base.*; -import com.rbkmoney.fistful.withdrawal_session.Change; -import com.rbkmoney.fistful.withdrawal_session.Session; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.fistful.withdrawal_session.Withdrawal; +import dev.vality.fistful.base.*; +import dev.vality.fistful.withdrawal_session.Change; +import dev.vality.fistful.withdrawal_session.Session; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.fistful.withdrawal_session.Withdrawal; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.mamsel.PaymentSystemUtil; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.mamsel.PaymentSystemUtil; import com.rbkmoney.newway.dao.withdrawal.session.iface.WithdrawalSessionDao; import com.rbkmoney.newway.domain.enums.BankCardPaymentSystem; import com.rbkmoney.newway.domain.enums.DestinationResourceType; @@ -87,8 +87,8 @@ public class WithdrawalSessionCreatedHandler implements WithdrawalSessionHandler ResourceDigitalWallet resourceDigitalWallet = resource.getDigitalWallet(); DigitalWallet digitalWallet = resourceDigitalWallet.getDigitalWallet(); withdrawalSession.setResourceDigitalWalletId(digitalWallet.getId()); - if (digitalWallet.isSetData()) { - withdrawalSession.setResourceDigitalWalletData(digitalWallet.getData().getSetField().getFieldName()); + if (digitalWallet.isSetPaymentService()) { + withdrawalSession.setResourceDigitalWalletData(digitalWallet.getPaymentService().getId()); } } diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java index e398cc9..1a252de 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionFinishedHandler.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.fistful.withdrawal_session.Change; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; +import dev.vality.fistful.withdrawal_session.Change; +import dev.vality.fistful.withdrawal_session.TimestampedChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.session.iface.WithdrawalSessionDao; import com.rbkmoney.newway.domain.enums.WithdrawalSessionStatus; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionHandler.java index e36232b..282486a 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionHandler.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.Handler; public interface WithdrawalSessionHandler extends Handler { diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java index 880e166..aec28b3 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionNextStateHandler.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.fistful.withdrawal_session.Change; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; +import dev.vality.fistful.withdrawal_session.Change; +import dev.vality.fistful.withdrawal_session.TimestampedChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.session.iface.WithdrawalSessionDao; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java index 58804a8..d7f6449 100644 --- a/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java +++ b/src/main/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionTransactionBoundHandler.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.fistful.base.TransactionInfo; -import com.rbkmoney.fistful.withdrawal_session.Change; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.fistful.withdrawal_session.TransactionBoundChange; +import dev.vality.fistful.base.TransactionInfo; +import dev.vality.fistful.withdrawal_session.Change; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.fistful.withdrawal_session.TransactionBoundChange; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.withdrawal.session.iface.WithdrawalSessionDao; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.factory.MachineEventCopyFactory; diff --git a/src/main/java/com/rbkmoney/newway/listener/DepositKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/DepositKafkaListener.java index b42ffb9..c0d6fd3 100644 --- a/src/main/java/com/rbkmoney/newway/listener/DepositKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/DepositKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.DepositService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/DestinationKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/DestinationKafkaListener.java index 2c30ac3..08f7738 100644 --- a/src/main/java/com/rbkmoney/newway/listener/DestinationKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/DestinationKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.DestinationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/IdentityKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/IdentityKafkaListener.java index de913cd..7579827 100644 --- a/src/main/java/com/rbkmoney/newway/listener/IdentityKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/IdentityKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.IdentityService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/InvoicingKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/InvoicingKafkaListener.java index f0afd5b..eb2c94c 100644 --- a/src/main/java/com/rbkmoney/newway/listener/InvoicingKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/InvoicingKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.InvoicingService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/PartyManagementListener.java b/src/main/java/com/rbkmoney/newway/listener/PartyManagementListener.java index a5318a1..ff59334 100644 --- a/src/main/java/com/rbkmoney/newway/listener/PartyManagementListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/PartyManagementListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.PartyManagementService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/PayoutKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/PayoutKafkaListener.java index 9c12ca5..a7927ed 100644 --- a/src/main/java/com/rbkmoney/newway/listener/PayoutKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/PayoutKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; import com.rbkmoney.newway.service.PayoutService; -import com.rbkmoney.payout.manager.Event; +import dev.vality.payout.manager.Event; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/src/main/java/com/rbkmoney/newway/listener/RateListener.java b/src/main/java/com/rbkmoney/newway/listener/RateListener.java index 7a2233b..12d00cd 100644 --- a/src/main/java/com/rbkmoney/newway/listener/RateListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/RateListener.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.RateService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/RecurrentPaymentToolListener.java b/src/main/java/com/rbkmoney/newway/listener/RecurrentPaymentToolListener.java index ab86406..bf86468 100644 --- a/src/main/java/com/rbkmoney/newway/listener/RecurrentPaymentToolListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/RecurrentPaymentToolListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.RecurrentPaymentToolService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/SourceKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/SourceKafkaListener.java index 01638a2..491f49f 100644 --- a/src/main/java/com/rbkmoney/newway/listener/SourceKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/SourceKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.SourceService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/WalletKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/WalletKafkaListener.java index 35338f5..f84fb19 100644 --- a/src/main/java/com/rbkmoney/newway/listener/WalletKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/WalletKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.WalletService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/WithdrawalKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/WithdrawalKafkaListener.java index b97032d..d96c729 100644 --- a/src/main/java/com/rbkmoney/newway/listener/WithdrawalKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/WithdrawalKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.WithdrawalService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/listener/WithdrawalSessionKafkaListener.java b/src/main/java/com/rbkmoney/newway/listener/WithdrawalSessionKafkaListener.java index 0e3fd29..ddbcb91 100644 --- a/src/main/java/com/rbkmoney/newway/listener/WithdrawalSessionKafkaListener.java +++ b/src/main/java/com/rbkmoney/newway/listener/WithdrawalSessionKafkaListener.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.kafka.common.util.LogUtil; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.util.LogUtil; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.service.WithdrawalSessionService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/newway/mapper/AbstractInvoicingMapper.java b/src/main/java/com/rbkmoney/newway/mapper/AbstractInvoicingMapper.java index 5a0d4bc..4b0c963 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/AbstractInvoicingMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/AbstractInvoicingMapper.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.mapper; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.machinegun.eventsink.MachineEvent; public abstract class AbstractInvoicingMapper implements Mapper { } diff --git a/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceCreatedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceCreatedMapper.java index 543d15f..9833768 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceCreatedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceCreatedMapper.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.mapper.invoice; import com.fasterxml.jackson.databind.JsonNode; -import com.rbkmoney.damsel.domain.Invoice; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.domain.Invoice; +import dev.vality.damsel.payment_processing.InvoiceChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.enums.InvoiceStatus; import com.rbkmoney.newway.domain.tables.pojos.InvoiceCart; import com.rbkmoney.newway.exception.DaoException; diff --git a/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceStatusChangedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceStatusChangedMapper.java index d42d5ea..e8d6063 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceStatusChangedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/invoice/InvoiceStatusChangedMapper.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.mapper.invoice; -import com.rbkmoney.damsel.domain.InvoiceStatus; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.domain.InvoiceStatus; +import dev.vality.damsel.payment_processing.InvoiceChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Invoice; import com.rbkmoney.newway.exception.DaoException; import com.rbkmoney.newway.handler.event.stock.LocalStorage; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCaptureStartedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCaptureStartedMapper.java index 6798eed..87913a7 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCaptureStartedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCaptureStartedMapper.java @@ -1,11 +1,11 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.payment_processing.*; +import dev.vality.damsel.payment_processing.*; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.handler.event.stock.LocalStorage; import com.rbkmoney.newway.model.PaymentWrapper; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCashFlowChangedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCashFlowChangedMapper.java index 120b93e..f454f35 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCashFlowChangedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCashFlowChangedMapper.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.domain.FinalCashFlowPosting; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.domain.FinalCashFlowPosting; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.CashFlow; import com.rbkmoney.newway.domain.tables.pojos.Payment; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCreatedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCreatedMapper.java index 4417062..95d6d2c 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCreatedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentCreatedMapper.java @@ -1,16 +1,16 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.domain.*; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentStarted; +import dev.vality.damsel.domain.*; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentStarted; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.mamsel.*; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.mamsel.*; import com.rbkmoney.newway.domain.enums.*; import com.rbkmoney.newway.domain.tables.pojos.CashFlow; import com.rbkmoney.newway.domain.tables.pojos.Invoice; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRecTokenAcquiredMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRecTokenAcquiredMapper.java index f605377..e8b21c6 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRecTokenAcquiredMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRecTokenAcquiredMapper.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.handler.event.stock.LocalStorage; import com.rbkmoney.newway.model.PaymentWrapper; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRiskScoreChangedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRiskScoreChangedMapper.java index e9761cc..0648b62 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRiskScoreChangedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRiskScoreChangedMapper.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.domain.RiskScore; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.domain.RiskScore; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.handler.event.stock.LocalStorage; import com.rbkmoney.newway.model.PaymentWrapper; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRouteChangedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRouteChangedMapper.java index b7a16ab..e753831 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRouteChangedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentRouteChangedMapper.java @@ -1,13 +1,13 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.domain.PaymentRoute; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.domain.PaymentRoute; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.handler.event.stock.LocalStorage; import com.rbkmoney.newway.model.PaymentWrapper; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentSessionChangeTransactionBoundMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentSessionChangeTransactionBoundMapper.java index b4f52b4..40ff1a8 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentSessionChangeTransactionBoundMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentSessionChangeTransactionBoundMapper.java @@ -1,16 +1,16 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.domain.AdditionalTransactionInfo; -import com.rbkmoney.damsel.domain.TransactionInfo; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentChange; -import com.rbkmoney.damsel.payment_processing.InvoicePaymentSessionChange; -import com.rbkmoney.damsel.payment_processing.SessionChangePayload; +import dev.vality.damsel.domain.AdditionalTransactionInfo; +import dev.vality.damsel.domain.TransactionInfo; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoicePaymentChange; +import dev.vality.damsel.payment_processing.InvoicePaymentSessionChange; +import dev.vality.damsel.payment_processing.SessionChangePayload; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.handler.event.stock.LocalStorage; import com.rbkmoney.newway.model.PaymentWrapper; diff --git a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentStatusChangedMapper.java b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentStatusChangedMapper.java index e502396..4511e14 100644 --- a/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentStatusChangedMapper.java +++ b/src/main/java/com/rbkmoney/newway/mapper/payment/InvoicePaymentStatusChangedMapper.java @@ -1,14 +1,14 @@ package com.rbkmoney.newway.mapper.payment; -import com.rbkmoney.damsel.domain.InvoicePaymentCaptured; -import com.rbkmoney.damsel.domain.InvoicePaymentStatus; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.domain.InvoicePaymentCaptured; +import dev.vality.damsel.domain.InvoicePaymentStatus; +import dev.vality.damsel.payment_processing.InvoiceChange; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.filter.Filter; import com.rbkmoney.geck.filter.PathConditionFilter; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.PathConditionRule; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.domain.enums.PaymentStatus; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.handler.event.stock.LocalStorage; diff --git a/src/main/java/com/rbkmoney/newway/serde/DepositChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/DepositChangeMachineEventParser.java index e6a5b20..ad56e6f 100644 --- a/src/main/java/com/rbkmoney/newway/serde/DepositChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/DepositChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/DestinationChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/DestinationChangeMachineEventParser.java index 6ad3f75..880d53d 100644 --- a/src/main/java/com/rbkmoney/newway/serde/DestinationChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/DestinationChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.destination.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.destination.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/IdentityChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/IdentityChangeMachineEventParser.java index d3c4292..3e60f3c 100644 --- a/src/main/java/com/rbkmoney/newway/serde/IdentityChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/IdentityChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.identity.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.identity.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/PayoutEventDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/PayoutEventDeserializer.java index 969ce2f..553f707 100644 --- a/src/main/java/com/rbkmoney/newway/serde/PayoutEventDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/PayoutEventDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; -import com.rbkmoney.payout.manager.Event; +import dev.vality.kafka.common.serialization.AbstractThriftDeserializer; +import dev.vality.payout.manager.Event; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.serialization.Deserializer; import org.apache.thrift.TDeserializer; diff --git a/src/main/java/com/rbkmoney/newway/serde/RateMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/RateMachineEventParser.java index 550e2e9..af60af9 100644 --- a/src/main/java/com/rbkmoney/newway/serde/RateMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/RateMachineEventParser.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import com.rbkmoney.xrates.rate.Change; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/newway/serde/SinkEventDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/SinkEventDeserializer.java index 519b116..dbd2da0 100644 --- a/src/main/java/com/rbkmoney/newway/serde/SinkEventDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/SinkEventDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.serialization.AbstractThriftDeserializer; +import dev.vality.machinegun.eventsink.SinkEvent; public class SinkEventDeserializer extends AbstractThriftDeserializer { diff --git a/src/main/java/com/rbkmoney/newway/serde/SourceChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/SourceChangeMachineEventParser.java index 29237ff..c89b7b2 100644 --- a/src/main/java/com/rbkmoney/newway/serde/SourceChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/SourceChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.source.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.source.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/WalletChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/WalletChangeMachineEventParser.java index e3c91aa..c893e37 100644 --- a/src/main/java/com/rbkmoney/newway/serde/WalletChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/WalletChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.wallet.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.wallet.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/WithdrawalChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/WithdrawalChangeMachineEventParser.java index c87c0c9..4dcd83c 100644 --- a/src/main/java/com/rbkmoney/newway/serde/WithdrawalChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/WithdrawalChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.withdrawal.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/WithdrawalSessionChangeMachineEventParser.java b/src/main/java/com/rbkmoney/newway/serde/WithdrawalSessionChangeMachineEventParser.java index a97a859..e661ca4 100644 --- a/src/main/java/com/rbkmoney/newway/serde/WithdrawalSessionChangeMachineEventParser.java +++ b/src/main/java/com/rbkmoney/newway/serde/WithdrawalSessionChangeMachineEventParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.serde; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; -import com.rbkmoney.sink.common.serialization.BinaryDeserializer; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.serialization.BinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/DepositChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/DepositChangeDeserializer.java index 8c01853..e079133 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/DepositChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/DepositChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/DestinationChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/DestinationChangeDeserializer.java index ab4f174..b00b5f8 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/DestinationChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/DestinationChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.destination.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.destination.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/IdentityChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/IdentityChangeDeserializer.java index 3aec566..a4372c8 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/IdentityChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/IdentityChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.identity.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.identity.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/SourceSessionChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/SourceSessionChangeDeserializer.java index 15293af..28ecd00 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/SourceSessionChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/SourceSessionChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.source.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.source.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/WalletChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/WalletChangeDeserializer.java index f9f521e..5d197c2 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/WalletChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/WalletChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.wallet.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.wallet.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalChangeDeserializer.java index cb69e52..c31e448 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.withdrawal.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalSessionChangeDeserializer.java b/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalSessionChangeDeserializer.java index 2e48e90..d99e329 100644 --- a/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalSessionChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/newway/serde/deserializer/WithdrawalSessionChangeDeserializer.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.serde.deserializer; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.sink.common.serialization.impl.AbstractThriftBinaryDeserializer; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/rbkmoney/newway/service/DepositService.java b/src/main/java/com/rbkmoney/newway/service/DepositService.java index f6bd440..4945cfb 100644 --- a/src/main/java/com/rbkmoney/newway/service/DepositService.java +++ b/src/main/java/com/rbkmoney/newway/service/DepositService.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.deposit.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.deposit.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.deposit.DepositHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/DestinationService.java b/src/main/java/com/rbkmoney/newway/service/DestinationService.java index 02259c3..631c662 100644 --- a/src/main/java/com/rbkmoney/newway/service/DestinationService.java +++ b/src/main/java/com/rbkmoney/newway/service/DestinationService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.destination.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.destination.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.destination.DestinationHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/DominantService.java b/src/main/java/com/rbkmoney/newway/service/DominantService.java index f2ad465..66401e2 100644 --- a/src/main/java/com/rbkmoney/newway/service/DominantService.java +++ b/src/main/java/com/rbkmoney/newway/service/DominantService.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.domain_config.Commit; -import com.rbkmoney.damsel.domain_config.Operation; +import dev.vality.damsel.domain_config.Commit; +import dev.vality.damsel.domain_config.Operation; import com.rbkmoney.newway.dao.dominant.iface.DominantDao; import com.rbkmoney.newway.handler.dominant.DominantHandler; import com.rbkmoney.newway.util.JsonUtil; diff --git a/src/main/java/com/rbkmoney/newway/service/IdentityService.java b/src/main/java/com/rbkmoney/newway/service/IdentityService.java index 994ce1e..68b688e 100644 --- a/src/main/java/com/rbkmoney/newway/service/IdentityService.java +++ b/src/main/java/com/rbkmoney/newway/service/IdentityService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.identity.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.identity.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.identity.IdentityHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/InvoicingService.java b/src/main/java/com/rbkmoney/newway/service/InvoicingService.java index 04e2cf2..ce1ca15 100644 --- a/src/main/java/com/rbkmoney/newway/service/InvoicingService.java +++ b/src/main/java/com/rbkmoney/newway/service/InvoicingService.java @@ -1,15 +1,15 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.payment_processing.EventPayload; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.EventPayload; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.LocalStorage; import com.rbkmoney.newway.handler.event.stock.impl.invoicing.InvoicingHandler; import com.rbkmoney.newway.mapper.AbstractInvoicingMapper; import com.rbkmoney.newway.model.InvoiceWrapper; import com.rbkmoney.newway.model.InvoicingKey; import com.rbkmoney.newway.model.PaymentWrapper; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/newway/service/PartyManagementService.java b/src/main/java/com/rbkmoney/newway/service/PartyManagementService.java index 61e4781..8062c89 100644 --- a/src/main/java/com/rbkmoney/newway/service/PartyManagementService.java +++ b/src/main/java/com/rbkmoney/newway/service/PartyManagementService.java @@ -1,10 +1,10 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.PartyEventData; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.PartyEventData; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.PartyManagementHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/PayoutService.java b/src/main/java/com/rbkmoney/newway/service/PayoutService.java index ee4524f..aa204c7 100644 --- a/src/main/java/com/rbkmoney/newway/service/PayoutService.java +++ b/src/main/java/com/rbkmoney/newway/service/PayoutService.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.service; import com.rbkmoney.newway.handler.event.stock.impl.payout.PayoutHandler; -import com.rbkmoney.payout.manager.Event; -import com.rbkmoney.payout.manager.PayoutChange; +import dev.vality.payout.manager.Event; +import dev.vality.payout.manager.PayoutChange; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/newway/service/RateService.java b/src/main/java/com/rbkmoney/newway/service/RateService.java index 91743a4..324658b 100644 --- a/src/main/java/com/rbkmoney/newway/service/RateService.java +++ b/src/main/java/com/rbkmoney/newway/service/RateService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.handler.event.stock.impl.rate.RateHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import com.rbkmoney.xrates.rate.Change; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/newway/service/RecurrentPaymentToolService.java b/src/main/java/com/rbkmoney/newway/service/RecurrentPaymentToolService.java index 8abef59..ecb4282 100644 --- a/src/main/java/com/rbkmoney/newway/service/RecurrentPaymentToolService.java +++ b/src/main/java/com/rbkmoney/newway/service/RecurrentPaymentToolService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.payment_processing.RecurrentPaymentToolEventData; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.RecurrentPaymentToolEventData; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.recurrent.payment.tool.RecurrentPaymentToolHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/SourceService.java b/src/main/java/com/rbkmoney/newway/service/SourceService.java index 34211c9..08c9c1a 100644 --- a/src/main/java/com/rbkmoney/newway/service/SourceService.java +++ b/src/main/java/com/rbkmoney/newway/service/SourceService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.source.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.source.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.source.SourceHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/newway/service/WalletService.java b/src/main/java/com/rbkmoney/newway/service/WalletService.java index 47ce77b..0fe342c 100644 --- a/src/main/java/com/rbkmoney/newway/service/WalletService.java +++ b/src/main/java/com/rbkmoney/newway/service/WalletService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.wallet.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.wallet.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.wallet.WalletHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/WithdrawalService.java b/src/main/java/com/rbkmoney/newway/service/WithdrawalService.java index 577fae5..50f6936 100644 --- a/src/main/java/com/rbkmoney/newway/service/WithdrawalService.java +++ b/src/main/java/com/rbkmoney/newway/service/WithdrawalService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.withdrawal.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.withdrawal.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.withdrawal.WithdrawalHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/service/WithdrawalSessionService.java b/src/main/java/com/rbkmoney/newway/service/WithdrawalSessionService.java index cf937c3..555e441 100644 --- a/src/main/java/com/rbkmoney/newway/service/WithdrawalSessionService.java +++ b/src/main/java/com/rbkmoney/newway/service/WithdrawalSessionService.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session.WithdrawalSessionHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/rbkmoney/newway/util/AdjustmentUtils.java b/src/main/java/com/rbkmoney/newway/util/AdjustmentUtils.java index 9c89259..8646c54 100644 --- a/src/main/java/com/rbkmoney/newway/util/AdjustmentUtils.java +++ b/src/main/java/com/rbkmoney/newway/util/AdjustmentUtils.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.FinalCashFlowPosting; -import com.rbkmoney.damsel.domain.InvoicePaymentAdjustment; +import dev.vality.damsel.domain.FinalCashFlowPosting; +import dev.vality.damsel.domain.InvoicePaymentAdjustment; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/rbkmoney/newway/util/CashFlowType.java b/src/main/java/com/rbkmoney/newway/util/CashFlowType.java index 8a8aa15..69560ad 100644 --- a/src/main/java/com/rbkmoney/newway/util/CashFlowType.java +++ b/src/main/java/com/rbkmoney/newway/util/CashFlowType.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/com/rbkmoney/newway/util/CashFlowUtil.java b/src/main/java/com/rbkmoney/newway/util/CashFlowUtil.java index 0a1f6c4..479284e 100644 --- a/src/main/java/com/rbkmoney/newway/util/CashFlowUtil.java +++ b/src/main/java/com/rbkmoney/newway/util/CashFlowUtil.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.newway.domain.enums.AdjustmentCashFlowType; import com.rbkmoney.newway.domain.enums.CashFlowAccount; @@ -78,27 +78,27 @@ public class CashFlowUtil { .sum(); } - private static boolean isMerchantSettlement(com.rbkmoney.damsel.domain.CashFlowAccount cashFlowAccount) { + private static boolean isMerchantSettlement(dev.vality.damsel.domain.CashFlowAccount cashFlowAccount) { return cashFlowAccount.isSetMerchant() && cashFlowAccount.getMerchant() == MerchantCashFlowAccount.settlement; } - private static boolean isProviderSettlement(com.rbkmoney.damsel.domain.CashFlowAccount cashFlowAccount) { + private static boolean isProviderSettlement(dev.vality.damsel.domain.CashFlowAccount cashFlowAccount) { return cashFlowAccount.isSetProvider() && cashFlowAccount.getProvider() == ProviderCashFlowAccount.settlement; } - private static boolean isSystemSettlement(com.rbkmoney.damsel.domain.CashFlowAccount cashFlowAccount) { + private static boolean isSystemSettlement(dev.vality.damsel.domain.CashFlowAccount cashFlowAccount) { return cashFlowAccount.isSetSystem() && cashFlowAccount.getSystem() == SystemCashFlowAccount.settlement; } - private static boolean isExternalIncome(com.rbkmoney.damsel.domain.CashFlowAccount cashFlowAccount) { + private static boolean isExternalIncome(dev.vality.damsel.domain.CashFlowAccount cashFlowAccount) { return cashFlowAccount.isSetExternal() && cashFlowAccount.getExternal() == ExternalCashFlowAccount.income; } - private static boolean isExternalOutcome(com.rbkmoney.damsel.domain.CashFlowAccount cashFlowAccount) { + private static boolean isExternalOutcome(dev.vality.damsel.domain.CashFlowAccount cashFlowAccount) { return cashFlowAccount.isSetExternal() && cashFlowAccount.getExternal() == ExternalCashFlowAccount.outcome; } diff --git a/src/main/java/com/rbkmoney/newway/util/ContractUtil.java b/src/main/java/com/rbkmoney/newway/util/ContractUtil.java index fb58ef7..49a9f97 100644 --- a/src/main/java/com/rbkmoney/newway/util/ContractUtil.java +++ b/src/main/java/com/rbkmoney/newway/util/ContractUtil.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.newway.domain.enums.PayoutToolInfo; import com.rbkmoney.newway.domain.enums.RepresentativeDocument; @@ -18,7 +18,7 @@ public class ContractUtil { .collect(Collectors.toList()); } - public static ContractAdjustment convertContractAdjustment(com.rbkmoney.damsel.domain.ContractAdjustment ca, + public static ContractAdjustment convertContractAdjustment(dev.vality.damsel.domain.ContractAdjustment ca, long cntrctId) { ContractAdjustment adjustment = new ContractAdjustment(); adjustment.setCntrctId(cntrctId); @@ -43,7 +43,7 @@ public class ContractUtil { String payoutToolId, LocalDateTime createdAt, String currCode, - com.rbkmoney.damsel.domain.PayoutToolInfo payoutToolInfo) { + dev.vality.damsel.domain.PayoutToolInfo payoutToolInfo) { PayoutTool payoutTool = new PayoutTool(); payoutTool.setCntrctId(cntrctId); payoutTool.setPayoutToolId(payoutToolId); @@ -53,13 +53,13 @@ public class ContractUtil { return payoutTool; } - public static PayoutTool convertPayoutTool(com.rbkmoney.damsel.domain.PayoutTool pt, long cntrctId) { + public static PayoutTool convertPayoutTool(dev.vality.damsel.domain.PayoutTool pt, long cntrctId) { return buildPayoutTool(cntrctId, pt.getId(), TypeUtil.stringToLocalDateTime(pt.getCreatedAt()), pt.getCurrency().getSymbolicCode(), pt.getPayoutToolInfo()); } public static void setPayoutToolInfo(PayoutTool payoutTool, - com.rbkmoney.damsel.domain.PayoutToolInfo payoutToolInfoSource) { + dev.vality.damsel.domain.PayoutToolInfo payoutToolInfoSource) { PayoutToolInfo payoutToolInfo = TypeUtil.toEnumField(payoutToolInfoSource.getSetField().getFieldName(), PayoutToolInfo.class); if (payoutToolInfo == null) { @@ -131,7 +131,7 @@ public class ContractUtil { contract.setReportActScheduleId(serviceAcceptanceActPreferences.getSchedule().getId()); contract.setReportActSignerPosition(serviceAcceptanceActPreferences.getSigner().getPosition()); contract.setReportActSignerFullName(serviceAcceptanceActPreferences.getSigner().getFullName()); - com.rbkmoney.damsel.domain.RepresentativeDocument representativeDocument = + dev.vality.damsel.domain.RepresentativeDocument representativeDocument = serviceAcceptanceActPreferences.getSigner().getDocument(); RepresentativeDocument reportActSignerDocument = TypeUtil.toEnumField(representativeDocument.getSetField().getFieldName(), RepresentativeDocument.class); diff --git a/src/main/java/com/rbkmoney/newway/util/ContractorUtil.java b/src/main/java/com/rbkmoney/newway/util/ContractorUtil.java index 9262c4a..67f3269 100644 --- a/src/main/java/com/rbkmoney/newway/util/ContractorUtil.java +++ b/src/main/java/com/rbkmoney/newway/util/ContractorUtil.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.InternationalLegalEntity; -import com.rbkmoney.damsel.domain.RussianLegalEntity; -import com.rbkmoney.damsel.domain.RussianPrivateEntity; +import dev.vality.damsel.domain.InternationalLegalEntity; +import dev.vality.damsel.domain.RussianLegalEntity; +import dev.vality.damsel.domain.RussianPrivateEntity; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.newway.domain.enums.ContractorType; @@ -12,7 +12,7 @@ import com.rbkmoney.newway.domain.tables.pojos.Contractor; public class ContractorUtil { public static Contractor convertContractor(long sequenceId, String eventCreatedAt, String partyId, - com.rbkmoney.damsel.domain.Contractor contractorSource, + dev.vality.damsel.domain.Contractor contractorSource, String contractorId, Integer changeId, Integer claimEffectId) { Contractor contractor = new Contractor(); contractor.setSequenceId((int) sequenceId); diff --git a/src/main/java/com/rbkmoney/newway/util/FistfulCashFlowUtil.java b/src/main/java/com/rbkmoney/newway/util/FistfulCashFlowUtil.java index a046b23..ed6c7b1 100644 --- a/src/main/java/com/rbkmoney/newway/util/FistfulCashFlowUtil.java +++ b/src/main/java/com/rbkmoney/newway/util/FistfulCashFlowUtil.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.fistful.cashflow.FinalCashFlowAccount; -import com.rbkmoney.fistful.cashflow.FinalCashFlowPosting; -import com.rbkmoney.fistful.cashflow.MerchantCashFlowAccount; +import dev.vality.fistful.cashflow.FinalCashFlowAccount; +import dev.vality.fistful.cashflow.FinalCashFlowPosting; +import dev.vality.fistful.cashflow.MerchantCashFlowAccount; import com.rbkmoney.geck.common.util.TBaseUtil; import com.rbkmoney.newway.domain.enums.CashFlowAccount; import com.rbkmoney.newway.domain.enums.FistfulCashFlowChangeType; @@ -51,7 +51,7 @@ public class FistfulCashFlowUtil { } } - public static long getFistfulFee(List postings) { + public static long getFistfulFee(List postings) { return getFistfulAmount( postings, posting -> posting.getSource().getAccountType().isSetWallet() @@ -59,7 +59,7 @@ public class FistfulCashFlowUtil { ); } - public static long getFistfulProviderFee(List postings) { + public static long getFistfulProviderFee(List postings) { return getFistfulAmount( postings, posting -> posting.getSource().getAccountType().isSetSystem() @@ -68,7 +68,7 @@ public class FistfulCashFlowUtil { } public static long getFistfulAmount( - List postings, + List postings, Predicate filter ) { return postings.stream() @@ -91,7 +91,7 @@ public class FistfulCashFlowUtil { .sum(); } - private static boolean isMerchantSettlement(com.rbkmoney.fistful.cashflow.CashFlowAccount cashFlowAccount) { + private static boolean isMerchantSettlement(dev.vality.fistful.cashflow.CashFlowAccount cashFlowAccount) { return cashFlowAccount.isSetMerchant() && cashFlowAccount.getMerchant() == MerchantCashFlowAccount.settlement; } diff --git a/src/main/java/com/rbkmoney/newway/util/PaymentMethodUtils.java b/src/main/java/com/rbkmoney/newway/util/PaymentMethodUtils.java index 9dafbf9..73ab32e 100644 --- a/src/main/java/com/rbkmoney/newway/util/PaymentMethodUtils.java +++ b/src/main/java/com/rbkmoney/newway/util/PaymentMethodUtils.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.*; -import com.rbkmoney.mamsel.PaymentSystemUtil; -import com.rbkmoney.mamsel.TokenProviderUtil; +import dev.vality.damsel.domain.*; +import dev.vality.mamsel.PaymentSystemUtil; +import dev.vality.mamsel.TokenProviderUtil; import java.util.Optional; import java.util.function.Supplier; @@ -15,22 +15,22 @@ public class PaymentMethodUtils { public static Optional getPaymentMethodRefIdByBankCard( Supplier> paymentMethod) { return paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetBankCard) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getBankCard) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetBankCard) + .map(dev.vality.damsel.domain.PaymentMethod::getBankCard) .flatMap(bankCard -> PaymentSystemUtil.getPaymentSystemNameIfPresent( bankCard.getPaymentSystem(), bankCard.getPaymentSystemDeprecated())) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetBankCardDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getBankCardDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetBankCardDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getBankCardDeprecated) .map(Enum::name)) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetEmptyCvvBankCardDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getEmptyCvvBankCardDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetEmptyCvvBankCardDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getEmptyCvvBankCardDeprecated) .map(legacyBankCardPaymentSystem -> EMPTY_CVV + legacyBankCardPaymentSystem.name())) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetTokenizedBankCardDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getTokenizedBankCardDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetTokenizedBankCardDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getTokenizedBankCardDeprecated) .flatMap(PaymentMethodUtils::getTokenizedBankCardId)); } @@ -50,50 +50,50 @@ public class PaymentMethodUtils { } public static Optional getPaymentMethodRefIdByPaymentTerminal( - Supplier> paymentMethod) { + Supplier> paymentMethod) { return paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetPaymentTerminal) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getPaymentTerminal) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetPaymentTerminal) + .map(dev.vality.damsel.domain.PaymentMethod::getPaymentTerminal) .map(PaymentServiceRef::getId) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetPaymentTerminalDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getPaymentTerminalDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetPaymentTerminalDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getPaymentTerminalDeprecated) .map(Enum::name)); } public static Optional getPaymentMethodRefIdByDigitalWallet( - Supplier> paymentMethod) { + Supplier> paymentMethod) { return paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetDigitalWallet) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getDigitalWallet) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetDigitalWallet) + .map(dev.vality.damsel.domain.PaymentMethod::getDigitalWallet) .map(PaymentServiceRef::getId) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetDigitalWalletDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getDigitalWalletDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetDigitalWalletDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getDigitalWalletDeprecated) .map(Enum::name)); } public static Optional getPaymentMethodRefIdByCryptoCurrency( - Supplier> paymentMethod) { + Supplier> paymentMethod) { return paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetCryptoCurrency) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getCryptoCurrency) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetCryptoCurrency) + .map(dev.vality.damsel.domain.PaymentMethod::getCryptoCurrency) .map(CryptoCurrencyRef::getId) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetCryptoCurrencyDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getCryptoCurrencyDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetCryptoCurrencyDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getCryptoCurrencyDeprecated) .map(Enum::name)); } public static Optional getPaymentMethodRefIdByMobile( - Supplier> paymentMethod) { + Supplier> paymentMethod) { return paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetMobile) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getMobile) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetMobile) + .map(dev.vality.damsel.domain.PaymentMethod::getMobile) .map(MobileOperatorRef::getId) .or(() -> paymentMethod.get() - .filter(com.rbkmoney.damsel.domain.PaymentMethod::isSetMobileDeprecated) - .map(com.rbkmoney.damsel.domain.PaymentMethod::getMobileDeprecated) + .filter(dev.vality.damsel.domain.PaymentMethod::isSetMobileDeprecated) + .map(dev.vality.damsel.domain.PaymentMethod::getMobileDeprecated) .map(Enum::name)); } } diff --git a/src/main/java/com/rbkmoney/newway/util/ShopUtil.java b/src/main/java/com/rbkmoney/newway/util/ShopUtil.java index a489ff7..f2edee0 100644 --- a/src/main/java/com/rbkmoney/newway/util/ShopUtil.java +++ b/src/main/java/com/rbkmoney/newway/util/ShopUtil.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.ShopAccount; +import dev.vality.damsel.domain.ShopAccount; public class ShopUtil { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8affdde..181a3a7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -49,7 +49,7 @@ retry-policy: maxAttempts: -1 kafka: - bootstrap-servers: kenny-kafka1.bst1.rbkmoney.net:9092 + bootstrap-servers: localhost:9092 client-id: newway ssl: enabled: false diff --git a/src/test/java/com/rbkmoney/newway/IntegrationTest.java b/src/test/java/com/rbkmoney/newway/IntegrationTest.java index 780a4a4..939831d 100644 --- a/src/test/java/com/rbkmoney/newway/IntegrationTest.java +++ b/src/test/java/com/rbkmoney/newway/IntegrationTest.java @@ -1,17 +1,17 @@ package com.rbkmoney.newway; -import com.rbkmoney.damsel.domain.*; -import com.rbkmoney.damsel.payment_processing.*; +import dev.vality.damsel.domain.*; +import dev.vality.damsel.payment_processing.*; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.msgpack.Value; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.msgpack.Value; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.dao.invoicing.iface.PaymentDao; import com.rbkmoney.newway.domain.enums.PaymentStatus; import com.rbkmoney.newway.domain.tables.pojos.Payment; import com.rbkmoney.newway.service.InvoicingService; import com.rbkmoney.newway.utils.MockUtils; -import com.rbkmoney.sink.common.serialization.impl.PaymentEventPayloadSerializer; +import dev.vality.sink.common.serialization.impl.PaymentEventPayloadSerializer; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/test/java/com/rbkmoney/newway/TestData.java b/src/test/java/com/rbkmoney/newway/TestData.java index 76cacd7..3810486 100644 --- a/src/test/java/com/rbkmoney/newway/TestData.java +++ b/src/test/java/com/rbkmoney/newway/TestData.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway; -import com.rbkmoney.damsel.domain.InvoicePaymentChargeback; -import com.rbkmoney.damsel.domain.*; -import com.rbkmoney.damsel.payment_processing.*; +import dev.vality.damsel.domain.InvoicePaymentChargeback; +import dev.vality.damsel.domain.*; +import dev.vality.damsel.payment_processing.*; import com.rbkmoney.geck.common.util.TypeUtil; import io.github.benas.randombeans.api.EnhancedRandom; import lombok.AccessLevel; diff --git a/src/test/java/com/rbkmoney/newway/dao/DaoUtils.java b/src/test/java/com/rbkmoney/newway/dao/DaoUtils.java index 9eb57f3..a2de830 100644 --- a/src/test/java/com/rbkmoney/newway/dao/DaoUtils.java +++ b/src/test/java/com/rbkmoney/newway/dao/DaoUtils.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.dao; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import com.rbkmoney.newway.domain.enums.CashFlowAccount; import com.rbkmoney.newway.domain.enums.PaymentChangeType; import com.rbkmoney.newway.domain.tables.pojos.CashFlow; diff --git a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/CountryHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/CountryHandlerTest.java index 979021b..c01422e 100644 --- a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/CountryHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/CountryHandlerTest.java @@ -1,8 +1,8 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.CountryObject; -import com.rbkmoney.damsel.domain.DomainObject; -import com.rbkmoney.damsel.domain.TradeBlocRef; +import dev.vality.damsel.domain.CountryObject; +import dev.vality.damsel.domain.DomainObject; +import dev.vality.damsel.domain.TradeBlocRef; import com.rbkmoney.newway.TestData; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.dao.dominant.impl.CountryDaoImpl; diff --git a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRouningRulesHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRouningRulesHandlerTest.java index 4d9c4c6..ae20d01 100644 --- a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRouningRulesHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/PaymentRouningRulesHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import com.rbkmoney.newway.dao.dominant.impl.PaymentRoutingRulesDaoImpl; import com.rbkmoney.newway.domain.tables.pojos.PaymentRoutingRule; import org.junit.Before; diff --git a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandlerTest.java index 2f783a4..96316bf 100644 --- a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/ProviderHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import com.rbkmoney.newway.dao.dominant.impl.ProviderDaoImpl; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/TradeBlocHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/TradeBlocHandlerTest.java index d50049c..ef6afd4 100644 --- a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/TradeBlocHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/TradeBlocHandlerTest.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.DomainObject; -import com.rbkmoney.damsel.domain.TradeBlocObject; +import dev.vality.damsel.domain.DomainObject; +import dev.vality.damsel.domain.TradeBlocObject; import com.rbkmoney.newway.TestData; import com.rbkmoney.newway.dao.dominant.iface.DomainObjectDao; import com.rbkmoney.newway.dao.dominant.impl.TradeBlocDaoImpl; diff --git a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/WithdrawalProviderHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/WithdrawalProviderHandlerTest.java index c778226..762d366 100644 --- a/src/test/java/com/rbkmoney/newway/handler/dominant/impl/WithdrawalProviderHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/dominant/impl/WithdrawalProviderHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.dominant.impl; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import com.rbkmoney.newway.dao.dominant.impl.WithdrawalProviderDaoImpl; import org.junit.Test; import org.mockito.Mock; diff --git a/src/test/java/com/rbkmoney/newway/handler/event/impl/partymngmnt/party/PartyRevisionChangedHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/impl/partymngmnt/party/PartyRevisionChangedHandlerTest.java index d951690..438d1b1 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/impl/partymngmnt/party/PartyRevisionChangedHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/impl/partymngmnt/party/PartyRevisionChangedHandlerTest.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.handler.event.impl.partymngmnt.party; -import com.rbkmoney.damsel.payment_processing.*; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.damsel.payment_processing.*; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.dao.party.iface.*; import com.rbkmoney.newway.domain.tables.pojos.*; import com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party.PartyRevisionChangedHandler; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j; import org.junit.Before; diff --git a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedBankCardHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedBankCardHandlerTest.java index 726d6cf..1549167 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedBankCardHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedBankCardHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.utils.DestinationHandlerTestUtils; @@ -31,9 +31,9 @@ public class DestinationCreatedBankCardHandlerTest extends AbstractAppDaoTests { @Test public void destinationCreatedHandlerTest() { - com.rbkmoney.fistful.base.Resource fistfulResource = new com.rbkmoney.fistful.base.Resource(); + dev.vality.fistful.base.Resource fistfulResource = new dev.vality.fistful.base.Resource(); fistfulResource.setBankCard(DestinationHandlerTestUtils.createResourceBankCard()); - com.rbkmoney.fistful.destination.Destination fistfulDestination + dev.vality.fistful.destination.Destination fistfulDestination = DestinationHandlerTestUtils.createFistfulDestination(fistfulResource); destinationCreatedHandler.handle( diff --git a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedCryptoWalletHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedCryptoWalletHandlerTest.java index b176257..0e5889b 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedCryptoWalletHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedCryptoWalletHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.utils.DestinationHandlerTestUtils; @@ -31,9 +31,9 @@ public class DestinationCreatedCryptoWalletHandlerTest extends AbstractAppDaoTes @Test public void destinationCreatedHandlerTest() { - com.rbkmoney.fistful.base.Resource fistfulResource = new com.rbkmoney.fistful.base.Resource(); + dev.vality.fistful.base.Resource fistfulResource = new dev.vality.fistful.base.Resource(); fistfulResource.setCryptoWallet(DestinationHandlerTestUtils.createResourceCryptoWallet()); - com.rbkmoney.fistful.destination.Destination fistfulDestination + dev.vality.fistful.destination.Destination fistfulDestination = DestinationHandlerTestUtils.createFistfulDestination(fistfulResource); destinationCreatedHandler.handle( diff --git a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedDigitalWalletHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedDigitalWalletHandlerTest.java index 6cafb2b..61f8d5c 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedDigitalWalletHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/destination/DestinationCreatedDigitalWalletHandlerTest.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.handler.event.stock.impl.destination; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.utils.DestinationHandlerTestUtils; @@ -32,9 +32,9 @@ public class DestinationCreatedDigitalWalletHandlerTest extends AbstractAppDaoTe @Test public void destinationCreatedHandlerTest() { - com.rbkmoney.fistful.base.Resource fistfulResource = new com.rbkmoney.fistful.base.Resource(); + dev.vality.fistful.base.Resource fistfulResource = new dev.vality.fistful.base.Resource(); fistfulResource.setDigitalWallet(DestinationHandlerTestUtils.createResourceDigitalWallet()); - com.rbkmoney.fistful.destination.Destination fistfulDestination + dev.vality.fistful.destination.Destination fistfulDestination = DestinationHandlerTestUtils.createFistfulDestination(fistfulResource); destinationCreatedHandler.handle( diff --git a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedBankCardHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedBankCardHandlerTest.java index 77332e0..b3ebd3a 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedBankCardHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedBankCardHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.kafka.AbstractKafkaTest; @@ -33,9 +33,9 @@ public class WithdrawalSessionCreatedBankCardHandlerTest extends AbstractKafkaTe @Test public void bankCardTest() { - com.rbkmoney.fistful.base.Resource resource = new com.rbkmoney.fistful.base.Resource(); + dev.vality.fistful.base.Resource resource = new dev.vality.fistful.base.Resource(); resource.setBankCard(WithdrawalSessionCreatedHandlerUtils.createDestinationResourceBankCard()); - com.rbkmoney.fistful.withdrawal_session.Session session = createSession(resource); + dev.vality.fistful.withdrawal_session.Session session = createSession(resource); withdrawalSessionCreatedHandler.handle( WithdrawalSessionCreatedHandlerUtils.createCreated(session), diff --git a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedCryptoWalletHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedCryptoWalletHandlerTest.java index d1caba5..0cc5583 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedCryptoWalletHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedCryptoWalletHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.kafka.AbstractKafkaTest; @@ -33,9 +33,9 @@ public class WithdrawalSessionCreatedCryptoWalletHandlerTest extends AbstractKaf @Test public void cryptoWalletTest() { - com.rbkmoney.fistful.base.Resource resource = new com.rbkmoney.fistful.base.Resource(); + dev.vality.fistful.base.Resource resource = new dev.vality.fistful.base.Resource(); resource.setCryptoWallet(WithdrawalSessionCreatedHandlerUtils.createDestinationResourceCryptoWallet()); - com.rbkmoney.fistful.withdrawal_session.Session session = createSession(resource); + dev.vality.fistful.withdrawal_session.Session session = createSession(resource); withdrawalSessionCreatedHandler.handle( WithdrawalSessionCreatedHandlerUtils.createCreated(session), diff --git a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedDigitalWalletHandlerTest.java b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedDigitalWalletHandlerTest.java index 189d53a..61bfb62 100644 --- a/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedDigitalWalletHandlerTest.java +++ b/src/test/java/com/rbkmoney/newway/handler/event/stock/impl/withdrawal/session/WithdrawalSessionCreatedDigitalWalletHandlerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.handler.event.stock.impl.withdrawal.session; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.domain.tables.pojos.Destination; import com.rbkmoney.newway.domain.tables.pojos.WithdrawalSession; import com.rbkmoney.newway.kafka.AbstractKafkaTest; @@ -34,9 +34,9 @@ public class WithdrawalSessionCreatedDigitalWalletHandlerTest extends AbstractKa @Test public void digitalWalletTest() { - com.rbkmoney.fistful.base.Resource resource = new com.rbkmoney.fistful.base.Resource(); + dev.vality.fistful.base.Resource resource = new dev.vality.fistful.base.Resource(); resource.setDigitalWallet(WithdrawalSessionCreatedHandlerUtils.createDestinationResourceDigitalWallet()); - com.rbkmoney.fistful.withdrawal_session.Session session = createSession(resource); + dev.vality.fistful.withdrawal_session.Session session = createSession(resource); withdrawalSessionCreatedHandler.handle( WithdrawalSessionCreatedHandlerUtils.createCreated(session), diff --git a/src/test/java/com/rbkmoney/newway/kafka/AbstractKafkaTest.java b/src/test/java/com/rbkmoney/newway/kafka/AbstractKafkaTest.java index 2f01a42..f8d6c64 100644 --- a/src/test/java/com/rbkmoney/newway/kafka/AbstractKafkaTest.java +++ b/src/test/java/com/rbkmoney/newway/kafka/AbstractKafkaTest.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.kafka; import com.rbkmoney.easyway.*; -import com.rbkmoney.kafka.common.serialization.ThriftSerializer; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.kafka.common.serialization.ThriftSerializer; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.NewwayApplication; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.producer.*; @@ -107,7 +107,7 @@ public abstract class AbstractKafkaTest extends AbstractTestUtils { protected MachineEvent createMessage() { MachineEvent message = new MachineEvent(); - com.rbkmoney.machinegun.msgpack.Value data = new com.rbkmoney.machinegun.msgpack.Value(); + dev.vality.machinegun.msgpack.Value data = new dev.vality.machinegun.msgpack.Value(); data.setBin(new byte[0]); message.setCreatedAt(LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)); message.setEventId(1L); diff --git a/src/test/java/com/rbkmoney/newway/kafka/IntegrationListenerTest.java b/src/test/java/com/rbkmoney/newway/kafka/IntegrationListenerTest.java index c4db26f..0178805 100644 --- a/src/test/java/com/rbkmoney/newway/kafka/IntegrationListenerTest.java +++ b/src/test/java/com/rbkmoney/newway/kafka/IntegrationListenerTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.kafka; -import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.mapper.RecordRowMapper; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.domain.tables.*; import com.rbkmoney.newway.domain.tables.pojos.Destination; diff --git a/src/test/java/com/rbkmoney/newway/listener/InvoicingListenerTest.java b/src/test/java/com/rbkmoney/newway/listener/InvoicingListenerTest.java index cb85667..8038b37 100644 --- a/src/test/java/com/rbkmoney/newway/listener/InvoicingListenerTest.java +++ b/src/test/java/com/rbkmoney/newway/listener/InvoicingListenerTest.java @@ -1,19 +1,19 @@ package com.rbkmoney.newway.listener; -import com.rbkmoney.damsel.payment_processing.Event; -import com.rbkmoney.damsel.payment_processing.EventPayload; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; -import com.rbkmoney.damsel.payment_processing.InvoiceCreated; +import dev.vality.damsel.payment_processing.Event; +import dev.vality.damsel.payment_processing.EventPayload; +import dev.vality.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.InvoiceCreated; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.exception.ParseException; import com.rbkmoney.newway.mapper.invoice.InvoiceCreatedMapper; import com.rbkmoney.newway.service.InvoiceBatchService; import com.rbkmoney.newway.service.InvoicingService; import com.rbkmoney.newway.service.PaymentBatchService; import com.rbkmoney.newway.utils.MockUtils; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/rbkmoney/newway/service/InvoicingServiceTest.java b/src/test/java/com/rbkmoney/newway/service/InvoicingServiceTest.java index c7c7451..9330cec 100644 --- a/src/test/java/com/rbkmoney/newway/service/InvoicingServiceTest.java +++ b/src/test/java/com/rbkmoney/newway/service/InvoicingServiceTest.java @@ -1,9 +1,9 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.payment_processing.EventPayload; -import com.rbkmoney.damsel.payment_processing.InvoiceChange; +import dev.vality.damsel.payment_processing.EventPayload; +import dev.vality.damsel.payment_processing.InvoiceChange; import com.rbkmoney.geck.common.util.TypeUtil; -import com.rbkmoney.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.MachineEvent; import com.rbkmoney.newway.TestData; import com.rbkmoney.newway.dao.invoicing.iface.CashFlowDao; import com.rbkmoney.newway.dao.invoicing.iface.ChargebackDao; @@ -16,7 +16,7 @@ import com.rbkmoney.newway.handler.event.stock.impl.invoicing.InvoicingHandler; import com.rbkmoney.newway.handler.event.stock.impl.invoicing.chargeback.*; import com.rbkmoney.newway.mapper.AbstractInvoicingMapper; import com.rbkmoney.newway.model.InvoiceWrapper; -import com.rbkmoney.sink.common.parser.impl.MachineEventParser; +import dev.vality.sink.common.parser.impl.MachineEventParser; import io.github.benas.randombeans.api.EnhancedRandom; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/rbkmoney/newway/service/PartyManagementServiceTest.java b/src/test/java/com/rbkmoney/newway/service/PartyManagementServiceTest.java index 28c3b51..d2ff22f 100644 --- a/src/test/java/com/rbkmoney/newway/service/PartyManagementServiceTest.java +++ b/src/test/java/com/rbkmoney/newway/service/PartyManagementServiceTest.java @@ -1,16 +1,16 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.domain.PartyContactInfo; -import com.rbkmoney.damsel.payment_processing.PartyChange; -import com.rbkmoney.damsel.payment_processing.PartyCreated; -import com.rbkmoney.damsel.payment_processing.PartyEventData; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.msgpack.Value; +import dev.vality.damsel.domain.PartyContactInfo; +import dev.vality.damsel.payment_processing.PartyChange; +import dev.vality.damsel.payment_processing.PartyCreated; +import dev.vality.damsel.payment_processing.PartyEventData; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.msgpack.Value; import com.rbkmoney.newway.config.SerializationConfig; import com.rbkmoney.newway.dao.party.iface.PartyDao; import com.rbkmoney.newway.factory.PartyMachineEventCopyFactoryImpl; import com.rbkmoney.newway.handler.event.stock.impl.partymngmnt.party.PartyCreatedHandler; -import com.rbkmoney.sink.common.serialization.impl.PartyEventDataSerializer; +import dev.vality.sink.common.serialization.impl.PartyEventDataSerializer; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/com/rbkmoney/newway/service/RateServiceTests.java b/src/test/java/com/rbkmoney/newway/service/RateServiceTests.java index aa2da2e..aa1b7db 100644 --- a/src/test/java/com/rbkmoney/newway/service/RateServiceTests.java +++ b/src/test/java/com/rbkmoney/newway/service/RateServiceTests.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.machinegun.eventsink.SinkEvent; +import dev.vality.machinegun.eventsink.SinkEvent; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.domain.tables.pojos.Rate; import com.rbkmoney.newway.utils.RateSinkEventTestUtils; diff --git a/src/test/java/com/rbkmoney/newway/service/RecurrentPaymentToolServiceTest.java b/src/test/java/com/rbkmoney/newway/service/RecurrentPaymentToolServiceTest.java index 7e5a186..e665166 100644 --- a/src/test/java/com/rbkmoney/newway/service/RecurrentPaymentToolServiceTest.java +++ b/src/test/java/com/rbkmoney/newway/service/RecurrentPaymentToolServiceTest.java @@ -1,12 +1,12 @@ package com.rbkmoney.newway.service; -import com.rbkmoney.damsel.domain.*; -import com.rbkmoney.damsel.payment_processing.*; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.msgpack.Value; +import dev.vality.damsel.domain.*; +import dev.vality.damsel.payment_processing.*; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.msgpack.Value; import com.rbkmoney.newway.dao.AbstractAppDaoTests; import com.rbkmoney.newway.domain.enums.PaymentToolType; -import com.rbkmoney.sink.common.serialization.impl.ThriftBinarySerializer; +import dev.vality.sink.common.serialization.impl.ThriftBinarySerializer; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -110,7 +110,7 @@ public class RecurrentPaymentToolServiceTest extends AbstractAppDaoTests { .setIssuerCountry(CountryCode.ABH) .setBankName("bank_name") .setMetadata(Map.of("kek", - com.rbkmoney.damsel.msgpack.Value + dev.vality.damsel.msgpack.Value .b(true))))) .setPaymentSessionId("kek_session_id") .setClientInfo(new ClientInfo() diff --git a/src/test/java/com/rbkmoney/newway/util/AdjustmentUtilsTest.java b/src/test/java/com/rbkmoney/newway/util/AdjustmentUtilsTest.java index ff3d471..931c386 100644 --- a/src/test/java/com/rbkmoney/newway/util/AdjustmentUtilsTest.java +++ b/src/test/java/com/rbkmoney/newway/util/AdjustmentUtilsTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/com/rbkmoney/newway/util/CashFlowUtilTest.java b/src/test/java/com/rbkmoney/newway/util/CashFlowUtilTest.java index d3175be..2a69e82 100644 --- a/src/test/java/com/rbkmoney/newway/util/CashFlowUtilTest.java +++ b/src/test/java/com/rbkmoney/newway/util/CashFlowUtilTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.domain.*; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/rbkmoney/newway/util/ContractorUtilTest.java b/src/test/java/com/rbkmoney/newway/util/ContractorUtilTest.java index 366f8eb..604a508 100644 --- a/src/test/java/com/rbkmoney/newway/util/ContractorUtilTest.java +++ b/src/test/java/com/rbkmoney/newway/util/ContractorUtilTest.java @@ -1,6 +1,6 @@ package com.rbkmoney.newway.util; -import com.rbkmoney.damsel.domain.Contractor; +import dev.vality.damsel.domain.Contractor; import com.rbkmoney.newway.TestData; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/newway/utils/DestinationHandlerTestUtils.java b/src/test/java/com/rbkmoney/newway/utils/DestinationHandlerTestUtils.java index 60936aa..84de27b 100644 --- a/src/test/java/com/rbkmoney/newway/utils/DestinationHandlerTestUtils.java +++ b/src/test/java/com/rbkmoney/newway/utils/DestinationHandlerTestUtils.java @@ -1,23 +1,12 @@ package com.rbkmoney.newway.utils; -import com.rbkmoney.fistful.base.CryptoCurrency; -import com.rbkmoney.fistful.base.CryptoData; -import com.rbkmoney.fistful.base.CryptoDataBitcoin; -import com.rbkmoney.fistful.base.DigitalData; -import com.rbkmoney.fistful.base.DigitalDataWebmoney; -import com.rbkmoney.fistful.base.Resource; -import com.rbkmoney.fistful.base.ResourceBankCard; -import com.rbkmoney.fistful.base.ResourceCryptoWallet; -import com.rbkmoney.fistful.base.ResourceDigitalWallet; -import com.rbkmoney.fistful.destination.Authorized; -import com.rbkmoney.fistful.destination.Change; -import com.rbkmoney.fistful.destination.Destination; -import com.rbkmoney.fistful.destination.Status; -import com.rbkmoney.fistful.destination.StatusChange; -import com.rbkmoney.fistful.destination.TimestampedChange; -import com.rbkmoney.kafka.common.serialization.ThriftSerializer; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.msgpack.Value; +import dev.vality.fistful.base.*; +import dev.vality.fistful.destination.Change; +import dev.vality.fistful.destination.Destination; +import dev.vality.fistful.destination.TimestampedChange; +import dev.vality.kafka.common.serialization.ThriftSerializer; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.msgpack.Value; public class DestinationHandlerTestUtils { @@ -45,23 +34,23 @@ public class DestinationHandlerTestUtils { .setChange(Change.created(destination)); } - public static com.rbkmoney.fistful.base.DigitalWallet createFistfulDigitalWallet() { - com.rbkmoney.fistful.base.DigitalWallet digitalWallet = new com.rbkmoney.fistful.base.DigitalWallet(); + public static DigitalWallet createFistfulDigitalWallet() { + DigitalWallet digitalWallet = new DigitalWallet(); digitalWallet.setId(DIGITAL_WALLET_ID); - digitalWallet.setData(DigitalData.webmoney(new DigitalDataWebmoney())); + digitalWallet.setPaymentService(new PaymentServiceRef("webmoney")); return digitalWallet; } - public static com.rbkmoney.fistful.base.CryptoWallet createFistfulCryptoWallet() { - com.rbkmoney.fistful.base.CryptoWallet cryptoWallet = new com.rbkmoney.fistful.base.CryptoWallet(); + public static CryptoWallet createFistfulCryptoWallet() { + CryptoWallet cryptoWallet = new CryptoWallet(); cryptoWallet.setId(CRYPTO_WALLET_ID); cryptoWallet.setData(CryptoData.bitcoin(new CryptoDataBitcoin())); cryptoWallet.setCurrency(CryptoCurrency.bitcoin); return cryptoWallet; } - public static com.rbkmoney.fistful.base.BankCard createFistfulBankCard() { - com.rbkmoney.fistful.base.BankCard bankCard = new com.rbkmoney.fistful.base.BankCard(); + public static BankCard createFistfulBankCard() { + BankCard bankCard = new BankCard(); bankCard.setToken(CARD_TOKEN_PROVIDER); bankCard.setBin(CARD_BIN); bankCard.setMaskedPan(CARD_MASKED_PAN); diff --git a/src/test/java/com/rbkmoney/newway/utils/MockUtils.java b/src/test/java/com/rbkmoney/newway/utils/MockUtils.java index 717da19..7e2db4a 100644 --- a/src/test/java/com/rbkmoney/newway/utils/MockUtils.java +++ b/src/test/java/com/rbkmoney/newway/utils/MockUtils.java @@ -1,7 +1,7 @@ package com.rbkmoney.newway.utils; -import com.rbkmoney.damsel.base.Content; -import com.rbkmoney.damsel.domain.*; +import dev.vality.damsel.base.Content; +import dev.vality.damsel.domain.*; import com.rbkmoney.geck.common.util.TypeUtil; import java.nio.ByteBuffer; diff --git a/src/test/java/com/rbkmoney/newway/utils/RateSinkEventTestUtils.java b/src/test/java/com/rbkmoney/newway/utils/RateSinkEventTestUtils.java index 758b3ed..0376be9 100644 --- a/src/test/java/com/rbkmoney/newway/utils/RateSinkEventTestUtils.java +++ b/src/test/java/com/rbkmoney/newway/utils/RateSinkEventTestUtils.java @@ -2,9 +2,9 @@ package com.rbkmoney.newway.utils; import com.rbkmoney.easyway.AbstractTestUtils; import com.rbkmoney.geck.serializer.Geck; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.eventsink.SinkEvent; -import com.rbkmoney.machinegun.msgpack.Value; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.eventsink.SinkEvent; +import dev.vality.machinegun.msgpack.Value; import com.rbkmoney.xrates.base.TimestampInterval; import com.rbkmoney.xrates.rate.*; diff --git a/src/test/java/com/rbkmoney/newway/utils/WithdrawalSessionCreatedHandlerUtils.java b/src/test/java/com/rbkmoney/newway/utils/WithdrawalSessionCreatedHandlerUtils.java index b37cf00..69ba1a5 100644 --- a/src/test/java/com/rbkmoney/newway/utils/WithdrawalSessionCreatedHandlerUtils.java +++ b/src/test/java/com/rbkmoney/newway/utils/WithdrawalSessionCreatedHandlerUtils.java @@ -1,21 +1,14 @@ package com.rbkmoney.newway.utils; -import com.rbkmoney.fistful.base.CryptoCurrency; -import com.rbkmoney.fistful.base.CryptoData; -import com.rbkmoney.fistful.base.CryptoDataBitcoin; -import com.rbkmoney.fistful.base.DigitalData; -import com.rbkmoney.fistful.base.DigitalDataWebmoney; -import com.rbkmoney.fistful.base.Resource; -import com.rbkmoney.fistful.base.ResourceBankCard; -import com.rbkmoney.fistful.base.ResourceCryptoWallet; -import com.rbkmoney.fistful.base.ResourceDigitalWallet; -import com.rbkmoney.fistful.withdrawal_session.Change; -import com.rbkmoney.fistful.withdrawal_session.Route; -import com.rbkmoney.fistful.withdrawal_session.TimestampedChange; -import com.rbkmoney.fistful.withdrawal_session.Withdrawal; -import com.rbkmoney.kafka.common.serialization.ThriftSerializer; -import com.rbkmoney.machinegun.eventsink.MachineEvent; -import com.rbkmoney.machinegun.msgpack.Value; +import dev.vality.fistful.base.*; +import dev.vality.fistful.withdrawal_session.Change; +import dev.vality.fistful.withdrawal_session.Route; +import dev.vality.fistful.withdrawal_session.Session; +import dev.vality.fistful.withdrawal_session.TimestampedChange; +import dev.vality.fistful.withdrawal_session.Withdrawal; +import dev.vality.kafka.common.serialization.ThriftSerializer; +import dev.vality.machinegun.eventsink.MachineEvent; +import dev.vality.machinegun.msgpack.Value; public class WithdrawalSessionCreatedHandlerUtils { @@ -33,7 +26,7 @@ public class WithdrawalSessionCreatedHandlerUtils { public static final String CARD_TOKEN_PROVIDER = "cardToken"; public static MachineEvent createCreatedMachineEvent(String id, - com.rbkmoney.fistful.withdrawal_session.Session session) { + Session session) { return new MachineEvent() .setEventId(2L) .setSourceId(id) @@ -42,29 +35,29 @@ public class WithdrawalSessionCreatedHandlerUtils { .setData(Value.bin(new ThriftSerializer<>().serialize("", createCreated(session)))); } - public static TimestampedChange createCreated(com.rbkmoney.fistful.withdrawal_session.Session session) { + public static TimestampedChange createCreated(Session session) { return new TimestampedChange() .setOccuredAt("2021-05-31T06:12:27Z") .setChange(Change.created(session)); } - public static com.rbkmoney.fistful.base.DigitalWallet createFistfulDigitalWallet() { - com.rbkmoney.fistful.base.DigitalWallet digitalWallet = new com.rbkmoney.fistful.base.DigitalWallet(); + public static DigitalWallet createFistfulDigitalWallet() { + DigitalWallet digitalWallet = new DigitalWallet(); digitalWallet.setId(DIGITAL_WALLET_ID); - digitalWallet.setData(DigitalData.webmoney(new DigitalDataWebmoney())); + digitalWallet.setPaymentService(new PaymentServiceRef("webmoney")); return digitalWallet; } - public static com.rbkmoney.fistful.base.CryptoWallet createFistfulCryptoWallet() { - com.rbkmoney.fistful.base.CryptoWallet cryptoWallet = new com.rbkmoney.fistful.base.CryptoWallet(); + public static CryptoWallet createFistfulCryptoWallet() { + CryptoWallet cryptoWallet = new CryptoWallet(); cryptoWallet.setId(CRYPTO_WALLET_ID); cryptoWallet.setData(CryptoData.bitcoin(new CryptoDataBitcoin())); cryptoWallet.setCurrency(CryptoCurrency.bitcoin); return cryptoWallet; } - public static com.rbkmoney.fistful.base.BankCard createFistfulBankCard() { - com.rbkmoney.fistful.base.BankCard bankCard = new com.rbkmoney.fistful.base.BankCard(); + public static BankCard createFistfulBankCard() { + BankCard bankCard = new BankCard(); bankCard.setToken(CARD_TOKEN_PROVIDER); bankCard.setBin(CARD_BIN); bankCard.setMaskedPan(CARD_MASKED_PAN); @@ -89,16 +82,16 @@ public class WithdrawalSessionCreatedHandlerUtils { return resourceBankCard; } - public static com.rbkmoney.fistful.withdrawal_session.Session createSession(Resource resource) { + public static Session createSession(Resource resource) { Withdrawal withdrawal = new Withdrawal(); withdrawal.setId(WITHDRAWAL_ID); withdrawal.setDestinationResource(resource); - com.rbkmoney.fistful.base.Cash cash = new com.rbkmoney.fistful.base.Cash(); + Cash cash = new Cash(); cash.setAmount(11L); - cash.setCurrency(new com.rbkmoney.fistful.base.CurrencyRef("RUB")); + cash.setCurrency(new CurrencyRef("RUB")); withdrawal.setCash(cash); - com.rbkmoney.fistful.withdrawal_session.Session session = new com.rbkmoney.fistful.withdrawal_session.Session(); + Session session = new Session(); session.setId(SESSION_ID); session.setWithdrawal(withdrawal); session.setRoute(createRoute());