From ac47daf2d2bb7862abd69353972a46af678d083a Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Thu, 30 Dec 2021 13:06:28 +0300 Subject: [PATCH 1/9] add actions --- .github/workflows/build.yml | 26 ++++++++++++++++++++ .github/workflows/deploy.yml | 46 ++++++++++++++++++++++++++++++++++++ .gitmodules | 4 ---- Jenkinsfile | 15 ------------ build_utils | 1 - pom.xml | 4 ++-- 6 files changed, 74 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/deploy.yml delete mode 100644 .gitmodules delete mode 100644 Jenkinsfile delete mode 160000 build_utils diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..55d968c8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,26 @@ +name: Build Artifact + +on: + pull_request: + branches: + - '*' + +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + + - name: Checkout GitHub Action Repo + uses: actions/checkout@v2 + with: + repository: valitydev/action-jdk-build + ref: v1.0.17 + path: .github/actions/action-jdk-build + + - name: Run Build Java + uses: ./.github/actions/action-jdk-build + with: + github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}' + github-user: 'strug' \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..47ef39a9 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,46 @@ +name: Deploy Docker Image + +on: + push: + branches: + - 'master' + - 'main' + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-deploy: + runs-on: ubuntu-20.04 + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + + - name: Checkout GitHub Action JDK Build Repo + uses: actions/checkout@v2 + with: + repository: valitydev/action-jdk-build + ref: v1.0.17 + path: .github/actions/action-jdk-build + + - name: Checkout GitHub Action Deploy Docker Repo + uses: actions/checkout@v2 + with: + repository: valitydev/action-deploy-docker + ref: v1.0.13 + path: .github/actions/action-deploy-docker + + - name: Run Build Java + uses: ./.github/actions/action-jdk-build + with: + github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}' + github-user: 'strug' + + - name: Deploy image + uses: ./.github/actions/action-deploy-docker + with: + registry-username: ${{ github.actor }} + registry-access-token: ${{ secrets.GITHUB_TOKEN }} + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ca5a761f..00000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "build_utils"] - path = build_utils - url = git@github.com:rbkmoney/build_utils.git - branch = master diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 9b8c98ef..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,15 +0,0 @@ -#!groovy -build('fraudbusters-management', 'java-maven') { - checkoutRepo() - loadBuildUtils() - - def javaServicePipeline - runStage('load JavaService pipeline') { - javaServicePipeline = load("build_utils/jenkins_lib/pipeJavaServiceInsideDocker.groovy") - } - - def serviceName = env.REPO_NAME - def mvnArgs = '-DjvmArgs="-Xmx256m"' - - javaServicePipeline(serviceName, mvnArgs) -} \ No newline at end of file diff --git a/build_utils b/build_utils deleted file mode 160000 index be44d69f..00000000 --- a/build_utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be44d69fc87b22a0bb82d98d6eae7658d1647f98 diff --git a/pom.xml b/pom.xml index 9170880d..150cb325 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - com.rbkmoney + dev.vality service-parent-pom - 2.0.9 + 1.0.0 fraudbusters-management From f827981ba1959fb478e4bba94c3ea240d19f5ec6 Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Thu, 27 Jan 2022 18:02:10 +0300 Subject: [PATCH 2/9] update to dev.vality + update api --- pom.xml | 32 ++++----- .../management/config/KafkaConfig.java | 6 +- .../management/config/NotificatorConfig.java | 8 +-- .../config/PaymentFraudoConfig.java | 6 +- .../controller/ErrorController.java | 2 +- .../converter/CommandToAuditLogConverter.java | 8 +-- .../CommandToGroupModelConverter.java | 6 +- .../CommandToTemplateModelConverter.java | 2 +- ...onAuditInternalToCommonAuditConverter.java | 8 +-- .../converter/EventToAuditLogConverter.java | 8 +-- .../GroupModelToCommandConverter.java | 8 +-- .../converter/ListRecordToRowConverter.java | 2 +- .../TemplateModelToCommandConverter.java | 6 +- ...tToEmulationRuleApplyRequestConverter.java | 10 +-- .../ChargebackToApiChargebackConverter.java | 12 ++-- ...aSetModelToCheckedDataSetApiConverter.java | 4 +- ...mentModelToCheckedDataSetRowConverter.java | 2 +- ...ToPaymentGroupReferenceModelConverter.java | 4 +- ...mmandToPaymentReferenceModelConverter.java | 4 +- .../DataSetModelToDataSetApiConverter.java | 2 +- ...DataSetRowToTestPaymentModelConverter.java | 2 +- .../DataSetToTestDataSetModelConverter.java | 2 +- ...renceModelToPaymentReferenceConverter.java | 2 +- .../payment/EventToListRecordConverter.java | 4 +- ...audPaymentInfoToFraudPaymentConverter.java | 6 +- .../FraudResultToInspectResultConverter.java | 6 +- .../payment/GroupModelToGroupConverter.java | 8 +-- .../payment/GroupToCommandConverter.java | 12 ++-- ...ultToTestCheckedDataSetModelConverter.java | 4 +- .../payment/PaymentApiToPaymentConverter.java | 24 +++---- ...PaymentCountInfoRequestToRowConverter.java | 6 +- ...GroupReferenceModelToCommandConverter.java | 8 +-- ...ferenceModelToGroupReferenceConverter.java | 6 +- .../PaymentListRecordToRowConverter.java | 8 +-- .../PaymentModelToDataSetRowConverter.java | 2 +- .../PaymentModelToPaymentApiConverter.java | 4 +- ...ymentReferenceModelToCommandConverter.java | 6 +- ...renceModelToPaymentReferenceConverter.java | 2 +- .../payment/PaymentToApiPaymentConverter.java | 8 +-- .../PaymentToTestPaymentModelConverter.java | 17 ++--- .../PriorityModelToPriorityIdConverter.java | 2 +- .../payment/ReferenceToCommandConverter.java | 8 +-- .../payment/RefundToApiRefundConverter.java | 8 +-- .../payment/RowToWbListRecordsConverter.java | 6 +- .../TemplateModelToTemplateConverter.java | 2 +- .../payment/TemplateToCommandConverter.java | 10 +-- ...rsToValidateTemplateResponseConverter.java | 6 +- .../payment/WbListRecordToRowConverter.java | 8 +-- ...stRecordsModelToWbListRecordConverter.java | 4 +- ...ecordsToCountInfoListRequestConverter.java | 6 +- .../WbListRecordsToListRecordConverter.java | 2 +- .../management/dao/audit/CommandAuditDao.java | 2 +- .../dao/audit/CommandAuditDaoImpl.java | 7 +- .../DefaultPaymentReferenceDaoImpl.java | 5 +- .../dataset/DataSetCheckingResultDaoImpl.java | 3 +- .../dao/payment/dataset/DataSetDaoImpl.java | 5 +- .../dao/payment/dataset/PaymentDaoImpl.java | 5 +- .../mapper/CheckedPaymentModelRowMapper.java | 4 +- .../dataset/mapper/DataSetRowMapper.java | 4 +- .../payment/group/GroupReferenceDaoImpl.java | 5 +- .../dao/payment/group/PaymentGroupDao.java | 5 +- .../reference/PaymentReferenceDaoImpl.java | 5 +- .../payment/template/PaymentTemplateDao.java | 5 +- .../dao/payment/wblist/WbListDao.java | 4 +- .../dao/payment/wblist/WbListDaoImpl.java | 9 ++- .../domain/CommandAuditFilterResponse.java | 2 +- .../request/ListRowsInsertRequest.java | 2 +- ...knownPaymentTemplateInReferenceFilter.java | 2 +- .../management/listener/CommandListener.java | 2 +- .../InitiatingEntityEventSinkListener.java | 2 +- .../listener/WbListEventListener.java | 4 +- .../payment/GroupReferenceListener.java | 2 +- .../payment/PaymentGroupListener.java | 2 +- .../payment/PaymentTemplateListener.java | 2 +- .../listener/payment/ReferenceListener.java | 2 +- .../management/resource/AuditResource.java | 11 ++-- .../notificator/NotificationResource.java | 13 ++-- .../converter/ChannelConverter.java | 13 ++-- .../converter/NotificationConverter.java | 14 ++-- .../NotificationTemplateConverter.java | 6 +- .../converter/ValidationConverter.java | 8 +-- .../payment/PaymentDataSetsResource.java | 9 ++- .../payment/PaymentEmulateResource.java | 5 +- .../payment/PaymentGroupsResource.java | 5 +- .../PaymentHistoricalDataResource.java | 12 ++-- .../payment/PaymentLoadDataResource.java | 2 +- .../payment/PaymentsListsResource.java | 11 ++-- .../payment/PaymentsReferenceResource.java | 7 +- .../payment/PaymentsTemplatesResource.java | 13 ++-- .../serializer/CommandChangeDeserializer.java | 2 +- .../serializer/CommandFraudDeserializer.java | 2 +- .../serializer/EventDeserializer.java | 2 +- .../serializer/ReferenceInfoDeserializer.java | 2 +- .../management/service/AuditServiceImpl.java | 8 +-- .../service/ChannelServiceImpl.java | 2 +- .../management/service/CommandSender.java | 2 +- .../service/GreyRottenRuleCleanerService.java | 8 +-- .../service/NotificationServiceImpl.java | 2 +- .../NotificationTemplateServiceImpl.java | 4 +- .../service/TemplateCommandService.java | 2 +- .../service/WbListCommandService.java | 2 +- .../service/iface/AuditService.java | 6 +- .../service/iface/ChannelService.java | 2 +- .../service/iface/NotificationService.java | 2 +- .../iface/NotificationTemplateService.java | 2 +- .../iface/ValidationTemplateService.java | 4 +- .../service/p2p/GroupModelCommandService.java | 2 +- .../payment/PaymentGroupCommandService.java | 10 +-- .../PaymentGroupReferenceCommandService.java | 4 +- .../payment/PaymentLoadDataService.java | 4 +- .../PaymentTemplateReferenceService.java | 2 +- .../payment/PaymentValidationService.java | 6 +- .../PaymentsDefaultReferenceService.java | 2 +- .../service/payment/PaymentsListsService.java | 14 ++-- .../payment/PaymentsReferenceService.java | 4 +- .../payment/PaymentsTemplatesService.java | 12 ++-- .../management/utils/CommandMapper.java | 6 +- .../management/utils/CountInfoApiUtils.java | 10 +-- .../management/utils/CountInfoUtils.java | 8 +-- .../utils/PaymentCountInfoGenerator.java | 10 +-- .../utils/PaymentUnknownTemplateFinder.java | 2 +- .../utils/ReferenceKeyGenerator.java | 2 +- .../management/utils/RowUtilsService.java | 8 +-- .../utils/parser/CsvFraudPaymentParser.java | 2 +- .../parser/CsvPaymentCountInfoParser.java | 6 +- .../management/ExceptionApplicationTest.java | 2 +- .../management/TestObjectFactory.java | 36 +++++----- .../management/config/ConsumerConfig.java | 4 +- .../management/config/KafkaITest.java | 4 +- .../config/PostgresqlJooqITest.java | 2 +- .../EventToAuditLogConverterTest.java | 4 +- .../RowToWbListRecordsConverterTest.java | 7 +- ...ultToTestCheckedDataSetModelConverter.java | 2 +- .../dao/audit/CommandAuditDaoImplTest.java | 6 +- .../PaymentGroupReferenceDaoImplTest.java | 4 +- .../dao/payment/ReferenceDaoImplTest.java | 2 +- .../dao/payment/wblist/WbListDaoImplTest.java | 10 +-- .../management/kafka/DeleteFromListTest.java | 12 ++-- .../management/kafka/InsertInListTest.java | 8 +-- .../kafka/TemplateApplicationTest.java | 12 ++-- .../kafka/WbListApplicationTest.java | 10 +-- ...InitiatingEntityEventSinkListenerTest.java | 4 +- .../resource/PaymentEmulateResourceTest.java | 6 +- .../notificator/NotificationResourceTest.java | 66 +++++++++---------- .../payment/PaymentDataSetsResourceTest.java | 6 +- .../PaymentHistoricalDataResourceTest.java | 4 +- .../PaymentListLoadDataResourceTest.java | 2 +- .../payment/PaymentLoadDataResourceTest.java | 2 +- .../utils/ExternalModelBeanFactory.java | 6 +- .../GreyRottenRuleCleanerServiceTest.java | 6 +- .../service/payment/DataSetModelUtils.java | 2 +- .../payment/PaymentsDataSetServiceTest.java | 4 +- .../utils/CountInfoApiUtilsTest.java | 4 +- .../utils/CsvFraudPaymentParserTest.java | 2 +- .../management/utils/DataSourceBeanUtils.java | 24 +++---- 155 files changed, 485 insertions(+), 504 deletions(-) diff --git a/pom.xml b/pom.xml index 150cb325..aa1e169f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.vality service-parent-pom - 1.0.0 + 1.0.4 fraudbusters-management @@ -30,18 +30,18 @@ postgres postgres af - 1.37-8cd59c1 - 1.97-28a6a95 - 0.0.17 - 1.94-32fef75-server - 1.22-591919c - 1.3.0 + 1.44-5dbd6d4 + 1.102-269908f + 0.2.0 + 1.1-e65b064-server + 1.27-4907168 + 1.3.2 - com.rbkmoney + dev.vality swag-fraudbusters-management ${swag-fraudbusters-management.version} @@ -51,7 +51,7 @@ 1.1.2 - com.rbkmoney.woody + dev.vality.woody woody-thrift @@ -67,7 +67,7 @@ serializer - com.rbkmoney + dev.vality wb-list-proto ${wb.list.proto.version} @@ -80,7 +80,7 @@ db-common-lib - com.rbkmoney + dev.vality fraudbusters-proto ${fraudbusters.proto.version} @@ -90,7 +90,7 @@ ${fraudo.version} - com.rbkmoney + dev.vality fraudbusters-notificator-proto ${fraudbusters.notificator.proto.version} @@ -235,9 +235,9 @@ test - com.rbkmoney + dev.vality testcontainers-annotations - ${testcontainers.annotations.version} + 1.3.2 test @@ -345,7 +345,7 @@ ${db.schema} - com.rbkmoney.fraudbusters.management.domain + dev.vality.fraudbusters.management.domain target/generated-sources/jooq @@ -363,7 +363,7 @@ com.rbkmoney.maven.plugins pg-embedded-plugin - 1.5 + 1.8 ${db.port} ${db.name} diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java b/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java index 918be8ae..0dc81b20 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java @@ -1,12 +1,12 @@ package com.rbkmoney.fraudbusters.management.config; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.ReferenceInfo; -import com.rbkmoney.damsel.wb_list.Event; import com.rbkmoney.fraudbusters.management.serializer.CommandFraudDeserializer; import com.rbkmoney.fraudbusters.management.serializer.EventDeserializer; import com.rbkmoney.fraudbusters.management.serializer.ReferenceInfoDeserializer; import com.rbkmoney.kafka.common.serialization.ThriftSerializer; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.ReferenceInfo; +import dev.vality.damsel.wb_list.Event; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java b/src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java index 028d7915..ef465d59 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.config; -import com.rbkmoney.damsel.fraudbusters_notificator.ChannelServiceSrv; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationServiceSrv; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplateServiceSrv; -import com.rbkmoney.woody.thrift.impl.http.THSpawnClientBuilder; +import dev.vality.damsel.fraudbusters_notificator.ChannelServiceSrv; +import dev.vality.damsel.fraudbusters_notificator.NotificationServiceSrv; +import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateServiceSrv; +import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java b/src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java index 4c2c34d6..76446684 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java @@ -1,14 +1,14 @@ package com.rbkmoney.fraudbusters.management.config; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataServiceSrv; -import com.rbkmoney.damsel.fraudbusters.PaymentServiceSrv; import com.rbkmoney.fraudbusters.management.converter.TemplateModelToCommandConverter; import com.rbkmoney.fraudbusters.management.converter.payment.GroupToCommandConverter; import com.rbkmoney.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToCommandConverter; import com.rbkmoney.fraudbusters.management.service.CommandSender; import com.rbkmoney.fraudbusters.management.service.TemplateCommandService; import com.rbkmoney.fraudbusters.management.service.payment.PaymentGroupCommandService; -import com.rbkmoney.woody.thrift.impl.http.THSpawnClientBuilder; +import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; +import dev.vality.damsel.fraudbusters.PaymentServiceSrv; +import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java b/src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java index 941610d3..36a2cad1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.client.HttpClientErrorException; -import static com.rbkmoney.damsel.fraudbusters_notificator.fraudbusters_notificatorConstants.VALIDATION_ERROR; +import static dev.vality.damsel.fraudbusters_notificator.fraudbusters_notificatorConstants.VALIDATION_ERROR; @Slf4j @ControllerAdvice diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java index 7887a17e..03ebcb09 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java @@ -1,11 +1,11 @@ package com.rbkmoney.fraudbusters.management.converter; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.fraudbusters.management.domain.enums.CommandType; -import com.rbkmoney.fraudbusters.management.domain.enums.ObjectType; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; import com.rbkmoney.geck.common.util.TBaseUtil; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.fraudbusters.management.domain.enums.CommandType; +import dev.vality.fraudbusters.management.domain.enums.ObjectType; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java index 65a9d321..791cdd9e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.Group; -import com.rbkmoney.damsel.fraudbusters.PriorityId; import com.rbkmoney.fraudbusters.management.domain.GroupModel; import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.Group; +import dev.vality.damsel.fraudbusters.PriorityId; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java index 43d5c02a..557a6ba9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java index fa2c139a..4db1212f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.swag.fraudbusters.management.model.CommandAudit; +import dev.vality.swag.fraudbusters.management.model.CommandAudit; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; @@ -9,13 +9,13 @@ @Component public class CommonAuditInternalToCommonAuditConverter implements - Converter, List> { + Converter, List> { @Override public List convert( - List commandAudits) { + List commandAudits) { return commandAudits.stream() - .map(commandAudit -> new com.rbkmoney.swag.fraudbusters.management.model.CommandAudit() + .map(commandAudit -> new dev.vality.swag.fraudbusters.management.model.CommandAudit() .commandType(CommandAudit.CommandTypeEnum.valueOf(commandAudit.getCommandType().name())) .id(commandAudit.getId()) .initiator(commandAudit.getInitiator()) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java index 1fcc7109..28f731c8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.wb_list.Event; -import com.rbkmoney.fraudbusters.management.domain.enums.CommandType; -import com.rbkmoney.fraudbusters.management.domain.enums.ObjectType; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.damsel.wb_list.Event; +import dev.vality.fraudbusters.management.domain.enums.CommandType; +import dev.vality.fraudbusters.management.domain.enums.ObjectType; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java index 86bf7b30..bf934b17 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.damsel.fraudbusters.Group; -import com.rbkmoney.damsel.fraudbusters.PriorityId; import com.rbkmoney.fraudbusters.management.domain.GroupModel; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.damsel.fraudbusters.Group; +import dev.vality.damsel.fraudbusters.PriorityId; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java index 0ce48abe..4dd1246e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.wb_list.Row; import com.rbkmoney.fraudbusters.management.domain.ListRecord; +import dev.vality.damsel.wb_list.Row; import org.mapstruct.Mapper; @Mapper(componentModel = "spring") diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java index 00d4bcf7..58f87b72 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.damsel.fraudbusters.Template; import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.damsel.fraudbusters.Template; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java index 096a4b2f..0b46eae8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.*; -import com.rbkmoney.swag.fraudbusters.management.model.ApplyRuleOnHistoricalDataSetRequest; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.damsel.fraudbusters.*; +import dev.vality.swag.fraudbusters.management.model.ApplyRuleOnHistoricalDataSetRequest; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.AllArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -31,7 +31,7 @@ public EmulationRuleApplyRequest convert(ApplyRuleOnHistoricalDataSetRequest req .setPartyId(reference.getPartyId()) .setShopId(reference.getShopId()) .setTemplateId(EMULATION_TEMPLATE)) - .setTemplate(new com.rbkmoney.damsel.fraudbusters.Template() + .setTemplate(new dev.vality.damsel.fraudbusters.Template() .setId(EMULATION_TEMPLATE) .setTemplate(request.getTemplate().getBytes())) .setRuleSetTimestamp(request.getRuleSetTimestamp() != null @@ -39,7 +39,7 @@ public EmulationRuleApplyRequest convert(ApplyRuleOnHistoricalDataSetRequest req : null)); } else { emulationRule.setTemplateEmulation(new OnlyTemplateEmulation() - .setTemplate(new com.rbkmoney.damsel.fraudbusters.Template() + .setTemplate(new dev.vality.damsel.fraudbusters.Template() .setId(EMULATION_TEMPLATE) .setTemplate(request.getTemplate().getBytes()))); } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java index ba2fdb2a..b662f021 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.Chargeback; -import com.rbkmoney.swag.fraudbusters.management.model.ClientInfo; -import com.rbkmoney.swag.fraudbusters.management.model.MerchantInfo; -import com.rbkmoney.swag.fraudbusters.management.model.ProviderInfo; +import dev.vality.swag.fraudbusters.management.model.Chargeback; +import dev.vality.swag.fraudbusters.management.model.ClientInfo; +import dev.vality.swag.fraudbusters.management.model.MerchantInfo; +import dev.vality.swag.fraudbusters.management.model.ProviderInfo; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; @@ -12,11 +12,11 @@ @Component public class ChargebackToApiChargebackConverter - implements Converter { + implements Converter { @NonNull @Override - public Chargeback convert(com.rbkmoney.damsel.fraudbusters.Chargeback chargeback) { + public Chargeback convert(dev.vality.damsel.fraudbusters.Chargeback chargeback) { var paymentTool = chargeback.getPaymentTool(); var cost = chargeback.getCost(); var referenceInfo = chargeback.getReferenceInfo(); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java index 4939db1b..f7bba508 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.swag.fraudbusters.management.model.CheckedDataSet; -import com.rbkmoney.swag.fraudbusters.management.model.MerchantInfo; +import dev.vality.swag.fraudbusters.management.model.CheckedDataSet; +import dev.vality.swag.fraudbusters.management.model.MerchantInfo; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java index 7a9a7a5c..02056401 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; -import com.rbkmoney.swag.fraudbusters.management.model.CheckedDataSetRow; +import dev.vality.swag.fraudbusters.management.model.CheckedDataSetRow; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java index 299e4244..b8ab8e11 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.GroupReference; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.GroupReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java index 2f012c59..22d4fd2f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.TemplateReference; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.TemplateReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java index 9f9b1f83..6824ef5e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.swag.fraudbusters.management.model.DataSet; +import dev.vality.swag.fraudbusters.management.model.DataSet; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java index 82b4ebd6..f1dfb931 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; import com.rbkmoney.fraudbusters.management.exception.UnknownPaymentException; -import com.rbkmoney.swag.fraudbusters.management.model.DataSetRow; +import dev.vality.swag.fraudbusters.management.model.DataSetRow; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java index c6701c55..61343020 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.swag.fraudbusters.management.model.DataSet; +import dev.vality.swag.fraudbusters.management.model.DataSet; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java index 179e9273..d8db8973 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java index 13c91cde..516eff9c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.wb_list.Event; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.damsel.wb_list.Event; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java index 6488e14b..6af5653e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.swag.fraudbusters.management.model.FraudPayment; +import dev.vality.swag.fraudbusters.management.model.FraudPayment; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -10,13 +10,13 @@ @Component @RequiredArgsConstructor public class FraudPaymentInfoToFraudPaymentConverter - implements Converter { + implements Converter { private final PaymentToApiPaymentConverter paymentInfoToPaymentConverter; @NonNull @Override - public FraudPayment convert(com.rbkmoney.damsel.fraudbusters.FraudPaymentInfo fraudPayment) { + public FraudPayment convert(dev.vality.damsel.fraudbusters.FraudPaymentInfo fraudPayment) { return new FraudPayment() .payment(paymentInfoToPaymentConverter.convert(fraudPayment.getPayment())) .comment(fraudPayment.getComment()) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java index 2866163d..096cd6ec 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.swag.fraudbusters.management.model.InspectResult; +import dev.vality.swag.fraudbusters.management.model.InspectResult; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -10,13 +10,13 @@ @Component @RequiredArgsConstructor public class FraudResultToInspectResultConverter - implements Converter { + implements Converter { private final PaymentToApiPaymentConverter paymentInfoToPaymentConverter; @NonNull @Override - public InspectResult convert(com.rbkmoney.damsel.fraudbusters.HistoricalTransactionCheck transactionCheck) { + public InspectResult convert(dev.vality.damsel.fraudbusters.HistoricalTransactionCheck transactionCheck) { var checkResult = transactionCheck.getCheckResult(); return new InspectResult() .payment(paymentInfoToPaymentConverter.convert(transactionCheck.getTransaction())) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java index 69357432..266369c0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java @@ -2,8 +2,8 @@ import com.rbkmoney.fraudbusters.management.domain.GroupModel; import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.swag.fraudbusters.management.model.Group; -import com.rbkmoney.swag.fraudbusters.management.model.PriorityId; +import dev.vality.swag.fraudbusters.management.model.Group; +import dev.vality.swag.fraudbusters.management.model.PriorityId; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -16,13 +16,13 @@ @Component @RequiredArgsConstructor public class GroupModelToGroupConverter - implements Converter { + implements Converter { private final PriorityModelToPriorityIdConverter priorityModelToPriorityIdConverter; @NonNull @Override - public com.rbkmoney.swag.fraudbusters.management.model.Group convert(GroupModel groupModel) { + public dev.vality.swag.fraudbusters.management.model.Group convert(GroupModel groupModel) { return new Group() .groupId(groupModel.getGroupId()) .priorityTemplates(convertPriorityTemplates(groupModel.getPriorityTemplates())) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java index bc30b22e..3c317a7b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.damsel.fraudbusters.Group; -import com.rbkmoney.damsel.fraudbusters.PriorityId; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.damsel.fraudbusters.Group; +import dev.vality.damsel.fraudbusters.PriorityId; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -15,11 +15,11 @@ @Component @RequiredArgsConstructor public class GroupToCommandConverter - implements Converter { + implements Converter { @NonNull @Override - public Command convert(com.rbkmoney.swag.fraudbusters.management.model.Group groupModel) { + public Command convert(dev.vality.swag.fraudbusters.management.model.Group groupModel) { return new Command() .setCommandBody(CommandBody.group(new Group() .setGroupId(groupModel.getGroupId()) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java index 37a9dd39..908d23d6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataSetCheckResult; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; +import dev.vality.damsel.fraudbusters.HistoricalDataSetCheckResult; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -30,7 +30,7 @@ public CheckedDataSetModel convert(HistoricalDataSetCheckResult historicalDataSe } private CheckedPaymentModel mapToCheckedPaymentModel( - com.rbkmoney.damsel.fraudbusters.HistoricalTransactionCheck historicalTransactionCheck) { + dev.vality.damsel.fraudbusters.HistoricalTransactionCheck historicalTransactionCheck) { return CheckedPaymentModel.builder() .testPaymentId(Long.valueOf(historicalTransactionCheck.getTransaction().getId())) .checkedTemplate(historicalTransactionCheck.getCheckResult().getCheckedTemplate()) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java index c2937987..70c25ccb 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java @@ -1,12 +1,12 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.domain.BankCard; -import com.rbkmoney.damsel.domain.Cash; -import com.rbkmoney.damsel.domain.CurrencyRef; -import com.rbkmoney.damsel.domain.PaymentTool; -import com.rbkmoney.damsel.fraudbusters.Error; -import com.rbkmoney.damsel.fraudbusters.*; -import com.rbkmoney.swag.fraudbusters.management.model.Payment; +import dev.vality.damsel.domain.BankCard; +import dev.vality.damsel.domain.Cash; +import dev.vality.damsel.domain.CurrencyRef; +import dev.vality.damsel.domain.PaymentTool; +import dev.vality.damsel.fraudbusters.Error; +import dev.vality.damsel.fraudbusters.*; +import dev.vality.swag.fraudbusters.management.model.Payment; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; @@ -16,12 +16,12 @@ @Component public class PaymentApiToPaymentConverter - implements Converter { + implements Converter { @NonNull @Override - public com.rbkmoney.damsel.fraudbusters.Payment convert(Payment payment) { - return new com.rbkmoney.damsel.fraudbusters.Payment() + public dev.vality.damsel.fraudbusters.Payment convert(Payment payment) { + return new dev.vality.damsel.fraudbusters.Payment() .setId(payment.getId()) .setClientInfo(createClientInfo(payment)) .setCost(createCash(payment)) @@ -69,7 +69,7 @@ private MerchantInfo createMerchantInfo(Payment payment) { .setPartyId(payment.getMerchantInfo().getPartyId()); } - private Error createError(com.rbkmoney.swag.fraudbusters.management.model.Payment payment) { + private Error createError(dev.vality.swag.fraudbusters.management.model.Payment payment) { return payment.getError() != null ? new Error() .setErrorCode(payment.getError().getErrorCode()) @@ -77,7 +77,7 @@ private Error createError(com.rbkmoney.swag.fraudbusters.management.model.Paymen : null; } - private ClientInfo createClientInfo(com.rbkmoney.swag.fraudbusters.management.model.Payment payment) { + private ClientInfo createClientInfo(dev.vality.swag.fraudbusters.management.model.Payment payment) { return payment.getClientInfo() != null ? new ClientInfo() .setIp(payment.getClientInfo().getIp()) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java index 5d729a69..d5e5b848 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.wb_list.Row; import com.rbkmoney.fraudbusters.management.utils.CountInfoApiUtils; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentCountInfo; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentListRecord; +import dev.vality.damsel.wb_list.Row; +import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; +import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java index cbd8ea01..632d988d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.swag.fraudbusters.management.model.GroupReference; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.swag.fraudbusters.management.model.GroupReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ public class PaymentGroupReferenceModelToCommandConverter implements Converter { + Converter { @Override - public com.rbkmoney.swag.fraudbusters.management.model.GroupReference convert( + public dev.vality.swag.fraudbusters.management.model.GroupReference convert( PaymentGroupReferenceModel groupReferenceModel) { return new GroupReference() .id(groupReferenceModel.getId()) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java index 16edc225..76c88a05 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.wb_list.IdInfo; -import com.rbkmoney.damsel.wb_list.PaymentId; -import com.rbkmoney.damsel.wb_list.Row; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentListRecord; +import dev.vality.damsel.wb_list.IdInfo; +import dev.vality.damsel.wb_list.PaymentId; +import dev.vality.damsel.wb_list.Row; +import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java index bf12e78d..a5f242c6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.swag.fraudbusters.management.model.DataSetRow; +import dev.vality.swag.fraudbusters.management.model.DataSetRow; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java index 0b9e2f43..fd5627a7 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.swag.fraudbusters.management.model.Error; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.swag.fraudbusters.management.model.Error; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java index f9312234..3e7d9095 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.damsel.fraudbusters.TemplateReference; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.damsel.fraudbusters.TemplateReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java index ad98756a..79bac37f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java index 7e171877..3d7d7c4e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.Error; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.swag.fraudbusters.management.model.Error; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -12,11 +12,11 @@ @Component @RequiredArgsConstructor public class PaymentToApiPaymentConverter - implements Converter { + implements Converter { @NonNull @Override - public Payment convert(com.rbkmoney.damsel.fraudbusters.Payment payment) { + public Payment convert(dev.vality.damsel.fraudbusters.Payment payment) { var paymentTool = payment.getPaymentTool(); var bankCard = paymentTool.getBankCard(); var cost = payment.getCost(); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java index 8db56f05..98e6c3ff 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java @@ -6,16 +6,17 @@ import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; -import static com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel.*; +import static com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel.PaymentModelBuilder; +import static com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel.builder; @Component public class PaymentToTestPaymentModelConverter - implements Converter { + implements Converter { @NonNull @Override - public PaymentModel convert(com.rbkmoney.damsel.fraudbusters.Payment payment) { + public PaymentModel convert(dev.vality.damsel.fraudbusters.Payment payment) { PaymentModelBuilder builder = builder(); if (payment.isSetReferenceInfo()) { updateReferenceInfo(builder, payment.getReferenceInfo()); @@ -47,27 +48,27 @@ public PaymentModel convert(com.rbkmoney.damsel.fraudbusters.Payment payment) { .build(); } - private void updateError(PaymentModelBuilder builder, com.rbkmoney.damsel.fraudbusters.Error error) { + private void updateError(PaymentModelBuilder builder, dev.vality.damsel.fraudbusters.Error error) { builder.errorCode(error.getErrorCode()) .errorReason(error.getErrorReason()); } private void updateClientInfo(PaymentModelBuilder builder, - com.rbkmoney.damsel.fraudbusters.ClientInfo clientInfo) { + dev.vality.damsel.fraudbusters.ClientInfo clientInfo) { builder.ip(clientInfo.getIp()) .fingerprint(clientInfo.getFingerprint()) .email(clientInfo.getEmail()); } private void updateProviderInfo(PaymentModelBuilder builder, - com.rbkmoney.damsel.fraudbusters.ProviderInfo providerInfo) { + dev.vality.damsel.fraudbusters.ProviderInfo providerInfo) { builder.terminalId(providerInfo.getTerminalId()) .providerId(providerInfo.getProviderId()) .country(providerInfo.getCountry()); } private void updateBankCardData(PaymentModelBuilder builder, - com.rbkmoney.damsel.domain.BankCard bankCard) { + dev.vality.damsel.domain.BankCard bankCard) { builder.paymentSystem(bankCard.isSetPaymentSystem() ? bankCard.getPaymentSystem().getId() : null) .paymentCountry(bankCard.isSetIssuerCountry() ? bankCard.getIssuerCountry().name() : null) .cardToken(bankCard.getToken()) @@ -76,7 +77,7 @@ private void updateBankCardData(PaymentModelBuilder builder, } private void updateReferenceInfo(PaymentModelBuilder builder, - com.rbkmoney.damsel.fraudbusters.ReferenceInfo referenceInfo) { + dev.vality.damsel.fraudbusters.ReferenceInfo referenceInfo) { builder.partyId(referenceInfo.getMerchantInfo().getPartyId()) .shopId(referenceInfo.getMerchantInfo().getShopId()); } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java index ac6880da..1a078d15 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.swag.fraudbusters.management.model.PriorityId; +import dev.vality.swag.fraudbusters.management.model.PriorityId; import org.mapstruct.Mapper; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java index 609b3073..c0b7ab3c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.damsel.fraudbusters.TemplateReference; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.damsel.fraudbusters.TemplateReference; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java index b2b379ce..64902a33 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.Error; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.swag.fraudbusters.management.model.Error; +import dev.vality.swag.fraudbusters.management.model.*; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; @@ -10,11 +10,11 @@ @Component public class RefundToApiRefundConverter - implements Converter { + implements Converter { @NonNull @Override - public Refund convert(com.rbkmoney.damsel.fraudbusters.Refund refund) { + public Refund convert(dev.vality.damsel.fraudbusters.Refund refund) { var paymentTool = refund.getPaymentTool(); var cost = refund.getCost(); var referenceInfo = refund.getReferenceInfo(); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java index 3eeb33fb..74f820ae 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.wb_list.PaymentId; -import com.rbkmoney.damsel.wb_list.Row; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.utils.RowUtilsService; +import dev.vality.damsel.wb_list.PaymentId; +import dev.vality.damsel.wb_list.Row; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java index 2cf3312c..5591e768 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.swag.fraudbusters.management.model.Template; +import dev.vality.swag.fraudbusters.management.model.Template; import org.mapstruct.Mapper; @Mapper(componentModel = "spring") diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java index fa6e73c3..4d436894 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandBody; -import com.rbkmoney.damsel.fraudbusters.Template; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandBody; +import dev.vality.damsel.fraudbusters.Template; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; @@ -12,11 +12,11 @@ @Component @RequiredArgsConstructor public class TemplateToCommandConverter - implements Converter { + implements Converter { @Override @NonNull - public Command convert(com.rbkmoney.swag.fraudbusters.management.model.Template templateModel) { + public Command convert(dev.vality.swag.fraudbusters.management.model.Template templateModel) { var command = new Command(); var template = new Template(); template.setId(templateModel.getId()); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java index ea526375..63f03b81 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.TemplateValidateError; -import com.rbkmoney.swag.fraudbusters.management.model.ErrorTemplate; -import com.rbkmoney.swag.fraudbusters.management.model.ValidateTemplatesResponse; +import dev.vality.damsel.fraudbusters.TemplateValidateError; +import dev.vality.swag.fraudbusters.management.model.ErrorTemplate; +import dev.vality.swag.fraudbusters.management.model.ValidateTemplatesResponse; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java index a099cf9e..4b50ae34 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.wb_list.IdInfo; -import com.rbkmoney.damsel.wb_list.PaymentId; -import com.rbkmoney.damsel.wb_list.Row; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.damsel.wb_list.IdInfo; +import dev.vality.damsel.wb_list.PaymentId; +import dev.vality.damsel.wb_list.Row; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java index 8086fb8e..de20ee4c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; -import com.rbkmoney.swag.fraudbusters.management.model.WbListRecord; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.swag.fraudbusters.management.model.WbListRecord; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java index 28b98c9f..bfba609f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentCountInfo; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentListRecord; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; +import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java index 7416d0a9..793d9c33 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.ListRecord; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import org.mapstruct.Mapper; @Mapper(componentModel = "spring") diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java index a4f7ad8e..2b721ad5 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.dao.audit; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java index c049b6cc..54786b23 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java @@ -2,20 +2,19 @@ import com.rbkmoney.fraudbusters.management.dao.AbstractDao; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; -import com.rbkmoney.fraudbusters.management.domain.tables.records.CommandAuditRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.fraudbusters.management.domain.tables.records.CommandAuditRecord; import org.jooq.*; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.time.LocalDateTime; import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.CommandAudit.COMMAND_AUDIT; +import static dev.vality.fraudbusters.management.domain.tables.CommandAudit.COMMAND_AUDIT; @Component public class CommandAuditDaoImpl extends AbstractDao implements CommandAuditDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java index 07b9a1ab..54672dee 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java @@ -4,8 +4,8 @@ import com.rbkmoney.fraudbusters.management.dao.DefaultReferenceDao; import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.records.FDefaultRefRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.records.FDefaultRefRecord; import org.jooq.*; import org.jooq.impl.DSL; import org.springframework.jdbc.core.RowMapper; @@ -13,11 +13,10 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.util.List; import java.util.Optional; -import static com.rbkmoney.fraudbusters.management.domain.Tables.F_DEFAULT_REF; +import static dev.vality.fraudbusters.management.domain.Tables.F_DEFAULT_REF; @Component public class DefaultPaymentReferenceDaoImpl extends AbstractDao diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java index 290adf5c..5f1d6b4d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java @@ -15,13 +15,12 @@ import org.springframework.transaction.annotation.Transactional; import javax.sql.DataSource; - import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static com.rbkmoney.fraudbusters.management.domain.Tables.*; +import static dev.vality.fraudbusters.management.domain.Tables.*; import static org.jooq.impl.DSL.select; @Component diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java index 0617f8f5..604b426a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java @@ -3,9 +3,9 @@ import com.rbkmoney.fraudbusters.management.dao.AbstractDao; import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.records.TestDataSetRecord; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.records.TestDataSetRecord; import org.jooq.*; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -13,12 +13,11 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.time.LocalDateTime; import java.util.List; import java.util.Optional; -import static com.rbkmoney.fraudbusters.management.domain.Tables.TEST_DATA_SET; +import static dev.vality.fraudbusters.management.domain.Tables.TEST_DATA_SET; @Component public class DataSetDaoImpl extends AbstractDao implements DataSetDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java index 86bc3f63..894139aa 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java @@ -2,19 +2,18 @@ import com.rbkmoney.fraudbusters.management.dao.AbstractDao; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.fraudbusters.management.domain.tables.records.TestPaymentRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.records.TestPaymentRecord; import org.jooq.DeleteConditionStep; import org.jooq.Query; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; import javax.sql.DataSource; - import java.util.List; import java.util.stream.Collectors; -import static com.rbkmoney.fraudbusters.management.domain.Tables.TEST_PAYMENT; +import static dev.vality.fraudbusters.management.domain.Tables.TEST_PAYMENT; @Component public class PaymentDaoImpl extends AbstractDao implements PaymentDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java index cf3e43f5..5569c894 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.Tables.TEST_PAYMENT; -import static com.rbkmoney.fraudbusters.management.domain.Tables.TEST_PAYMENT_CHECKING_RESULT; +import static dev.vality.fraudbusters.management.domain.Tables.TEST_PAYMENT; +import static dev.vality.fraudbusters.management.domain.Tables.TEST_PAYMENT_CHECKING_RESULT; public class CheckedPaymentModelRowMapper implements RowMapper { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java index 1fb3a63f..75fe2d05 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java @@ -7,8 +7,8 @@ import java.sql.SQLException; import java.time.LocalDateTime; -import static com.rbkmoney.fraudbusters.management.domain.Tables.TEST_DATA_SET; -import static com.rbkmoney.fraudbusters.management.domain.Tables.TEST_DATA_SET_CHECKING_RESULT; +import static dev.vality.fraudbusters.management.domain.Tables.TEST_DATA_SET; +import static dev.vality.fraudbusters.management.domain.Tables.TEST_DATA_SET_CHECKING_RESULT; public class DataSetRowMapper implements RowMapper { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java index b222105e..49c55193 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java @@ -4,8 +4,8 @@ import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.records.FGroupReferenceRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.records.FGroupReferenceRecord; import org.jooq.*; import org.jooq.impl.DSL; import org.springframework.jdbc.core.RowMapper; @@ -13,10 +13,9 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.FGroupReference.F_GROUP_REFERENCE; +import static dev.vality.fraudbusters.management.domain.tables.FGroupReference.F_GROUP_REFERENCE; import static org.jooq.Comparator.EQUALS; @Component diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java index 81f79ca0..8163c410 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java @@ -5,8 +5,8 @@ import com.rbkmoney.fraudbusters.management.dao.payment.group.model.GroupPriorityRow; import com.rbkmoney.fraudbusters.management.domain.GroupModel; import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.fraudbusters.management.domain.tables.records.FGroupRecord; import com.rbkmoney.fraudbusters.management.utils.GroupRowToModelMapper; +import dev.vality.fraudbusters.management.domain.tables.records.FGroupRecord; import org.jooq.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -15,14 +15,13 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.sql.ResultSet; import java.sql.SQLException; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; -import static com.rbkmoney.fraudbusters.management.domain.tables.FGroup.F_GROUP; +import static dev.vality.fraudbusters.management.domain.tables.FGroup.F_GROUP; @Component public class PaymentGroupDao extends AbstractDao implements GroupDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java index 512463dc..2a48c113 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java @@ -4,8 +4,8 @@ import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.records.FReferenceRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.records.FReferenceRecord; import org.jooq.*; import org.jooq.impl.DSL; import org.springframework.jdbc.core.RowMapper; @@ -14,10 +14,9 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.FReference.F_REFERENCE; +import static dev.vality.fraudbusters.management.domain.tables.FReference.F_REFERENCE; import static org.jooq.Comparator.EQUALS; @Component diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java index 4dea8295..08605145 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java @@ -5,8 +5,8 @@ import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; import com.rbkmoney.fraudbusters.management.domain.TemplateModel; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.records.FTemplateRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.tables.records.FTemplateRecord; import org.jooq.*; import org.jooq.impl.DSL; import org.springframework.jdbc.core.RowMapper; @@ -14,10 +14,9 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.FTemplate.F_TEMPLATE; +import static dev.vality.fraudbusters.management.domain.tables.FTemplate.F_TEMPLATE; @Component public class PaymentTemplateDao extends AbstractDao implements TemplateDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java index 40e40368..d6040eda 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.dao.payment.wblist; import com.rbkmoney.fraudbusters.management.dao.CdDao; -import com.rbkmoney.fraudbusters.management.domain.enums.ListType; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.fraudbusters.management.domain.enums.ListType; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import org.springframework.lang.NonNull; import java.time.LocalDateTime; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java index 1bcb2864..45518d81 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java @@ -2,11 +2,11 @@ import com.rbkmoney.fraudbusters.management.dao.AbstractDao; import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; -import com.rbkmoney.fraudbusters.management.domain.enums.ListType; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; -import com.rbkmoney.fraudbusters.management.domain.tables.records.WbListRecordsRecord; import com.rbkmoney.mapper.RecordRowMapper; +import dev.vality.fraudbusters.management.domain.enums.ListType; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.fraudbusters.management.domain.tables.records.WbListRecordsRecord; import lombok.extern.slf4j.Slf4j; import org.jooq.*; import org.jooq.impl.DSL; @@ -16,11 +16,10 @@ import org.springframework.util.StringUtils; import javax.sql.DataSource; - import java.time.LocalDateTime; import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.WbListRecords.WB_LIST_RECORDS; +import static dev.vality.fraudbusters.management.domain.tables.WbListRecords.WB_LIST_RECORDS; import static org.jooq.Comparator.EQUALS; @Slf4j diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java b/src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java index cf71187e..d808d1ab 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.domain; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java b/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java index 4ca3973f..f2916dd9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.domain.payment.request; -import com.rbkmoney.damsel.wb_list.ListType; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; +import dev.vality.damsel.wb_list.ListType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java b/src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java index 8fbb2091..d98e2255 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.filter; import com.rbkmoney.fraudbusters.management.dao.payment.template.PaymentTemplateDao; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java index 6ea79979..25dd35bd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.listener; -import com.rbkmoney.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.Command; import lombok.extern.slf4j.Slf4j; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java index 7aa2494a..f848db42 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.listener; -import com.rbkmoney.damsel.fraudbusters.*; import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; import com.rbkmoney.fraudbusters.management.service.payment.PaymentTemplateReferenceService; +import dev.vality.damsel.fraudbusters.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java index 4a131b36..92a4c8b6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java @@ -1,13 +1,13 @@ package com.rbkmoney.fraudbusters.management.listener; -import com.rbkmoney.damsel.wb_list.Event; import com.rbkmoney.dao.DaoException; import com.rbkmoney.fraudbusters.management.converter.payment.EventToListRecordConverter; import com.rbkmoney.fraudbusters.management.dao.CdDao; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.exception.UnknownEventException; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.damsel.wb_list.Event; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java index ccb4b5e1..6b878868 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.listener.payment; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.converter.payment.CommandToPaymentGroupReferenceModelConverter; import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; import com.rbkmoney.fraudbusters.management.listener.CommandListener; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java index ff6b1ad2..0307a733 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.listener.payment; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.converter.CommandToGroupModelConverter; import com.rbkmoney.fraudbusters.management.dao.GroupDao; import com.rbkmoney.fraudbusters.management.listener.CommandListener; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java index 951d539b..84b7de4b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.listener.payment; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.converter.CommandToTemplateModelConverter; import com.rbkmoney.fraudbusters.management.dao.TemplateDao; import com.rbkmoney.fraudbusters.management.listener.CommandListener; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java index 6b676416..5b9fa23e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java @@ -1,11 +1,11 @@ package com.rbkmoney.fraudbusters.management.listener.payment; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.converter.payment.CommandToPaymentReferenceModelConverter; import com.rbkmoney.fraudbusters.management.dao.ReferenceDao; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; import com.rbkmoney.fraudbusters.management.listener.CommandListener; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java index d7ce02f4..75e03972 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java @@ -1,14 +1,14 @@ package com.rbkmoney.fraudbusters.management.resource; -import com.rbkmoney.damsel.fraudbusters.CommandType; -import com.rbkmoney.fraudbusters.management.domain.enums.ObjectType; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.AuditApi; -import com.rbkmoney.swag.fraudbusters.management.model.FilterLogsResponse; -import com.rbkmoney.swag.fraudbusters.management.model.ListResponse; +import dev.vality.damsel.fraudbusters.CommandType; +import dev.vality.fraudbusters.management.domain.enums.ObjectType; +import dev.vality.swag.fraudbusters.management.api.AuditApi; +import dev.vality.swag.fraudbusters.management.model.FilterLogsResponse; +import dev.vality.swag.fraudbusters.management.model.ListResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -17,7 +17,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java index a5abba7c..bf4801cc 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java @@ -1,7 +1,5 @@ package com.rbkmoney.fraudbusters.management.resource.notificator; -import com.rbkmoney.damsel.fraudbusters_notificator.Filter; -import com.rbkmoney.damsel.fraudbusters_notificator.Page; import com.rbkmoney.fraudbusters.management.resource.notificator.converter.ChannelConverter; import com.rbkmoney.fraudbusters.management.resource.notificator.converter.NotificationConverter; import com.rbkmoney.fraudbusters.management.resource.notificator.converter.NotificationTemplateConverter; @@ -9,8 +7,10 @@ import com.rbkmoney.fraudbusters.management.service.iface.ChannelService; import com.rbkmoney.fraudbusters.management.service.iface.NotificationService; import com.rbkmoney.fraudbusters.management.service.iface.NotificationTemplateService; -import com.rbkmoney.swag.fraudbusters.management.api.NotificationsApi; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.damsel.fraudbusters_notificator.Filter; +import dev.vality.damsel.fraudbusters_notificator.Page; +import dev.vality.swag.fraudbusters.management.api.NotificationsApi; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -88,7 +87,7 @@ public ResponseEntity removeNotification(Long id) { @Override @PreAuthorize("hasAnyRole('fraud-officer')") public ResponseEntity validateNotification( - com.rbkmoney.swag.fraudbusters.management.model.@Valid Notification notification) { + dev.vality.swag.fraudbusters.management.model.@Valid Notification notification) { var validationResponse = notificationService.validate(notificationConverter.toSource(notification)); ValidationResponse response = validationConverter.convert(validationResponse); log.info("NotificationResource validate notification with result {}", response); @@ -99,7 +98,7 @@ public ResponseEntity validateNotification( @PreAuthorize("hasAnyRole('fraud-officer')") public ResponseEntity updateNotificationStatus(Long id, @Valid String notificationStatus) { - var status = com.rbkmoney.damsel.fraudbusters_notificator.NotificationStatus + var status = dev.vality.damsel.fraudbusters_notificator.NotificationStatus .valueOf(notificationStatus); notificationService.updateStatus(id, status); log.info("NotificationResource update notification status: {}", notificationStatus); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java index ccbcdf09..ee7578c9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.resource.notificator.converter; -import com.rbkmoney.damsel.fraudbusters_notificator.ChannelType; -import com.rbkmoney.swag.fraudbusters.management.model.Channel; +import dev.vality.damsel.fraudbusters_notificator.ChannelType; +import dev.vality.swag.fraudbusters.management.model.Channel; import org.springframework.stereotype.Component; import java.time.LocalDateTime; @@ -10,10 +10,10 @@ @Component public class ChannelConverter - implements BiConverter { + implements BiConverter { @Override - public Channel toTarget(com.rbkmoney.damsel.fraudbusters_notificator.Channel channel) { + public Channel toTarget(dev.vality.damsel.fraudbusters_notificator.Channel channel) { if (Objects.isNull(channel)) { return null; } @@ -30,12 +30,11 @@ public Channel toTarget(com.rbkmoney.damsel.fraudbusters_notificator.Channel cha } @Override - public com.rbkmoney.damsel.fraudbusters_notificator.Channel toSource(Channel channel) { + public dev.vality.damsel.fraudbusters_notificator.Channel toSource(Channel channel) { if (Objects.isNull(channel)) { return null; } - com.rbkmoney.damsel.fraudbusters_notificator.Channel result = - new com.rbkmoney.damsel.fraudbusters_notificator.Channel(); + var result = new dev.vality.damsel.fraudbusters_notificator.Channel(); result.setName(channel.getName()); result.setDestination(channel.getDestination()); if (Objects.nonNull(channel.getType())) { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java index 56aa7759..ad17336b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.resource.notificator.converter; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationStatus; -import com.rbkmoney.swag.fraudbusters.management.model.Notification; +import dev.vality.damsel.fraudbusters_notificator.NotificationStatus; +import dev.vality.swag.fraudbusters.management.model.Notification; import org.springframework.stereotype.Component; import java.time.LocalDateTime; @@ -10,10 +10,10 @@ @Component public class NotificationConverter - implements BiConverter { + implements BiConverter { @Override - public Notification toTarget(com.rbkmoney.damsel.fraudbusters_notificator.Notification notification) { + public Notification toTarget(dev.vality.damsel.fraudbusters_notificator.Notification notification) { if (Objects.isNull(notification)) { return null; } @@ -38,12 +38,12 @@ public Notification toTarget(com.rbkmoney.damsel.fraudbusters_notificator.Notifi } @Override - public com.rbkmoney.damsel.fraudbusters_notificator.Notification toSource(Notification notification) { + public dev.vality.damsel.fraudbusters_notificator.Notification toSource(Notification notification) { if (Objects.isNull(notification)) { return null; } - com.rbkmoney.damsel.fraudbusters_notificator.Notification result = - new com.rbkmoney.damsel.fraudbusters_notificator.Notification(); + dev.vality.damsel.fraudbusters_notificator.Notification result = + new dev.vality.damsel.fraudbusters_notificator.Notification(); if (Objects.nonNull(notification.getId())) { result.setId(notification.getId()); } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java index d2de69a3..04b29b5e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.resource.notificator.converter; -import com.rbkmoney.swag.fraudbusters.management.model.NotificationTemplate; +import dev.vality.swag.fraudbusters.management.model.NotificationTemplate; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; @@ -10,11 +10,11 @@ @Component public class NotificationTemplateConverter implements - Converter { + Converter { @Override public NotificationTemplate convert( - com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplate notificationTemplate) { + dev.vality.damsel.fraudbusters_notificator.NotificationTemplate notificationTemplate) { NotificationTemplate result = new NotificationTemplate(); result.setId(notificationTemplate.getId()); result.setName(notificationTemplate.getName()); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java index f25aa0be..7818c59c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.resource.notificator.converter; -import com.rbkmoney.swag.fraudbusters.management.model.ValidationError; -import com.rbkmoney.swag.fraudbusters.management.model.ValidationResponse; +import dev.vality.swag.fraudbusters.management.model.ValidationError; +import dev.vality.swag.fraudbusters.management.model.ValidationResponse; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; @@ -11,11 +11,11 @@ @Component public class ValidationConverter - implements Converter { + implements Converter { @Override public ValidationResponse convert( - com.rbkmoney.damsel.fraudbusters_notificator.ValidationResponse validationResponse) { + dev.vality.damsel.fraudbusters_notificator.ValidationResponse validationResponse) { ValidationResponse response = new ValidationResponse(); if (validationResponse.isSetErrors()) { List errors = validationResponse.getErrors(); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java index cfb8e07d..2c4de75f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java @@ -1,7 +1,5 @@ package com.rbkmoney.fraudbusters.management.resource.payment; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataServiceSrv; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataSetCheckResult; import com.rbkmoney.fraudbusters.management.converter.payment.*; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; @@ -9,8 +7,10 @@ import com.rbkmoney.fraudbusters.management.service.payment.PaymentsDataSetService; import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsDataSetApi; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; +import dev.vality.damsel.fraudbusters.HistoricalDataSetCheckResult; +import dev.vality.swag.fraudbusters.management.api.PaymentsDataSetApi; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TException; @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; - import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java index 5d07786d..2aac4311 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java @@ -4,8 +4,8 @@ import com.rbkmoney.fraudbusters.management.domain.TemplateModel; import com.rbkmoney.fraudbusters.management.service.payment.PaymentEmulateService; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsEmulationsApi; -import com.rbkmoney.swag.fraudbusters.management.model.EmulateResponse; +import dev.vality.swag.fraudbusters.management.api.PaymentsEmulationsApi; +import dev.vality.swag.fraudbusters.management.model.EmulateResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -14,7 +14,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; - import java.util.List; import java.util.Objects; import java.util.stream.Collectors; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java index e170ff6c..94a6f4b2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java @@ -12,8 +12,8 @@ import com.rbkmoney.fraudbusters.management.service.payment.PaymentGroupReferenceCommandService; import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsGroupsApi; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.swag.fraudbusters.management.api.PaymentsGroupsApi; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -22,7 +22,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; - import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java index a2863168..2355c463 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java @@ -1,12 +1,12 @@ package com.rbkmoney.fraudbusters.management.resource.payment; -import com.rbkmoney.damsel.base.BoundType; -import com.rbkmoney.damsel.base.TimestampInterval; -import com.rbkmoney.damsel.base.TimestampIntervalBound; -import com.rbkmoney.damsel.fraudbusters.*; import com.rbkmoney.fraudbusters.management.converter.payment.*; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsHistoricalDataApi; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.damsel.base.BoundType; +import dev.vality.damsel.base.TimestampInterval; +import dev.vality.damsel.base.TimestampIntervalBound; +import dev.vality.damsel.fraudbusters.*; +import dev.vality.swag.fraudbusters.management.api.PaymentsHistoricalDataApi; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java index 05047bed..419e5969 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.service.payment.PaymentLoadDataService; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsLoadDataApi; +import dev.vality.swag.fraudbusters.management.api.PaymentsLoadDataApi; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java index c62dd79c..993e49b2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java @@ -7,10 +7,10 @@ import com.rbkmoney.fraudbusters.management.utils.ParametersService; import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsListsApi; -import com.rbkmoney.swag.fraudbusters.management.model.ListResponse; -import com.rbkmoney.swag.fraudbusters.management.model.RowListRequest; -import com.rbkmoney.swag.fraudbusters.management.model.WbListRecordsResponse; +import dev.vality.swag.fraudbusters.management.api.PaymentsListsApi; +import dev.vality.swag.fraudbusters.management.model.ListResponse; +import dev.vality.swag.fraudbusters.management.model.RowListRequest; +import dev.vality.swag.fraudbusters.management.model.WbListRecordsResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -20,7 +20,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; - import java.util.List; @Slf4j @@ -65,7 +64,7 @@ public ResponseEntity> insertRow(@Valid RowListRequest request) { log.info("insertRowsToList initiator: {} request {}", userInfoService.getUserName(), request); return wbListCommandService.sendListRecords( request.getRecords(), - com.rbkmoney.damsel.wb_list.ListType.valueOf(request.getListType().getValue()), + dev.vality.damsel.wb_list.ListType.valueOf(request.getListType().getValue()), paymentCountInfoGenerator::initRow, userInfoService.getUserName()); } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java index a9961cfa..a906a174 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java @@ -14,9 +14,9 @@ import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; import com.rbkmoney.fraudbusters.management.utils.PaymentUnknownTemplateFinder; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsReferencesApi; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; -import com.rbkmoney.swag.fraudbusters.management.model.ReferencesResponse; +import dev.vality.swag.fraudbusters.management.api.PaymentsReferencesApi; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.swag.fraudbusters.management.model.ReferencesResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; - import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java index 4ff0c327..a506c8f9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java @@ -1,7 +1,5 @@ package com.rbkmoney.fraudbusters.management.resource.payment; -import com.rbkmoney.damsel.fraudbusters.CommandType; -import com.rbkmoney.damsel.fraudbusters.TemplateValidateError; import com.rbkmoney.fraudbusters.management.converter.payment.TemplateValidateErrorsToValidateTemplateResponseConverter; import com.rbkmoney.fraudbusters.management.dao.TemplateDao; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; @@ -11,8 +9,10 @@ import com.rbkmoney.fraudbusters.management.utils.CommandMapper; import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.api.PaymentsTemplatesApi; -import com.rbkmoney.swag.fraudbusters.management.model.*; +import dev.vality.damsel.fraudbusters.CommandType; +import dev.vality.damsel.fraudbusters.TemplateValidateError; +import dev.vality.swag.fraudbusters.management.api.PaymentsTemplatesApi; +import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; - import java.util.List; @Slf4j @@ -61,7 +60,7 @@ public ResponseEntity getTemplateNames(@Valid String regexpName) { @Override @PreAuthorize("hasAnyRole('fraud-officer')") public ResponseEntity insertTemplate( - com.rbkmoney.swag.fraudbusters.management.model.@Valid Template template) { + dev.vality.swag.fraudbusters.management.model.@Valid Template template) { String userName = userInfoService.getUserName(); log.info("insertTemplate initiator: {} templateModel: {}", userName, template); @@ -85,7 +84,7 @@ public ResponseEntity validateTemplate(@Valid Templat log.info("validateTemplate initiator: {} templateModel: {}", userInfoService.getUserName(), template); List templateValidateErrors = paymentValidationService.validateTemplate( - new com.rbkmoney.damsel.fraudbusters.Template() + new dev.vality.damsel.fraudbusters.Template() .setId(template.getId()) .setTemplate(template.getTemplate().getBytes())); log.info("validateTemplate result: {}", templateValidateErrors); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java index e3f2fd4f..d4e103f2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.serializer; -import com.rbkmoney.damsel.wb_list.ChangeCommand; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; +import dev.vality.damsel.wb_list.ChangeCommand; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java index fe9653ee..fdb8e787 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.serializer; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; +import dev.vality.damsel.fraudbusters.Command; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java index 4ee0137a..d9760fa4 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.serializer; -import com.rbkmoney.damsel.wb_list.Event; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; +import dev.vality.damsel.wb_list.Event; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java index 37a3675a..2cf81480 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.serializer; -import com.rbkmoney.damsel.fraudbusters.ReferenceInfo; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; +import dev.vality.damsel.fraudbusters.ReferenceInfo; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java index 8c8b7dfc..7f922aa8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java @@ -1,16 +1,16 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.wb_list.Event; import com.rbkmoney.fraudbusters.management.converter.CommandToAuditLogConverter; import com.rbkmoney.fraudbusters.management.converter.CommonAuditInternalToCommonAuditConverter; import com.rbkmoney.fraudbusters.management.converter.EventToAuditLogConverter; import com.rbkmoney.fraudbusters.management.dao.audit.CommandAuditDao; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.FilterLogsResponse; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.wb_list.Event; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.swag.fraudbusters.management.model.FilterLogsResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java index 5066c154..41c84cf2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.fraudbusters_notificator.*; import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; import com.rbkmoney.fraudbusters.management.service.iface.ChannelService; +import dev.vality.damsel.fraudbusters_notificator.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TException; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java index 29ba7e76..e7d423ac 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.exception.KafkaProduceException; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TBase; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java index c87f85bc..cf611ae6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.wb_list.Command; -import com.rbkmoney.damsel.wb_list.Row; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.damsel.wb_list.Command; +import dev.vality.damsel.wb_list.Row; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -39,7 +39,7 @@ void clean() { Row row = wbListRecordToRowConverter.convert(record); wbListCommandService.sendCommandSync( row, - com.rbkmoney.damsel.wb_list.ListType.valueOf(record.getListType().name()), + dev.vality.damsel.wb_list.ListType.valueOf(record.getListType().name()), Command.DELETE, CLEAN_INITIATOR); } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java index 13aef8e5..6e115361 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.fraudbusters_notificator.*; import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; import com.rbkmoney.fraudbusters.management.service.iface.NotificationService; +import dev.vality.damsel.fraudbusters_notificator.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TException; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java index 3b1e7f9e..1c26b5f4 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplateListResponse; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplateServiceSrv; import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; import com.rbkmoney.fraudbusters.management.service.iface.NotificationTemplateService; +import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateListResponse; +import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateServiceSrv; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TException; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java index a81819d9..55177812 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.converter.TemplateModelToCommandConverter; import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java index 2dcccccd..18443fe3 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.wb_list.*; import com.rbkmoney.fraudbusters.management.exception.KafkaProduceException; +import dev.vality.damsel.wb_list.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TBase; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java index 4e515b4e..de5734f7 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.service.iface; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.wb_list.Event; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.swag.fraudbusters.management.model.FilterLogsResponse; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.wb_list.Event; +import dev.vality.swag.fraudbusters.management.model.FilterLogsResponse; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java index 13d46006..2baf7116 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.service.iface; -import com.rbkmoney.damsel.fraudbusters_notificator.*; +import dev.vality.damsel.fraudbusters_notificator.*; public interface ChannelService { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java index f48eb23a..1f134a79 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.service.iface; -import com.rbkmoney.damsel.fraudbusters_notificator.*; +import dev.vality.damsel.fraudbusters_notificator.*; public interface NotificationService { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java index ab352e7f..aa07c8c9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.service.iface; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplateListResponse; +import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateListResponse; public interface NotificationTemplateService { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java index a049ec7e..6790f781 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.service.iface; -import com.rbkmoney.damsel.fraudbusters.Template; -import com.rbkmoney.damsel.fraudbusters.TemplateValidateError; +import dev.vality.damsel.fraudbusters.Template; +import dev.vality.damsel.fraudbusters.TemplateValidateError; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java index 5f65c717..11233b99 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.service.p2p; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.service.CommandSender; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java index 452a1cda..9e551ec9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java @@ -1,13 +1,13 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandType; -import com.rbkmoney.damsel.fraudbusters.UserInfo; import com.rbkmoney.fraudbusters.management.converter.payment.GroupToCommandConverter; import com.rbkmoney.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToCommandConverter; import com.rbkmoney.fraudbusters.management.service.CommandSender; -import com.rbkmoney.swag.fraudbusters.management.model.Group; -import com.rbkmoney.swag.fraudbusters.management.model.GroupReference; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandType; +import dev.vality.damsel.fraudbusters.UserInfo; +import dev.vality.swag.fraudbusters.management.model.Group; +import dev.vality.swag.fraudbusters.management.model.GroupReference; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java index ad628562..1f85770e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.GroupReference; import com.rbkmoney.fraudbusters.management.service.CommandSender; import com.rbkmoney.fraudbusters.management.utils.ReferenceKeyGenerator; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.GroupReference; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java index 13f8b0d0..db1e254d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.FraudPayment; -import com.rbkmoney.damsel.fraudbusters.PaymentServiceSrv; import com.rbkmoney.fraudbusters.management.utils.parser.CsvFraudPaymentParser; +import dev.vality.damsel.fraudbusters.FraudPayment; +import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TException; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java index 50957fa7..b4a4d0c0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.Command; import com.rbkmoney.fraudbusters.management.service.CommandSender; import com.rbkmoney.fraudbusters.management.utils.ReferenceKeyGenerator; +import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java index 8911ce53..cdb6aee3 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.PaymentServiceSrv; -import com.rbkmoney.damsel.fraudbusters.Template; -import com.rbkmoney.damsel.fraudbusters.TemplateValidateError; import com.rbkmoney.fraudbusters.management.exception.ValidationException; import com.rbkmoney.fraudbusters.management.service.iface.ValidationTemplateService; +import dev.vality.damsel.fraudbusters.PaymentServiceSrv; +import dev.vality.damsel.fraudbusters.Template; +import dev.vality.damsel.fraudbusters.TemplateValidateError; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.thrift.TException; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java index af19ec2b..98ec8f25 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java @@ -4,7 +4,7 @@ import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java index 343efa77..09da9c15 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java @@ -1,19 +1,19 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.wb_list.Command; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordsModelToWbListRecordConverter; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.enums.ListType; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.exception.NotFoundException; import com.rbkmoney.fraudbusters.management.service.WbListCommandService; import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; import com.rbkmoney.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentCountInfo; -import com.rbkmoney.swag.fraudbusters.management.model.WbListRecordsResponse; +import dev.vality.damsel.wb_list.Command; +import dev.vality.fraudbusters.management.domain.enums.ListType; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; +import dev.vality.swag.fraudbusters.management.model.WbListRecordsResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -56,7 +56,7 @@ public void insertCsv(String listType, MultipartFile file, String initiator) { log.info("Insert from csv paymentCountInfos size: {}", paymentCountInfos.size()); wbListCommandService.sendListRecords( paymentCountInfos, - com.rbkmoney.damsel.wb_list.ListType.valueOf(listType), + dev.vality.damsel.wb_list.ListType.valueOf(listType), paymentCountInfoGenerator::initRow, initiator); log.info("Insert loaded fraudPayments: {}", paymentCountInfos); @@ -76,7 +76,7 @@ public String removeListRecord(String id) { log.info("removeRowFromList initiator: {} record {}", userInfoService.getUserName(), wbListRecord); var row = wbListRecordToRowConverter.convert(wbListRecord); return wbListCommandService.sendCommandSync(row, - com.rbkmoney.damsel.wb_list.ListType.valueOf(wbListRecord.getListType().name()), + dev.vality.damsel.wb_list.ListType.valueOf(wbListRecord.getListType().name()), Command.DELETE, userInfoService.getUserName()); } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java index b4b20396..968e8507 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java @@ -1,12 +1,12 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.CommandType; import com.rbkmoney.fraudbusters.management.converter.payment.PaymentReferenceModelToCommandConverter; import com.rbkmoney.fraudbusters.management.converter.payment.ReferenceToCommandConverter; import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; import com.rbkmoney.fraudbusters.management.utils.CommandMapper; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.damsel.fraudbusters.CommandType; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java index 3f22166a..83718c5a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java @@ -1,8 +1,5 @@ package com.rbkmoney.fraudbusters.management.service.payment; -import com.rbkmoney.damsel.fraudbusters.CommandType; -import com.rbkmoney.damsel.fraudbusters.TemplateValidateError; -import com.rbkmoney.damsel.fraudbusters.UserInfo; import com.rbkmoney.fraudbusters.management.converter.payment.TemplateModelToTemplateConverter; import com.rbkmoney.fraudbusters.management.converter.payment.TemplateToCommandConverter; import com.rbkmoney.fraudbusters.management.dao.TemplateDao; @@ -11,9 +8,12 @@ import com.rbkmoney.fraudbusters.management.service.TemplateCommandService; import com.rbkmoney.fraudbusters.management.service.iface.ValidationTemplateService; import com.rbkmoney.fraudbusters.management.utils.FilterRequestUtils; -import com.rbkmoney.swag.fraudbusters.management.model.CreateTemplateResponse; -import com.rbkmoney.swag.fraudbusters.management.model.Template; -import com.rbkmoney.swag.fraudbusters.management.model.TemplatesResponse; +import dev.vality.damsel.fraudbusters.CommandType; +import dev.vality.damsel.fraudbusters.TemplateValidateError; +import dev.vality.damsel.fraudbusters.UserInfo; +import dev.vality.swag.fraudbusters.management.model.CreateTemplateResponse; +import dev.vality.swag.fraudbusters.management.model.Template; +import dev.vality.swag.fraudbusters.management.model.TemplatesResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java index c6bffdd4..4cd4cbdf 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.utils; -import com.rbkmoney.damsel.fraudbusters.Command; -import com.rbkmoney.damsel.fraudbusters.CommandType; -import com.rbkmoney.damsel.fraudbusters.UserInfo; +import dev.vality.damsel.fraudbusters.Command; +import dev.vality.damsel.fraudbusters.CommandType; +import dev.vality.damsel.fraudbusters.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java index ca1fe394..8c4cbdf2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.utils; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.wb_list.RowInfo; -import com.rbkmoney.swag.fraudbusters.management.model.CountInfo; +import dev.vality.damsel.wb_list.RowInfo; +import dev.vality.swag.fraudbusters.management.model.CountInfo; import io.micrometer.shaded.io.netty.util.internal.StringUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,9 +18,9 @@ public class CountInfoApiUtils { private final ObjectMapper objectMapper; public CountInfo initExternalRowCountInfo(String rowInfo) { - var countInfoValue = new com.rbkmoney.swag.fraudbusters.management.model.CountInfo(); + var countInfoValue = new dev.vality.swag.fraudbusters.management.model.CountInfo(); try { - var countInfo = objectMapper.readValue(rowInfo, com.rbkmoney.damsel.wb_list.CountInfo.class); + var countInfo = objectMapper.readValue(rowInfo, dev.vality.damsel.wb_list.CountInfo.class); countInfoValue.setCount(countInfo.getCount()); countInfoValue.setEndCountTime(DateTimeUtils.toDate(countInfo.getTimeToLive())); countInfoValue.setStartCountTime(DateTimeUtils.toDate(countInfo.getStartCountTime())); @@ -35,7 +35,7 @@ public RowInfo initRowInfo(CountInfo countInfo) { StringUtil.isNullOrEmpty(countInfo.getStartCountTime().toInstant(ZoneOffset.UTC).toString()) ? Instant.now().toString() : countInfo.getStartCountTime().toInstant(ZoneOffset.UTC).toString(); - return RowInfo.count_info(new com.rbkmoney.damsel.wb_list.CountInfo() + return RowInfo.count_info(new dev.vality.damsel.wb_list.CountInfo() .setCount(countInfo.getCount()) .setStartCountTime(startCountTime) .setTimeToLive(countInfo.getEndCountTime().toInstant(ZoneOffset.UTC).toString())); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java index b2414c10..c29f9f5e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.utils; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.wb_list.Row; -import com.rbkmoney.damsel.wb_list.RowInfo; import com.rbkmoney.fraudbusters.management.domain.CountInfo; +import dev.vality.damsel.wb_list.Row; +import dev.vality.damsel.wb_list.RowInfo; import io.micrometer.shaded.io.netty.util.internal.StringUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ public class CountInfoUtils { public CountInfo initRowCountInfo(String rowInfo) { var countInfoValue = new CountInfo(); try { - var countInfo = objectMapper.readValue(rowInfo, com.rbkmoney.damsel.wb_list.CountInfo.class); + var countInfo = objectMapper.readValue(rowInfo, dev.vality.damsel.wb_list.CountInfo.class); countInfoValue.setCount(countInfo.getCount()); countInfoValue.setEndCountTime(countInfo.getTimeToLive()); countInfoValue.setStartCountTime(countInfo.getStartCountTime()); @@ -34,7 +34,7 @@ public void initRowCountInfo(CountInfo countInfo, Row row) { String startCountTime = StringUtil.isNullOrEmpty(countInfo.getStartCountTime()) ? Instant.now().toString() : countInfo.getStartCountTime(); - row.setRowInfo(RowInfo.count_info(new com.rbkmoney.damsel.wb_list.CountInfo() + row.setRowInfo(RowInfo.count_info(new dev.vality.damsel.wb_list.CountInfo() .setCount(countInfo.getCount()) .setStartCountTime(startCountTime) .setTimeToLive(countInfo.getEndCountTime()))); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java index e02b2f19..2e1abfc1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java @@ -1,11 +1,11 @@ package com.rbkmoney.fraudbusters.management.utils; -import com.rbkmoney.damsel.wb_list.Row; import com.rbkmoney.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; import com.rbkmoney.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; import com.rbkmoney.fraudbusters.management.exception.UnknownEventException; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentCountInfo; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentListRecord; +import dev.vality.damsel.wb_list.Row; +import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; +import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; import io.micrometer.shaded.io.netty.util.internal.StringUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -22,14 +22,14 @@ public PaymentCountInfo initDestination(String rowInfo, PaymentListRecord listRe var paymentCountInfo = new PaymentCountInfo(); paymentCountInfo.setListRecord(listRecord); if (!StringUtil.isNullOrEmpty(rowInfo)) { - com.rbkmoney.swag.fraudbusters.management.model.CountInfo countInfoValue = + dev.vality.swag.fraudbusters.management.model.CountInfo countInfoValue = countInfoApiUtils.initExternalRowCountInfo(rowInfo); paymentCountInfo.setCountInfo(countInfoValue); } return paymentCountInfo; } - public Row initRow(PaymentCountInfo record, com.rbkmoney.damsel.wb_list.ListType listType) { + public Row initRow(PaymentCountInfo record, dev.vality.damsel.wb_list.ListType listType) { Row row = null; switch (listType) { case black: diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java index b28e6b10..7e1b9b07 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.utils; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java index d0ccb21d..1e113663 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.utils; -import com.rbkmoney.damsel.fraudbusters.TemplateReference; +import dev.vality.damsel.fraudbusters.TemplateReference; import io.micrometer.shaded.io.netty.util.internal.StringUtil; public class ReferenceKeyGenerator { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java index e1640159..6a9deb05 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java @@ -2,10 +2,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.wb_list.CountInfo; -import com.rbkmoney.damsel.wb_list.Row; -import com.rbkmoney.damsel.wb_list.RowInfo; -import com.rbkmoney.fraudbusters.management.domain.enums.ListType; +import dev.vality.damsel.wb_list.CountInfo; +import dev.vality.damsel.wb_list.Row; +import dev.vality.damsel.wb_list.RowInfo; +import dev.vality.fraudbusters.management.domain.enums.ListType; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java index d33597ab..85db0730 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.utils.parser; -import com.rbkmoney.damsel.fraudbusters.FraudPayment; import com.rbkmoney.fraudbusters.management.constant.CsvFraudPaymentFields; import com.rbkmoney.fraudbusters.management.exception.DateFormatException; +import dev.vality.damsel.fraudbusters.FraudPayment; import lombok.extern.slf4j.Slf4j; import org.apache.commons.csv.CSVRecord; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java index 5d42fecd..f8316aaf 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java @@ -3,9 +3,9 @@ import com.rbkmoney.fraudbusters.management.constant.CsvPaymentListLoadFields; import com.rbkmoney.fraudbusters.management.exception.DateFormatException; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.swag.fraudbusters.management.model.CountInfo; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentCountInfo; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentListRecord; +import dev.vality.swag.fraudbusters.management.model.CountInfo; +import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; +import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; import lombok.extern.slf4j.Slf4j; import org.apache.commons.csv.CSVRecord; import org.springframework.stereotype.Component; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java index 0879a782..a4687b84 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java @@ -1,6 +1,5 @@ package com.rbkmoney.fraudbusters.management; -import com.rbkmoney.damsel.wb_list.ListType; import com.rbkmoney.dao.DaoException; import com.rbkmoney.fraudbusters.management.converter.payment.*; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; @@ -17,6 +16,7 @@ import com.rbkmoney.fraudbusters.management.service.payment.PaymentsListsService; import com.rbkmoney.fraudbusters.management.utils.*; import com.rbkmoney.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; +import dev.vality.damsel.wb_list.ListType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java b/src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java index 4dd761b4..d37acd85 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java @@ -1,15 +1,15 @@ package com.rbkmoney.fraudbusters.management; -import com.rbkmoney.damsel.fraudbusters_notificator.ChannelType; -import com.rbkmoney.damsel.fraudbusters_notificator.NotificationStatus; -import com.rbkmoney.damsel.wb_list.*; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; -import com.rbkmoney.fraudbusters.management.domain.tables.records.WbListRecordsRecord; -import com.rbkmoney.swag.fraudbusters.management.model.Channel; -import com.rbkmoney.swag.fraudbusters.management.model.Notification; +import dev.vality.damsel.fraudbusters_notificator.ChannelType; +import dev.vality.damsel.fraudbusters_notificator.NotificationStatus; +import dev.vality.damsel.wb_list.*; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.fraudbusters.management.domain.tables.records.WbListRecordsRecord; +import dev.vality.swag.fraudbusters.management.model.Channel; +import dev.vality.swag.fraudbusters.management.model.Notification; import java.time.Instant; import java.time.LocalDateTime; @@ -48,7 +48,7 @@ public static WbListRecordsRecord createWbListRecordsRecord(String id) { WbListRecordsRecord listRecord = new WbListRecordsRecord(); listRecord.setId(id); listRecord.setListName(randomString()); - listRecord.setListType(com.rbkmoney.fraudbusters.management.domain.enums.ListType.black); + listRecord.setListType(dev.vality.fraudbusters.management.domain.enums.ListType.black); listRecord.setInsertTime(LocalDateTime.now()); listRecord.setPartyId(randomString()); listRecord.setShopId(randomString()); @@ -60,7 +60,7 @@ public static WbListRecords createWbListRecords(String id) { WbListRecords listRecord = new WbListRecords(); listRecord.setId(id); listRecord.setListName(randomString()); - listRecord.setListType(com.rbkmoney.fraudbusters.management.domain.enums.ListType.black); + listRecord.setListType(dev.vality.fraudbusters.management.domain.enums.ListType.black); listRecord.setInsertTime(LocalDateTime.now()); listRecord.setPartyId(randomString()); listRecord.setShopId(randomString()); @@ -95,8 +95,8 @@ public static Long randomLong() { return ThreadLocalRandom.current().nextLong(1000); } - public static com.rbkmoney.damsel.fraudbusters_notificator.Notification testInternalNotification() { - var notification = new com.rbkmoney.damsel.fraudbusters_notificator.Notification(); + public static dev.vality.damsel.fraudbusters_notificator.Notification testInternalNotification() { + var notification = new dev.vality.damsel.fraudbusters_notificator.Notification(); notification.setId(randomLong()); notification.setName(randomString()); notification.setSubject(randomString()); @@ -110,14 +110,14 @@ public static com.rbkmoney.damsel.fraudbusters_notificator.Notification testInte return notification; } - public static List testInternalNotifications(int i) { + public static List testInternalNotifications(int i) { return IntStream.rangeClosed(1, i) .mapToObj(value -> testInternalNotification()) .collect(Collectors.toList()); } - public static com.rbkmoney.damsel.fraudbusters_notificator.Channel testInternalChannel() { - var channel = new com.rbkmoney.damsel.fraudbusters_notificator.Channel(); + public static dev.vality.damsel.fraudbusters_notificator.Channel testInternalChannel() { + var channel = new dev.vality.damsel.fraudbusters_notificator.Channel(); channel.setType(ChannelType.mail); channel.setDestination(randomString()); channel.setName(randomString()); @@ -125,14 +125,14 @@ public static com.rbkmoney.damsel.fraudbusters_notificator.Channel testInternalC return channel; } - public static List testInternalChannels(int i) { + public static List testInternalChannels(int i) { return IntStream.rangeClosed(1, i) .mapToObj(value -> testInternalChannel()) .collect(Collectors.toList()); } - public static com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplate testNotificationTemplate() { - var notificationTemplate = new com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplate(); + public static dev.vality.damsel.fraudbusters_notificator.NotificationTemplate testNotificationTemplate() { + var notificationTemplate = new dev.vality.damsel.fraudbusters_notificator.NotificationTemplate(); notificationTemplate.setId(randomLong()); notificationTemplate.setName(randomString()); notificationTemplate.setBasicParams(randomString()); @@ -144,7 +144,7 @@ public static com.rbkmoney.damsel.fraudbusters_notificator.NotificationTemplate return notificationTemplate; } - public static List testNotificationTemplates( + public static List testNotificationTemplates( int i) { return IntStream.rangeClosed(1, i) .mapToObj(value -> testNotificationTemplate()) diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java b/src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java index af1f9187..9eadf956 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.config; -import com.rbkmoney.damsel.wb_list.ChangeCommand; import com.rbkmoney.fraudbusters.management.serializer.CommandChangeDeserializer; -import com.rbkmoney.testcontainers.annotations.kafka.config.KafkaConsumer; +import dev.vality.damsel.wb_list.ChangeCommand; +import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java b/src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java index ccfe1d12..4e8f7a20 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.config; -import com.rbkmoney.testcontainers.annotations.KafkaSpringBootTest; -import com.rbkmoney.testcontainers.annotations.kafka.KafkaTestcontainer; +import dev.vality.testcontainers.annotations.KafkaSpringBootTest; +import dev.vality.testcontainers.annotations.kafka.KafkaTestcontainer; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration; import org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java b/src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java index b6fb4f32..f661fcf0 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java @@ -1,6 +1,6 @@ package com.rbkmoney.fraudbusters.management.config; -import com.rbkmoney.testcontainers.annotations.postgresql.PostgresqlTestcontainer; +import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainer; import org.springframework.boot.test.autoconfigure.jooq.JooqTest; import java.lang.annotation.ElementType; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java index 896fdcbb..1f36c6ef 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.converter; -import com.rbkmoney.damsel.wb_list.*; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.damsel.wb_list.*; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java index 132921c1..731c976a 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java @@ -1,17 +1,16 @@ package com.rbkmoney.fraudbusters.management.converter.payment; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.wb_list.Row; import com.rbkmoney.fraudbusters.management.TestObjectFactory; -import com.rbkmoney.fraudbusters.management.domain.enums.ListType; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.utils.RowUtilsService; +import dev.vality.damsel.wb_list.Row; +import dev.vality.fraudbusters.management.domain.enums.ListType; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.time.ZoneOffset; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java b/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java index f4932809..8e9bc5de 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.converter.payment; -import com.rbkmoney.damsel.fraudbusters.*; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; import com.rbkmoney.fraudbusters.management.utils.DataSourceBeanUtils; +import dev.vality.damsel.fraudbusters.*; import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java index df99b243..3c36ddee 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.dao.audit; import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.domain.enums.CommandType; -import com.rbkmoney.fraudbusters.management.domain.enums.ObjectType; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.CommandAudit; +import dev.vality.fraudbusters.management.domain.enums.CommandType; +import dev.vality.fraudbusters.management.domain.enums.ObjectType; +import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import org.jooq.SortOrder; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java index 558a8e76..378bd7bf 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java @@ -3,7 +3,7 @@ import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; import com.rbkmoney.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.tables.records.FGroupReferenceRecord; +import dev.vality.fraudbusters.management.domain.tables.records.FGroupReferenceRecord; import org.jooq.DSLContext; import org.jooq.Result; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.FGroupReference.F_GROUP_REFERENCE; +import static dev.vality.fraudbusters.management.domain.tables.FGroupReference.F_GROUP_REFERENCE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java index 756390de..4b06d500 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java @@ -19,7 +19,7 @@ import java.util.Optional; import java.util.UUID; -import static com.rbkmoney.fraudbusters.management.domain.tables.FReference.F_REFERENCE; +import static dev.vality.fraudbusters.management.domain.tables.FReference.F_REFERENCE; import static org.junit.jupiter.api.Assertions.*; @PostgresqlJooqITest diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java index ce57a766..1aa9547c 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java @@ -5,14 +5,14 @@ import com.rbkmoney.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; import com.rbkmoney.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordsToCountInfoListRequestConverter; -import com.rbkmoney.fraudbusters.management.domain.enums.ListType; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; -import com.rbkmoney.fraudbusters.management.domain.tables.records.WbListRecordsRecord; import com.rbkmoney.fraudbusters.management.utils.CountInfoApiUtils; import com.rbkmoney.fraudbusters.management.utils.CountInfoUtils; import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentCountInfo; +import dev.vality.fraudbusters.management.domain.enums.ListType; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.fraudbusters.management.domain.tables.records.WbListRecordsRecord; +import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; import org.jooq.DSLContext; import org.jooq.SortOrder; import org.junit.jupiter.api.BeforeEach; @@ -27,7 +27,7 @@ import static com.rbkmoney.fraudbusters.management.TestObjectFactory.createWbListRecordsRecord; import static com.rbkmoney.fraudbusters.management.TestObjectFactory.randomString; -import static com.rbkmoney.fraudbusters.management.domain.tables.WbListRecords.WB_LIST_RECORDS; +import static dev.vality.fraudbusters.management.domain.tables.WbListRecords.WB_LIST_RECORDS; import static org.junit.jupiter.api.Assertions.*; @PostgresqlJooqITest diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java index 9bd1c52e..738bacd9 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java @@ -1,14 +1,14 @@ package com.rbkmoney.fraudbusters.management.kafka; -import com.rbkmoney.damsel.wb_list.ChangeCommand; -import com.rbkmoney.damsel.wb_list.Command; -import com.rbkmoney.damsel.wb_list.ListType; import com.rbkmoney.fraudbusters.management.config.KafkaITest; import com.rbkmoney.fraudbusters.management.controller.ErrorController; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsListsResource; -import com.rbkmoney.testcontainers.annotations.kafka.config.KafkaConsumer; +import dev.vality.damsel.wb_list.ChangeCommand; +import dev.vality.damsel.wb_list.Command; +import dev.vality.damsel.wb_list.ListType; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.rnorth.ducttape.unreliables.Unreliables; @@ -56,7 +56,7 @@ void deleteFromList() throws Exception { when(wbListDao.getById(test)).thenReturn(new WbListRecords("id", "partyId", "shopId", - com.rbkmoney.fraudbusters.management.domain.enums.ListType.white, + dev.vality.fraudbusters.management.domain.enums.ListType.white, "test", "test", LocalDateTime.now(), null, null, LocalDateTime.now())); diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java index 8a28aa4d..354db5eb 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java @@ -2,9 +2,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.rbkmoney.damsel.wb_list.ChangeCommand; -import com.rbkmoney.damsel.wb_list.Command; -import com.rbkmoney.damsel.wb_list.ListType; import com.rbkmoney.fraudbusters.management.TestObjectFactory; import com.rbkmoney.fraudbusters.management.config.KafkaITest; import com.rbkmoney.fraudbusters.management.controller.ErrorController; @@ -12,7 +9,10 @@ import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsListsResource; -import com.rbkmoney.testcontainers.annotations.kafka.config.KafkaConsumer; +import dev.vality.damsel.wb_list.ChangeCommand; +import dev.vality.damsel.wb_list.Command; +import dev.vality.damsel.wb_list.ListType; +import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java index af69967b..6e188bda 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java @@ -1,9 +1,5 @@ package com.rbkmoney.fraudbusters.management.kafka; -import com.rbkmoney.damsel.fraudbusters.MerchantInfo; -import com.rbkmoney.damsel.fraudbusters.PaymentServiceSrv; -import com.rbkmoney.damsel.fraudbusters.ReferenceInfo; -import com.rbkmoney.damsel.fraudbusters.ValidateTemplateResponse; import com.rbkmoney.fraudbusters.management.config.KafkaITest; import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupDao; @@ -21,8 +17,12 @@ import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsReferenceResource; import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsTemplatesResource; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; -import com.rbkmoney.swag.fraudbusters.management.model.*; -import com.rbkmoney.testcontainers.annotations.kafka.config.KafkaProducer; +import dev.vality.damsel.fraudbusters.MerchantInfo; +import dev.vality.damsel.fraudbusters.PaymentServiceSrv; +import dev.vality.damsel.fraudbusters.ReferenceInfo; +import dev.vality.damsel.fraudbusters.ValidateTemplateResponse; +import dev.vality.swag.fraudbusters.management.model.*; +import dev.vality.testcontainers.annotations.kafka.config.KafkaProducer; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java index 1b06387e..2f2f91fa 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java @@ -1,17 +1,17 @@ package com.rbkmoney.fraudbusters.management.kafka; -import com.rbkmoney.damsel.wb_list.*; import com.rbkmoney.fraudbusters.management.config.KafkaITest; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.pojos.WbListRecords; import com.rbkmoney.fraudbusters.management.service.iface.AuditService; import com.rbkmoney.fraudbusters.management.utils.MethodPaths; -import com.rbkmoney.swag.fraudbusters.management.model.ListResponse; -import com.rbkmoney.testcontainers.annotations.kafka.config.KafkaConsumer; -import com.rbkmoney.testcontainers.annotations.kafka.config.KafkaProducer; +import dev.vality.damsel.wb_list.*; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.swag.fraudbusters.management.model.ListResponse; +import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; +import dev.vality.testcontainers.annotations.kafka.config.KafkaProducer; import org.apache.thrift.TBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java index b0cd0bbf..045128ea 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java @@ -1,11 +1,11 @@ package com.rbkmoney.fraudbusters.management.listener; -import com.rbkmoney.damsel.fraudbusters.MerchantInfo; -import com.rbkmoney.damsel.fraudbusters.ReferenceInfo; import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; import com.rbkmoney.fraudbusters.management.service.payment.PaymentTemplateReferenceService; +import dev.vality.damsel.fraudbusters.MerchantInfo; +import dev.vality.damsel.fraudbusters.ReferenceInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java index 431be65b..d281b149 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java @@ -18,9 +18,9 @@ import com.rbkmoney.fraudbusters.management.service.payment.PaymentEmulateService; import com.rbkmoney.fraudbusters.management.utils.GroupRowToModelMapper; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.swag.fraudbusters.management.model.EmulateResponse; -import com.rbkmoney.swag.fraudbusters.management.model.Template; -import com.rbkmoney.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton; +import dev.vality.swag.fraudbusters.management.model.EmulateResponse; +import dev.vality.swag.fraudbusters.management.model.Template; +import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.jooq.JooqTest; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java index 6be76d41..739663a3 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.rbkmoney.damsel.fraudbusters_notificator.*; import com.rbkmoney.fraudbusters.management.TestObjectFactory; import com.rbkmoney.fraudbusters.management.controller.ErrorController; import com.rbkmoney.fraudbusters.management.resource.notificator.converter.ChannelConverter; @@ -12,10 +11,11 @@ import com.rbkmoney.fraudbusters.management.service.ChannelServiceImpl; import com.rbkmoney.fraudbusters.management.service.NotificationServiceImpl; import com.rbkmoney.fraudbusters.management.service.NotificationTemplateServiceImpl; -import com.rbkmoney.swag.fraudbusters.management.model.Channel; -import com.rbkmoney.swag.fraudbusters.management.model.Notification; -import com.rbkmoney.swag.fraudbusters.management.model.ValidationError; -import com.rbkmoney.swag.fraudbusters.management.model.ValidationResponse; +import dev.vality.damsel.fraudbusters_notificator.*; +import dev.vality.swag.fraudbusters.management.model.Channel; +import dev.vality.swag.fraudbusters.management.model.Notification; +import dev.vality.swag.fraudbusters.management.model.ValidationError; +import dev.vality.swag.fraudbusters.management.model.ValidationResponse; import org.apache.thrift.TException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -31,8 +31,8 @@ import java.util.List; import java.util.stream.Collectors; -import static com.rbkmoney.damsel.fraudbusters_notificator.fraudbusters_notificatorConstants.VALIDATION_ERROR; import static com.rbkmoney.fraudbusters.management.controller.ErrorController.NOTIFICATOR_CALL_EXCEPTION; +import static dev.vality.damsel.fraudbusters_notificator.fraudbusters_notificatorConstants.VALIDATION_ERROR; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.*; @@ -74,7 +74,7 @@ void setup() { @Test void createChannelWithErrorCall() throws Exception { Channel channel = TestObjectFactory.testChannel(); - when(channelClient.create(any(com.rbkmoney.damsel.fraudbusters_notificator.Channel.class))) + when(channelClient.create(any(dev.vality.damsel.fraudbusters_notificator.Channel.class))) .thenThrow(new TException()); mockMvc.perform(post("/notifications/channels") @@ -88,10 +88,10 @@ void createChannelWithErrorCall() throws Exception { @Test void createChannel() throws Exception { Channel channel = TestObjectFactory.testChannel(); - var convertChannel = new com.rbkmoney.damsel.fraudbusters_notificator.Channel() + var convertChannel = new dev.vality.damsel.fraudbusters_notificator.Channel() .setDestination(channel.getDestination()) .setName(channel.getName()); - when(channelClient.create(any(com.rbkmoney.damsel.fraudbusters_notificator.Channel.class))) + when(channelClient.create(any(dev.vality.damsel.fraudbusters_notificator.Channel.class))) .thenReturn(convertChannel); MvcResult result = mockMvc.perform(post("/notifications/channels") @@ -103,13 +103,13 @@ void createChannel() throws Exception { Channel resultChannel = objectMapper.readValue(result.getResponse().getContentAsString(), Channel.class); assertEquals(convertChannel.getName(), resultChannel.getName()); assertEquals(convertChannel.getDestination(), resultChannel.getDestination()); - verify(channelClient, times(1)).create(any(com.rbkmoney.damsel.fraudbusters_notificator.Channel.class)); + verify(channelClient, times(1)).create(any(dev.vality.damsel.fraudbusters_notificator.Channel.class)); } @Test void createOrUpdateNotificationWithErrorCall() throws Exception { Notification notification = TestObjectFactory.testNotification(); - when(notificationClient.create(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class))) + when(notificationClient.create(any(dev.vality.damsel.fraudbusters_notificator.Notification.class))) .thenThrow(new TException()); mockMvc.perform(post("/notifications") @@ -124,7 +124,7 @@ void createOrUpdateNotificationWithErrorCall() throws Exception { void createOrUpdateNotificationWithValidationErrorCall() throws Exception { Notification notification = TestObjectFactory.testNotification(); String reason = "Error call"; - when(notificationClient.create(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class))) + when(notificationClient.create(any(dev.vality.damsel.fraudbusters_notificator.Notification.class))) .thenThrow(new NotificationServiceException() .setCode(VALIDATION_ERROR) .setReason(reason)); @@ -140,11 +140,11 @@ void createOrUpdateNotificationWithValidationErrorCall() throws Exception { @Test void createOrUpdateNotification() throws Exception { Notification notification = TestObjectFactory.testNotification(); - var convertNotification = new com.rbkmoney.damsel.fraudbusters_notificator.Notification() + var convertNotification = new dev.vality.damsel.fraudbusters_notificator.Notification() .setName(notification.getName()) .setSubject(notification.getSubject()) .setTemplateId(notification.getTemplateId()); - when(notificationClient.create(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class))) + when(notificationClient.create(any(dev.vality.damsel.fraudbusters_notificator.Notification.class))) .thenReturn(convertNotification); MvcResult result = mockMvc.perform(post("/notifications") @@ -159,7 +159,7 @@ void createOrUpdateNotification() throws Exception { assertEquals(convertNotification.getSubject(), resultNotification.getSubject()); assertEquals(convertNotification.getTemplateId(), resultNotification.getTemplateId()); verify(notificationClient, times(1)) - .create(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class)); + .create(any(dev.vality.damsel.fraudbusters_notificator.Notification.class)); } @Test @@ -167,7 +167,7 @@ void removeChannelWithErrorCall() throws Exception { String channelName = TestObjectFactory.randomString(); doThrow(new TException()).when(channelClient).remove(channelName); - mockMvc.perform(delete("/notifications/channels/{name}", channelName)) + mockMvc.perform(delete("/notifications/channels/channel/{name}", channelName)) .andExpect(status().isBadGateway()) .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator remove channel"))); @@ -177,7 +177,7 @@ void removeChannelWithErrorCall() throws Exception { void removeChannel() throws Exception { String channelName = TestObjectFactory.randomString(); - mockMvc.perform(delete("/notifications/channels/{name}", channelName)) + mockMvc.perform(delete("/notifications/channels/channel/{name}", channelName)) .andExpect(status().isNoContent()) .andReturn(); @@ -209,7 +209,7 @@ void removeNotification() throws Exception { @Test void validateNotificationWithErrorCall() throws Exception { Notification notification = TestObjectFactory.testNotification(); - when(notificationClient.validate(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class))) + when(notificationClient.validate(any(dev.vality.damsel.fraudbusters_notificator.Notification.class))) .thenThrow(new TException()); mockMvc.perform(post("/notifications/validation") @@ -223,9 +223,9 @@ void validateNotificationWithErrorCall() throws Exception { @Test void validateNotificationWithResult() throws Exception { Notification notification = TestObjectFactory.testNotification(); - var convertValidationResponse = new com.rbkmoney.damsel.fraudbusters_notificator.ValidationResponse(); + var convertValidationResponse = new dev.vality.damsel.fraudbusters_notificator.ValidationResponse(); convertValidationResponse.setResult(TestObjectFactory.randomString()); - when(notificationClient.validate(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class))) + when(notificationClient.validate(any(dev.vality.damsel.fraudbusters_notificator.Notification.class))) .thenReturn(convertValidationResponse); MvcResult result = mockMvc.perform(post("/notifications/validation") @@ -245,10 +245,10 @@ void validateNotificationWithResult() throws Exception { @Test void validateNotificationWithErrors() throws Exception { Notification notification = TestObjectFactory.testNotification(); - var convertValidationResponse = new com.rbkmoney.damsel.fraudbusters_notificator.ValidationResponse(); + var convertValidationResponse = new dev.vality.damsel.fraudbusters_notificator.ValidationResponse(); List errors = List.of(TestObjectFactory.randomString(), TestObjectFactory.randomString()); convertValidationResponse.setErrors(errors); - when(notificationClient.validate(any(com.rbkmoney.damsel.fraudbusters_notificator.Notification.class))) + when(notificationClient.validate(any(dev.vality.damsel.fraudbusters_notificator.Notification.class))) .thenReturn(convertValidationResponse); MvcResult result = mockMvc.perform(post("/notifications/validation") @@ -381,8 +381,8 @@ void getChannelByID() throws Exception { .getById(name)) .thenReturn(channel); - mockMvc.perform(get("/notifications/channels/{id}", name) - .contentType(MediaType.APPLICATION_JSON)) + mockMvc.perform(get("/notifications/channels/channel/{id}", name) + .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.name", is(channel.getName()))) .andExpect(jsonPath("$.destination", is(channel.getDestination()))); @@ -395,8 +395,8 @@ void getChannelByIDWithErrorCall() throws Exception { .getById(name)) .thenThrow(new TException()); - mockMvc.perform(get("/notifications/channels/{name}", name) - .contentType(MediaType.APPLICATION_JSON)) + mockMvc.perform(get("/notifications/channels/channel/{name}", name) + .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isBadGateway()) .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getById channel"))); @@ -404,13 +404,13 @@ void getChannelByIDWithErrorCall() throws Exception { @Test void updateNotificationStatusWithErrorCall() throws Exception { - var status = com.rbkmoney.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue(); + var status = dev.vality.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue(); long id = 1L; doThrow(new TException()).when(notificationClient).updateStatus(id, NotificationStatus.valueOf(status)); mockMvc.perform(put("/notifications/{id}/status", id) - .contentType(MediaType.APPLICATION_JSON) - .content(com.rbkmoney.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue())) + .contentType(MediaType.APPLICATION_JSON) + .content(dev.vality.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue())) .andExpect(status().isBadGateway()) .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator update notification status"))); @@ -420,12 +420,12 @@ void updateNotificationStatusWithErrorCall() throws Exception { @Test void updateNotificationStatus() throws Exception { - var status = com.rbkmoney.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue(); + var status = dev.vality.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue(); long id = 1L; mockMvc.perform(put("/notifications/{id}/status", id) - .contentType(MediaType.APPLICATION_JSON) - .content(com.rbkmoney.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue())) + .contentType(MediaType.APPLICATION_JSON) + .content(dev.vality.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue())) .andExpect(status().isNoContent()) .andReturn(); @@ -448,7 +448,7 @@ void getChannelTypesWithErrorCall() throws Exception { @Test void getChannelTypes() throws Exception { var channelTypes = - List.of(com.rbkmoney.swag.fraudbusters.management.model.ChannelType.MAIL.getValue()); + List.of(dev.vality.swag.fraudbusters.management.model.ChannelType.MAIL.getValue()); when(channelClient.getAllTypes()).thenReturn(new ChannelTypeListResponse().setChannelTypes(channelTypes)); mockMvc.perform(get("/notifications/channels/types")) diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java index 3a7597b0..04616d17 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java @@ -1,13 +1,13 @@ package com.rbkmoney.fraudbusters.management.resource.payment; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataServiceSrv; import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; import com.rbkmoney.fraudbusters.management.service.payment.PaymentsDataSetService; import com.rbkmoney.fraudbusters.management.utils.DataSourceBeanUtils; -import com.rbkmoney.swag.fraudbusters.management.model.DataSet; -import com.rbkmoney.swag.fraudbusters.management.model.Payment; +import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; +import dev.vality.swag.fraudbusters.management.model.DataSet; +import dev.vality.swag.fraudbusters.management.model.Payment; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java index 768020b3..3a6971e5 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.resource.payment; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataResponse; -import com.rbkmoney.damsel.fraudbusters.HistoricalDataServiceSrv; +import dev.vality.damsel.fraudbusters.HistoricalDataResponse; +import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java index b5f12ece..5c30835c 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java @@ -1,6 +1,5 @@ package com.rbkmoney.fraudbusters.management.resource.payment; -import com.rbkmoney.damsel.wb_list.ListType; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordsModelToWbListRecordConverter; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; @@ -10,6 +9,7 @@ import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; import com.rbkmoney.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; +import dev.vality.damsel.wb_list.ListType; import org.apache.commons.compress.utils.IOUtils; import org.apache.thrift.TException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java index ed0e47cd..0cb09145 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java @@ -1,9 +1,9 @@ package com.rbkmoney.fraudbusters.management.resource.payment; -import com.rbkmoney.damsel.fraudbusters.PaymentServiceSrv; import com.rbkmoney.fraudbusters.management.service.payment.PaymentLoadDataService; import com.rbkmoney.fraudbusters.management.utils.UserInfoService; import com.rbkmoney.fraudbusters.management.utils.parser.CsvFraudPaymentParser; +import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import org.apache.commons.compress.utils.IOUtils; import org.apache.thrift.TException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java b/src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java index b3b62b56..90586517 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.resource.utils; -import com.rbkmoney.damsel.domain.*; -import com.rbkmoney.damsel.fraudbusters.ClientInfo; -import com.rbkmoney.damsel.fraudbusters.*; +import dev.vality.damsel.domain.*; +import dev.vality.damsel.fraudbusters.ClientInfo; +import dev.vality.damsel.fraudbusters.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java index ab79bd50..4beb0d76 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java @@ -1,10 +1,10 @@ package com.rbkmoney.fraudbusters.management.service; -import com.rbkmoney.damsel.wb_list.Command; -import com.rbkmoney.damsel.wb_list.ListType; -import com.rbkmoney.damsel.wb_list.Row; import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.damsel.wb_list.Command; +import dev.vality.damsel.wb_list.ListType; +import dev.vality.damsel.wb_list.Row; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java b/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java index b89bf654..3a1c25c1 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java @@ -2,7 +2,7 @@ import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.swag.fraudbusters.management.model.Payment; +import dev.vality.swag.fraudbusters.management.model.Payment; import java.time.LocalDateTime; import java.util.List; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java index a40ba2e6..47ef0777 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java @@ -6,8 +6,8 @@ import com.rbkmoney.fraudbusters.management.dao.payment.dataset.PaymentDaoImpl; import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.domain.tables.records.TestPaymentRecord; import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.domain.tables.records.TestPaymentRecord; import org.jooq.DSLContext; import org.jooq.Result; import org.junit.jupiter.api.Test; @@ -17,8 +17,8 @@ import java.time.LocalDateTime; import java.util.List; -import static com.rbkmoney.fraudbusters.management.domain.tables.TestPayment.TEST_PAYMENT; import static com.rbkmoney.fraudbusters.management.service.payment.DataSetModelUtils.TEST_INITIATOR; +import static dev.vality.fraudbusters.management.domain.tables.TestPayment.TEST_PAYMENT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java index fbe8c4bd..a2a9bd43 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java @@ -1,8 +1,8 @@ package com.rbkmoney.fraudbusters.management.utils; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.damsel.wb_list.RowInfo; -import com.rbkmoney.swag.fraudbusters.management.model.CountInfo; +import dev.vality.damsel.wb_list.RowInfo; +import dev.vality.swag.fraudbusters.management.model.CountInfo; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java index bf671253..64c0a6e2 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java @@ -1,7 +1,7 @@ package com.rbkmoney.fraudbusters.management.utils; -import com.rbkmoney.damsel.fraudbusters.FraudPayment; import com.rbkmoney.fraudbusters.management.utils.parser.CsvFraudPaymentParser; +import dev.vality.damsel.fraudbusters.FraudPayment; import org.apache.commons.compress.utils.IOUtils; import org.apache.thrift.TException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java b/src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java index 004e8e7a..54410cd2 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java @@ -1,12 +1,12 @@ package com.rbkmoney.fraudbusters.management.utils; -import com.rbkmoney.damsel.domain.BankCard; -import com.rbkmoney.damsel.domain.Cash; -import com.rbkmoney.damsel.domain.CurrencyRef; -import com.rbkmoney.damsel.domain.PaymentTool; -import com.rbkmoney.damsel.fraudbusters.*; -import com.rbkmoney.swag.fraudbusters.management.model.ApplyRuleOnHistoricalDataSetRequest; -import com.rbkmoney.swag.fraudbusters.management.model.PaymentReference; +import dev.vality.damsel.domain.BankCard; +import dev.vality.damsel.domain.Cash; +import dev.vality.damsel.domain.CurrencyRef; +import dev.vality.damsel.domain.PaymentTool; +import dev.vality.damsel.fraudbusters.*; +import dev.vality.swag.fraudbusters.management.model.ApplyRuleOnHistoricalDataSetRequest; +import dev.vality.swag.fraudbusters.management.model.PaymentReference; import org.springframework.util.LinkedMultiValueMap; import java.util.List; @@ -28,15 +28,15 @@ public static HistoricalDataSetCheckResult createHistoricalResponse() { .setTransaction(createDamselPayment()))); } - public static com.rbkmoney.swag.fraudbusters.management.model.Payment createPayment() { - return new com.rbkmoney.swag.fraudbusters.management.model.Payment() + public static dev.vality.swag.fraudbusters.management.model.Payment createPayment() { + return new dev.vality.swag.fraudbusters.management.model.Payment() .amount(100L) .currency("RUB") .id("1") .mobile(false) .recurrent(false) - .status(com.rbkmoney.swag.fraudbusters.management.model.Payment.StatusEnum.CAPTURED) - .merchantInfo(new com.rbkmoney.swag.fraudbusters.management.model.MerchantInfo() + .status(dev.vality.swag.fraudbusters.management.model.Payment.StatusEnum.CAPTURED) + .merchantInfo(new dev.vality.swag.fraudbusters.management.model.MerchantInfo() .partyId(PARTY_ID) .shopId(SHOP_ID)); } @@ -54,7 +54,7 @@ public static Payment createDamselPayment() { } public static ApplyRuleOnHistoricalDataSetRequest createApplyRequst( - com.rbkmoney.swag.fraudbusters.management.model.Payment payment) { + dev.vality.swag.fraudbusters.management.model.Payment payment) { return new ApplyRuleOnHistoricalDataSetRequest() .dataSetId(1L) .reference(new PaymentReference() From d6e3c3d2531e40fc6574c9fe09e791180e8ef491 Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Thu, 27 Jan 2022 18:05:36 +0300 Subject: [PATCH 3/9] fix workflows --- .github/workflows/build.yml | 20 ++---------------- .github/workflows/deploy.yml | 40 ++++++------------------------------ 2 files changed, 8 insertions(+), 52 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55d968c8..f547e2c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build Artifact +name: Maven Build Artifact on: pull_request: @@ -7,20 +7,4 @@ on: jobs: build: - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - uses: actions/checkout@v2 - - - name: Checkout GitHub Action Repo - uses: actions/checkout@v2 - with: - repository: valitydev/action-jdk-build - ref: v1.0.17 - path: .github/actions/action-jdk-build - - - name: Run Build Java - uses: ./.github/actions/action-jdk-build - with: - github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}' - github-user: 'strug' \ No newline at end of file + uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@v1 \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 47ef39a9..eb9016e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy Docker Image +name: Maven Deploy Artifact on: push: @@ -11,36 +11,8 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: - build-and-deploy: - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - uses: actions/checkout@v2 - - - name: Checkout GitHub Action JDK Build Repo - uses: actions/checkout@v2 - with: - repository: valitydev/action-jdk-build - ref: v1.0.17 - path: .github/actions/action-jdk-build - - - name: Checkout GitHub Action Deploy Docker Repo - uses: actions/checkout@v2 - with: - repository: valitydev/action-deploy-docker - ref: v1.0.13 - path: .github/actions/action-deploy-docker - - - name: Run Build Java - uses: ./.github/actions/action-jdk-build - with: - github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}' - github-user: 'strug' - - - name: Deploy image - uses: ./.github/actions/action-deploy-docker - with: - registry-username: ${{ github.actor }} - registry-access-token: ${{ secrets.GITHUB_TOKEN }} - env: - ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} \ No newline at end of file + 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 From b1e687aa2967a326ecfdc961f35033e0ded8ab3f Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Thu, 27 Jan 2022 18:18:45 +0300 Subject: [PATCH 4/9] fix --- .../domain/payment/DefaultPaymentReferenceModel.java | 6 ++---- .../converter/payment/RowToWbListRecordsConverterTest.java | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java b/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java index 84802bee..f733cf27 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java @@ -1,14 +1,12 @@ package com.rbkmoney.fraudbusters.management.domain.payment; import com.rbkmoney.fraudbusters.management.domain.DefaultReferenceModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; import lombok.experimental.SuperBuilder; @Data @SuperBuilder +@AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java b/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java index 731c976a..d369b1fb 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java +++ b/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java @@ -11,6 +11,7 @@ import java.time.ZoneOffset; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; From b8898d8ff1dc440307de2b6048661feb9a3931ae Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Fri, 28 Jan 2022 14:27:55 +0300 Subject: [PATCH 5/9] some fixes --- pom.xml | 26 +++++++++---------- .../management/config/KafkaConfig.java | 8 +++--- .../management/listener/CommandListener.java | 11 +++----- .../management/utils/RowUtilsService.java | 19 +++++--------- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index aa1e169f..d0296185 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,7 @@ 8080 8023 ${server.port} ${management.port} - dr2.rbkmoney.com - 5.2.3 + 1.4.2.Final fraudbusters 5432 jdbc:postgresql://localhost:${db.port}/${db.name} @@ -47,8 +46,11 @@ com.rbkmoney - spring-boot-starter-metrics-statsd - 1.1.2 + custom-metrics-spring-boot-starter + + + com.rbkmoney + custom-actuator-endpoints dev.vality.woody @@ -152,12 +154,6 @@ javax.servlet-api 4.0.1 - - org.projectlombok - lombok - ${lombok.version} - provided - org.flywaydb flyway-core @@ -181,13 +177,18 @@ org.mapstruct mapstruct-processor - 1.4.2.Final + ${mapstruct.version} + provided + + + org.projectlombok + lombok provided org.mapstruct mapstruct - 1.4.2.Final + ${mapstruct.version} org.apache.commons @@ -298,7 +299,6 @@ org.flywaydb flyway-maven-plugin - ${flyway.version} ${db.url} ${db.user} diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java b/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java index 0dc81b20..aca997be 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java @@ -21,8 +21,8 @@ import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; import org.springframework.kafka.config.KafkaListenerContainerFactory; import org.springframework.kafka.core.*; +import org.springframework.kafka.listener.CommonLoggingErrorHandler; import org.springframework.kafka.listener.ConcurrentMessageListenerContainer; -import org.springframework.kafka.listener.LoggingErrorHandler; import java.io.File; import java.util.HashMap; @@ -81,7 +81,7 @@ public KafkaListenerContainerFactory factory = new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerFactory); - factory.setErrorHandler(new LoggingErrorHandler()); + factory.setCommonErrorHandler(new CommonLoggingErrorHandler()); return factory; } @@ -114,7 +114,7 @@ public KafkaListenerContainerFactory factory = new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerReferenceInfoFactory); - factory.setErrorHandler(new LoggingErrorHandler()); + factory.setCommonErrorHandler(new CommonLoggingErrorHandler()); return factory; } @@ -151,7 +151,7 @@ private KafkaListenerContainerFactory factory = new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(consumerReferenceFactory); - factory.setErrorHandler(new LoggingErrorHandler()); + factory.setCommonErrorHandler(new CommonLoggingErrorHandler()); factory.setConcurrency(1); return factory; } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java b/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java index 25dd35bd..bb14ee53 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java @@ -13,14 +13,9 @@ protected void handle(Command command, Converter converter, Cons Consumer deleteConsumer) { R model = converter.convert(command); switch (command.getCommandType()) { - case CREATE: - createConsumer.accept(model); - break; - case DELETE: - deleteConsumer.accept(model); - break; - default: - log.warn("CommandType not found! groupModel: {}", model); + case CREATE -> createConsumer.accept(model); + case DELETE -> deleteConsumer.accept(model); + default -> log.warn("CommandType not found! groupModel: {}", model); } } } diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java index 6a9deb05..1fe3ebb1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java @@ -21,18 +21,13 @@ public class RowUtilsService { private final ObjectMapper objectMapper; public ListType initListType(Row destination) { - switch (destination.getListType()) { - case grey: - return ListType.grey; - case black: - return ListType.black; - case white: - return ListType.white; - case naming: - return ListType.naming; - default: - throw new RuntimeException("Unknown list type!"); - } + return switch (destination.getListType()) { + case grey -> ListType.grey; + case black -> ListType.black; + case white -> ListType.white; + case naming -> ListType.naming; + default -> throw new RuntimeException("Unknown list type!"); + }; } public String initRowInfo(Row destination) { From ca6f07976ee44481dd21b352d4716fd217316205 Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Fri, 28 Jan 2022 15:00:43 +0300 Subject: [PATCH 6/9] try to fix compile error --- pom.xml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index d0296185..ccd88fae 100644 --- a/pom.xml +++ b/pom.xml @@ -174,12 +174,6 @@ jooq ${jooq.version} - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - provided - org.projectlombok lombok @@ -270,6 +264,32 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 15 + 15 + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + + org.apache.maven.plugins maven-remote-resources-plugin From 52030d1fdd29fbae3316c4e3aa355f729b70b67e Mon Sep 17 00:00:00 2001 From: ggmaleva Date: Sat, 29 Jan 2022 16:55:04 +0300 Subject: [PATCH 7/9] fix codacy --- .../rbkmoney/fraudbusters/management/utils/RowUtilsService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java b/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java index 1fe3ebb1..9694af8c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java +++ b/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java @@ -26,7 +26,6 @@ public ListType initListType(Row destination) { case black -> ListType.black; case white -> ListType.white; case naming -> ListType.naming; - default -> throw new RuntimeException("Unknown list type!"); }; } From 99c71970b5ca52f19b14ce771c6b1c713a9e6db7 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Mon, 31 Jan 2022 17:30:41 +0300 Subject: [PATCH 8/9] Fix actions pack --- pom.xml | 28 +++++++++-- .../FraudbustersManagementApplication.java | 2 +- .../config/DebugSecurityConfig.java | 2 +- .../management/config/KafkaConfig.java | 8 +-- .../management/config/NotificatorConfig.java | 2 +- .../config/PaymentFraudoConfig.java | 16 +++--- .../management/config/RestTemplateConfig.java | 2 +- .../management/config/ScheduleConfig.java | 2 +- .../management/config/SecurityConfig.java | 2 +- .../constant/CsvFraudPaymentFields.java | 2 +- .../constant/CsvPaymentListLoadFields.java | 2 +- .../controller/ErrorController.java | 10 ++-- .../converter/CommandToAuditLogConverter.java | 2 +- .../CommandToGroupModelConverter.java | 6 +-- .../CommandToTemplateModelConverter.java | 4 +- ...onAuditInternalToCommonAuditConverter.java | 2 +- .../converter/EventToAuditLogConverter.java | 2 +- .../GroupModelToCommandConverter.java | 4 +- .../converter/ListRecordToRowConverter.java | 4 +- .../TemplateModelToCommandConverter.java | 4 +- ...tToEmulationRuleApplyRequestConverter.java | 2 +- .../ChargebackToApiChargebackConverter.java | 4 +- ...aSetModelToCheckedDataSetApiConverter.java | 4 +- ...mentModelToCheckedDataSetRowConverter.java | 4 +- ...ToPaymentGroupReferenceModelConverter.java | 4 +- ...mmandToPaymentReferenceModelConverter.java | 4 +- .../DataSetModelToDataSetApiConverter.java | 4 +- ...DataSetRowToTestPaymentModelConverter.java | 6 +-- .../DataSetToTestDataSetModelConverter.java | 6 +-- ...renceModelToPaymentReferenceConverter.java | 6 +-- .../payment/EventToListRecordConverter.java | 2 +- ...audPaymentInfoToFraudPaymentConverter.java | 2 +- .../FraudResultToInspectResultConverter.java | 2 +- .../payment/GroupModelToGroupConverter.java | 6 +-- .../payment/GroupToCommandConverter.java | 2 +- ...ultToTestCheckedDataSetModelConverter.java | 6 +-- .../payment/ListToListConverter.java | 2 +- .../payment/PaymentApiToPaymentConverter.java | 2 +- ...PaymentCountInfoRequestToRowConverter.java | 4 +- ...GroupReferenceModelToCommandConverter.java | 2 +- ...ferenceModelToGroupReferenceConverter.java | 6 +-- .../PaymentListRecordToRowConverter.java | 2 +- .../PaymentModelToDataSetRowConverter.java | 4 +- .../PaymentModelToPaymentApiConverter.java | 4 +- ...ymentReferenceModelToCommandConverter.java | 4 +- ...renceModelToPaymentReferenceConverter.java | 6 +-- .../payment/PaymentToApiPaymentConverter.java | 4 +- .../PaymentToTestPaymentModelConverter.java | 21 ++++---- .../PriorityModelToPriorityIdConverter.java | 4 +- .../payment/ReferenceToCommandConverter.java | 2 +- .../payment/RefundToApiRefundConverter.java | 4 +- .../payment/RowToWbListRecordsConverter.java | 4 +- .../TemplateModelToTemplateConverter.java | 4 +- .../payment/TemplateToCommandConverter.java | 2 +- ...rsToValidateTemplateResponseConverter.java | 2 +- .../payment/WbListRecordToRowConverter.java | 2 +- ...stRecordsModelToWbListRecordConverter.java | 2 +- ...ecordsToCountInfoListRequestConverter.java | 4 +- .../WbListRecordsToListRecordConverter.java | 4 +- .../management/dao/AbstractDao.java | 6 +-- .../fraudbusters/management/dao/CdDao.java | 2 +- .../management/dao/DefaultReferenceDao.java | 6 +-- .../fraudbusters/management/dao/GroupDao.java | 4 +- .../management/dao/GroupReferenceDao.java | 4 +- .../management/dao/ReferenceDao.java | 4 +- .../management/dao/TemplateDao.java | 6 +-- .../management/dao/audit/CommandAuditDao.java | 4 +- .../dao/audit/CommandAuditDaoImpl.java | 6 +-- .../dao/condition/ConditionField.java | 2 +- .../condition/ConditionParameterSource.java | 2 +- .../dao/condition/SimpleConditionField.java | 2 +- .../DefaultPaymentReferenceDaoImpl.java | 10 ++-- .../dataset/DataSetCheckingResultDao.java | 4 +- .../dataset/DataSetCheckingResultDaoImpl.java | 12 ++--- .../dao/payment/dataset/DataSetDao.java | 6 +-- .../dao/payment/dataset/DataSetDaoImpl.java | 10 ++-- .../dao/payment/dataset/PaymentDao.java | 4 +- .../dao/payment/dataset/PaymentDaoImpl.java | 6 +-- .../mapper/CheckedPaymentModelRowMapper.java | 6 +-- .../dataset/mapper/DataSetRowMapper.java | 4 +- .../payment/group/GroupReferenceDaoImpl.java | 10 ++-- .../dao/payment/group/PaymentGroupDao.java | 14 +++--- .../group/PaymentGroupReferenceDao.java | 8 +-- .../payment/group/model/GroupPriorityRow.java | 4 +- .../reference/PaymentReferenceDao.java | 8 +-- .../reference/PaymentReferenceDaoImpl.java | 10 ++-- .../payment/template/PaymentTemplateDao.java | 12 ++--- .../dao/payment/wblist/WbListDao.java | 6 +-- .../dao/payment/wblist/WbListDaoImpl.java | 8 +-- .../domain/CommandAuditFilterResponse.java | 2 +- .../management/domain/CountInfo.java | 2 +- .../domain/DefaultReferenceModel.java | 2 +- .../management/domain/ErrorTemplateModel.java | 2 +- .../management/domain/GroupModel.java | 2 +- .../domain/GroupReferenceModel.java | 2 +- .../management/domain/ListRecord.java | 2 +- .../management/domain/PriorityIdModel.java | 2 +- .../management/domain/ReferenceModel.java | 2 +- .../management/domain/TemplateModel.java | 2 +- .../domain/payment/CheckedDataSetModel.java | 2 +- .../domain/payment/CheckedPaymentModel.java | 2 +- .../domain/payment/DataSetModel.java | 2 +- .../payment/DefaultPaymentReferenceModel.java | 4 +- .../domain/payment/PaymentCountInfo.java | 4 +- .../payment/PaymentGroupReferenceModel.java | 4 +- .../domain/payment/PaymentListRecord.java | 4 +- .../domain/payment/PaymentModel.java | 2 +- .../domain/payment/PaymentReferenceModel.java | 4 +- .../payment/request/AddReferencesRequest.java | 2 +- .../request/ListRowsInsertRequest.java | 4 +- .../domain/request/FilterRequest.java | 2 +- .../response/CreateTemplateResponse.java | 2 +- .../domain/response/ErrorResponse.java | 2 +- .../domain/response/FilterResponse.java | 2 +- .../response/ValidateTemplatesResponse.java | 4 +- .../exception/DateFormatException.java | 2 +- .../exception/KafkaProduceException.java | 2 +- .../KafkaSerializationException.java | 2 +- .../exception/NotFoundException.java | 2 +- .../exception/NotificatorCallException.java | 2 +- .../exception/UnknownEventException.java | 2 +- .../exception/UnknownPaymentException.java | 2 +- .../exception/UnknownReferenceException.java | 2 +- .../exception/ValidationException.java | 2 +- ...knownPaymentTemplateInReferenceFilter.java | 4 +- .../management/listener/CommandListener.java | 2 +- .../InitiatingEntityEventSinkListener.java | 10 ++-- .../listener/WbListEventListener.java | 12 ++--- .../payment/GroupReferenceListener.java | 10 ++-- .../payment/PaymentGroupListener.java | 10 ++-- .../payment/PaymentTemplateListener.java | 10 ++-- .../listener/payment/ReferenceListener.java | 12 ++--- .../management/resource/AuditResource.java | 10 ++-- .../notificator/NotificationResource.java | 18 +++---- .../notificator/converter/BiConverter.java | 2 +- .../converter/ChannelConverter.java | 2 +- .../converter/NotificationConverter.java | 2 +- .../NotificationTemplateConverter.java | 2 +- .../converter/ValidationConverter.java | 2 +- .../payment/PaymentDataSetsResource.java | 16 +++--- .../payment/PaymentEmulateResource.java | 10 ++-- .../payment/PaymentGroupsResource.java | 26 +++++----- .../PaymentHistoricalDataResource.java | 4 +- .../payment/PaymentLoadDataResource.java | 6 +-- .../payment/PaymentsListsResource.java | 16 +++--- .../payment/PaymentsReferenceResource.java | 30 ++++++------ .../payment/PaymentsTemplatesResource.java | 20 ++++---- .../serializer/CommandChangeDeserializer.java | 2 +- .../serializer/CommandFraudDeserializer.java | 2 +- .../serializer/EventDeserializer.java | 2 +- .../serializer/ReferenceInfoDeserializer.java | 2 +- .../management/service/AuditServiceImpl.java | 18 +++---- .../service/ChannelServiceImpl.java | 6 +-- .../management/service/CommandSender.java | 4 +- .../service/GreyRottenRuleCleanerService.java | 6 +-- .../service/NotificationServiceImpl.java | 6 +-- .../NotificationTemplateServiceImpl.java | 6 +-- .../service/TemplateCommandService.java | 6 +-- .../service/WbListCommandService.java | 4 +- .../service/iface/AuditService.java | 4 +- .../service/iface/ChannelService.java | 2 +- .../service/iface/NotificationService.java | 2 +- .../iface/NotificationTemplateService.java | 2 +- .../iface/ValidationTemplateService.java | 2 +- .../service/p2p/GroupModelCommandService.java | 4 +- .../payment/PaymentEmulateService.java | 20 ++++---- .../payment/PaymentGroupCommandService.java | 8 +-- .../PaymentGroupReferenceCommandService.java | 6 +-- .../payment/PaymentLoadDataService.java | 4 +- .../PaymentTemplateReferenceService.java | 6 +-- .../payment/PaymentValidationService.java | 6 +-- .../payment/PaymentsDataSetService.java | 20 ++++---- .../PaymentsDefaultReferenceService.java | 10 ++-- .../service/payment/PaymentsListsService.java | 20 ++++---- .../payment/PaymentsReferenceService.java | 12 ++--- .../payment/PaymentsTemplatesService.java | 18 +++---- .../management/utils/CommandMapper.java | 2 +- .../management/utils/CountInfoApiUtils.java | 2 +- .../management/utils/CountInfoUtils.java | 4 +- .../management/utils/DateTimeUtils.java | 2 +- .../management/utils/FilterRequestUtils.java | 2 +- .../utils/GroupRowToModelMapper.java | 6 +-- .../management/utils/PagingDataUtils.java | 2 +- .../management/utils/ParametersService.java | 2 +- .../utils/PaymentCountInfoGenerator.java | 8 +-- .../utils/PaymentUnknownTemplateFinder.java | 2 +- .../utils/ReferenceKeyGenerator.java | 2 +- .../management/utils/RowUtilsService.java | 2 +- .../utils/UnknownTemplateFinder.java | 4 +- .../management/utils/UserInfoService.java | 2 +- .../management/utils/WbListUtils.java | 2 +- .../utils/parser/CsvFraudPaymentParser.java | 6 +-- .../management/utils/parser/CsvParser.java | 2 +- .../parser/CsvPaymentCountInfoParser.java | 8 +-- .../management/ExceptionApplicationTest.java | 30 ++++++------ .../management/TestObjectFactory.java | 8 +-- .../management/config/ConsumerConfig.java | 4 +- .../management/config/KafkaITest.java | 2 +- .../config/PostgresqlJooqITest.java | 2 +- .../EventToAuditLogConverterTest.java | 2 +- .../RowToWbListRecordsConverterTest.java | 6 +-- ...ModelToCheckedDataSetApiConverterTest.java | 4 +- ...ultToTestCheckedDataSetModelConverter.java | 6 +-- .../dao/audit/CommandAuditDaoImplTest.java | 6 +-- .../dao/group/GroupReferenceDaoImplTest.java | 15 +++--- .../dao/group/PaymentGroupDaoTest.java | 16 +++--- .../DefaultPaymentReferenceDaoImplTest.java | 8 +-- .../PaymentGroupReferenceDaoImplTest.java | 8 +-- .../dao/payment/PaymentTemplateDaoTest.java | 12 ++--- .../dao/payment/ReferenceDaoImplTest.java | 29 +++++------ .../TestDataSetCheckingResultDaoImpl.java | 12 ++--- .../dao/payment/wblist/WbListDaoImplTest.java | 49 ++++++++++--------- .../management/kafka/DeleteFromListTest.java | 10 ++-- .../management/kafka/InsertInListTest.java | 16 +++--- .../kafka/TemplateApplicationTest.java | 38 +++++++------- .../kafka/WbListApplicationTest.java | 18 +++---- ...InitiatingEntityEventSinkListenerTest.java | 10 ++-- .../resource/AuditResourceTest.java | 6 +-- .../resource/PaymentEmulateResourceTest.java | 36 +++++++------- .../notificator/NotificationResourceTest.java | 48 +++++++++--------- .../payment/PaymentDataSetsResourceTest.java | 10 ++-- .../PaymentHistoricalDataResourceTest.java | 14 +++--- .../PaymentListLoadDataResourceTest.java | 22 ++++----- .../payment/PaymentLoadDataResourceTest.java | 8 +-- .../utils/ExternalModelBeanFactory.java | 2 +- .../GreyRottenRuleCleanerServiceTest.java | 11 ++--- .../service/payment/DataSetModelUtils.java | 6 +-- .../payment/PaymentsDataSetServiceTest.java | 20 ++++---- .../utils/CountInfoApiUtilsTest.java | 2 +- .../utils/CsvFraudPaymentParserTest.java | 4 +- .../management/utils/DataSourceBeanUtils.java | 2 +- .../management/utils/MethodPaths.java | 2 +- 232 files changed, 785 insertions(+), 764 deletions(-) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/FraudbustersManagementApplication.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/DebugSecurityConfig.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/KafkaConfig.java (96%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/NotificatorConfig.java (97%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/PaymentFraudoConfig.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/RestTemplateConfig.java (85%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/ScheduleConfig.java (78%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/SecurityConfig.java (98%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/constant/CsvFraudPaymentFields.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/constant/CsvPaymentListLoadFields.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/controller/ErrorController.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/CommandToAuditLogConverter.java (96%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/CommandToGroupModelConverter.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/CommandToTemplateModelConverter.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/EventToAuditLogConverter.java (96%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/GroupModelToCommandConverter.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/ListRecordToRowConverter.java (63%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/TemplateModelToCommandConverter.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java (97%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java (84%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java (89%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/EventToListRecordConverter.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/GroupToCommandConverter.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/ListToListConverter.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java (98%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java (78%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java (65%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java (65%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/TemplateToCommandConverter.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java (67%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/AbstractDao.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/CdDao.java (68%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/DefaultReferenceDao.java (60%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/GroupDao.java (74%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/GroupReferenceDao.java (62%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/ReferenceDao.java (65%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/TemplateDao.java (66%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/audit/CommandAuditDao.java (85%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/condition/ConditionField.java (74%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/condition/ConditionParameterSource.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/condition/SimpleConditionField.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java (55%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/DataSetDao.java (61%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/PaymentDao.java (66%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/group/PaymentGroupDao.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java (58%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java (56%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java (63%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java (89%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/wblist/WbListDao.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java (97%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/CommandAuditFilterResponse.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/CountInfo.java (73%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/DefaultReferenceModel.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/ErrorTemplateModel.java (77%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/GroupModel.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/GroupReferenceModel.java (78%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/ListRecord.java (77%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/PriorityIdModel.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/ReferenceModel.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/TemplateModel.java (85%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/CheckedDataSetModel.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/CheckedPaymentModel.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/DataSetModel.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java (70%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/PaymentCountInfo.java (53%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java (67%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/PaymentListRecord.java (67%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/PaymentModel.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/PaymentReferenceModel.java (71%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/request/AddReferencesRequest.java (69%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java (68%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/request/FilterRequest.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/response/CreateTemplateResponse.java (77%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/response/ErrorResponse.java (70%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/response/FilterResponse.java (81%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/domain/response/ValidateTemplatesResponse.java (57%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/DateFormatException.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/KafkaProduceException.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/KafkaSerializationException.java (81%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/NotFoundException.java (69%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/NotificatorCallException.java (84%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/UnknownEventException.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/UnknownPaymentException.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/UnknownReferenceException.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/exception/ValidationException.java (91%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/CommandListener.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/WbListEventListener.java (79%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/payment/GroupReferenceListener.java (74%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/payment/PaymentGroupListener.java (71%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/payment/PaymentTemplateListener.java (71%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/payment/ReferenceListener.java (71%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/AuditResource.java (89%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/NotificationResource.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/converter/BiConverter.java (52%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/converter/ChannelConverter.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/converter/NotificationConverter.java (97%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/converter/ValidationConverter.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentDataSetsResource.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentEmulateResource.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentGroupsResource.java (85%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java (99%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentLoadDataResource.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentsListsResource.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentsReferenceResource.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java (84%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/serializer/CommandChangeDeserializer.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/serializer/CommandFraudDeserializer.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/serializer/EventDeserializer.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/serializer/ReferenceInfoDeserializer.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/AuditServiceImpl.java (77%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/ChannelServiceImpl.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/CommandSender.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/GreyRottenRuleCleanerService.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/NotificationServiceImpl.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/NotificationTemplateServiceImpl.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/TemplateCommandService.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/WbListCommandService.java (95%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/iface/AuditService.java (77%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/iface/ChannelService.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/iface/NotificationService.java (86%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/iface/NotificationTemplateService.java (75%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/iface/ValidationTemplateService.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/p2p/GroupModelCommandService.java (78%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentEmulateService.java (76%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentGroupCommandService.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentLoadDataService.java (90%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java (77%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentValidationService.java (80%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentsDataSetService.java (79%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java (78%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentsListsService.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentsReferenceService.java (76%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentsTemplatesService.java (79%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/CommandMapper.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/CountInfoApiUtils.java (97%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/CountInfoUtils.java (93%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/DateTimeUtils.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/FilterRequestUtils.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/GroupRowToModelMapper.java (82%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/PagingDataUtils.java (85%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/ParametersService.java (87%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/PaymentCountInfoGenerator.java (83%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java (92%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/ReferenceKeyGenerator.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/RowUtilsService.java (97%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/UnknownTemplateFinder.java (84%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/UserInfoService.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/WbListUtils.java (94%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java (88%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/parser/CsvParser.java (96%) rename src/main/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java (89%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/ExceptionApplicationTest.java (85%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/TestObjectFactory.java (96%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/ConsumerConfig.java (81%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/KafkaITest.java (95%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/config/PostgresqlJooqITest.java (89%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/EventToAuditLogConverterTest.java (96%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java (90%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java (92%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java (82%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java (94%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java (89%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/group/PaymentGroupDaoTest.java (87%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java (92%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java (89%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java (92%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java (88%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java (87%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java (81%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/kafka/DeleteFromListTest.java (88%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/kafka/InsertInListTest.java (85%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/kafka/TemplateApplicationTest.java (85%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/kafka/WbListApplicationTest.java (91%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java (83%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/AuditResourceTest.java (92%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/PaymentEmulateResourceTest.java (79%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/notificator/NotificationResourceTest.java (90%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java (93%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java (94%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java (71%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java (84%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java (99%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java (81%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/DataSetModelUtils.java (87%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java (84%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/CountInfoApiUtilsTest.java (97%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/CsvFraudPaymentParserTest.java (91%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/DataSourceBeanUtils.java (98%) rename src/test/java/{com/rbkmoney => dev/vality}/fraudbusters/management/utils/MethodPaths.java (90%) diff --git a/pom.xml b/pom.xml index ccd88fae..45661d38 100644 --- a/pom.xml +++ b/pom.xml @@ -47,10 +47,22 @@ com.rbkmoney custom-metrics-spring-boot-starter + + + org.projectlombok + lombok + + com.rbkmoney custom-actuator-endpoints + + + org.projectlombok + lombok + + dev.vality.woody @@ -76,6 +88,12 @@ com.rbkmoney kafka-common-lib + + + org.projectlombok + lombok + + com.rbkmoney @@ -174,11 +192,11 @@ jooq ${jooq.version} - - org.projectlombok - lombok - provided - + + org.projectlombok + lombok + + org.mapstruct mapstruct diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/FraudbustersManagementApplication.java b/src/main/java/dev/vality/fraudbusters/management/FraudbustersManagementApplication.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/FraudbustersManagementApplication.java rename to src/main/java/dev/vality/fraudbusters/management/FraudbustersManagementApplication.java index 53fca71b..8a4c407c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/FraudbustersManagementApplication.java +++ b/src/main/java/dev/vality/fraudbusters/management/FraudbustersManagementApplication.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management; +package dev.vality.fraudbusters.management; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/DebugSecurityConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/DebugSecurityConfig.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/DebugSecurityConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/DebugSecurityConfig.java index 2aa0597a..4e3754d4 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/DebugSecurityConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/DebugSecurityConfig.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/KafkaConfig.java similarity index 96% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/KafkaConfig.java index aca997be..039f0f64 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/KafkaConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/KafkaConfig.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; -import com.rbkmoney.fraudbusters.management.serializer.CommandFraudDeserializer; -import com.rbkmoney.fraudbusters.management.serializer.EventDeserializer; -import com.rbkmoney.fraudbusters.management.serializer.ReferenceInfoDeserializer; +import dev.vality.fraudbusters.management.serializer.CommandFraudDeserializer; +import dev.vality.fraudbusters.management.serializer.EventDeserializer; +import dev.vality.fraudbusters.management.serializer.ReferenceInfoDeserializer; import com.rbkmoney.kafka.common.serialization.ThriftSerializer; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.ReferenceInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/NotificatorConfig.java similarity index 97% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/NotificatorConfig.java index ef465d59..2a008d61 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/NotificatorConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/NotificatorConfig.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import dev.vality.damsel.fraudbusters_notificator.ChannelServiceSrv; import dev.vality.damsel.fraudbusters_notificator.NotificationServiceSrv; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/PaymentFraudoConfig.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/PaymentFraudoConfig.java index 76446684..47832c77 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/PaymentFraudoConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/PaymentFraudoConfig.java @@ -1,11 +1,11 @@ -package com.rbkmoney.fraudbusters.management.config; - -import com.rbkmoney.fraudbusters.management.converter.TemplateModelToCommandConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.GroupToCommandConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToCommandConverter; -import com.rbkmoney.fraudbusters.management.service.CommandSender; -import com.rbkmoney.fraudbusters.management.service.TemplateCommandService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentGroupCommandService; +package dev.vality.fraudbusters.management.config; + +import dev.vality.fraudbusters.management.converter.TemplateModelToCommandConverter; +import dev.vality.fraudbusters.management.converter.payment.GroupToCommandConverter; +import dev.vality.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToCommandConverter; +import dev.vality.fraudbusters.management.service.CommandSender; +import dev.vality.fraudbusters.management.service.TemplateCommandService; +import dev.vality.fraudbusters.management.service.payment.PaymentGroupCommandService; import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/RestTemplateConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/RestTemplateConfig.java similarity index 85% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/RestTemplateConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/RestTemplateConfig.java index 70ad190f..4c0c36cc 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/RestTemplateConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/ScheduleConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/ScheduleConfig.java similarity index 78% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/ScheduleConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/ScheduleConfig.java index e20b0e47..d2ad0433 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/ScheduleConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/config/SecurityConfig.java b/src/main/java/dev/vality/fraudbusters/management/config/SecurityConfig.java similarity index 98% rename from src/main/java/com/rbkmoney/fraudbusters/management/config/SecurityConfig.java rename to src/main/java/dev/vality/fraudbusters/management/config/SecurityConfig.java index 8cc28d11..e2f32b08 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/config/SecurityConfig.java +++ b/src/main/java/dev/vality/fraudbusters/management/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver; import org.keycloak.adapters.springsecurity.KeycloakSecurityComponents; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/constant/CsvFraudPaymentFields.java b/src/main/java/dev/vality/fraudbusters/management/constant/CsvFraudPaymentFields.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/constant/CsvFraudPaymentFields.java rename to src/main/java/dev/vality/fraudbusters/management/constant/CsvFraudPaymentFields.java index 39398f25..75ef8126 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/constant/CsvFraudPaymentFields.java +++ b/src/main/java/dev/vality/fraudbusters/management/constant/CsvFraudPaymentFields.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.constant; +package dev.vality.fraudbusters.management.constant; public class CsvFraudPaymentFields { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/constant/CsvPaymentListLoadFields.java b/src/main/java/dev/vality/fraudbusters/management/constant/CsvPaymentListLoadFields.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/constant/CsvPaymentListLoadFields.java rename to src/main/java/dev/vality/fraudbusters/management/constant/CsvPaymentListLoadFields.java index 152cb8ac..7bc83062 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/constant/CsvPaymentListLoadFields.java +++ b/src/main/java/dev/vality/fraudbusters/management/constant/CsvPaymentListLoadFields.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.constant; +package dev.vality.fraudbusters.management.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java b/src/main/java/dev/vality/fraudbusters/management/controller/ErrorController.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java rename to src/main/java/dev/vality/fraudbusters/management/controller/ErrorController.java index 36a2cad1..6c7d0385 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/controller/ErrorController.java +++ b/src/main/java/dev/vality/fraudbusters/management/controller/ErrorController.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.controller; +package dev.vality.fraudbusters.management.controller; import com.rbkmoney.dao.DaoException; -import com.rbkmoney.fraudbusters.management.domain.response.ErrorResponse; -import com.rbkmoney.fraudbusters.management.exception.KafkaProduceException; -import com.rbkmoney.fraudbusters.management.exception.KafkaSerializationException; -import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; +import dev.vality.fraudbusters.management.domain.response.ErrorResponse; +import dev.vality.fraudbusters.management.exception.KafkaProduceException; +import dev.vality.fraudbusters.management.exception.KafkaSerializationException; +import dev.vality.fraudbusters.management.exception.NotificatorCallException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/CommandToAuditLogConverter.java similarity index 96% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/CommandToAuditLogConverter.java index 03ebcb09..dd4d77c9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToAuditLogConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/CommandToAuditLogConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; import com.fasterxml.jackson.databind.ObjectMapper; import com.rbkmoney.geck.common.util.TBaseUtil; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/CommandToGroupModelConverter.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/CommandToGroupModelConverter.java index 791cdd9e..f72f5f2e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToGroupModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/CommandToGroupModelConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.Group; import dev.vality.damsel.fraudbusters.PriorityId; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/CommandToTemplateModelConverter.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/CommandToTemplateModelConverter.java index 557a6ba9..a6a6e66c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommandToTemplateModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/CommandToTemplateModelConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.TemplateModel; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java index 4db1212f..43f5bb36 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/CommonAuditInternalToCommonAuditConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; import dev.vality.swag.fraudbusters.management.model.CommandAudit; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/EventToAuditLogConverter.java similarity index 96% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/EventToAuditLogConverter.java index 28f731c8..a0acc272 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/EventToAuditLogConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; import dev.vality.damsel.wb_list.Event; import dev.vality.fraudbusters.management.domain.enums.CommandType; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/GroupModelToCommandConverter.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/GroupModelToCommandConverter.java index bf934b17..f4990a3e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/GroupModelToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/GroupModelToCommandConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.GroupModel; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; import dev.vality.damsel.fraudbusters.Group; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/ListRecordToRowConverter.java similarity index 63% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/ListRecordToRowConverter.java index 4dd1246e..be3dac05 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/ListRecordToRowConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/ListRecordToRowConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; -import com.rbkmoney.fraudbusters.management.domain.ListRecord; +import dev.vality.fraudbusters.management.domain.ListRecord; import dev.vality.damsel.wb_list.Row; import org.mapstruct.Mapper; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/TemplateModelToCommandConverter.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/TemplateModelToCommandConverter.java index 58f87b72..70ef1302 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/TemplateModelToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/TemplateModelToCommandConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.TemplateModel; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; import dev.vality.damsel.fraudbusters.Template; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java similarity index 97% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java index 0b46eae8..f66374ab 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ApplyRuleOnHistoricalRequestToEmulationRuleApplyRequestConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.fraudbusters.*; import dev.vality.swag.fraudbusters.management.model.ApplyRuleOnHistoricalDataSetRequest; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java index b662f021..02edc92e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ChargebackToApiChargebackConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.Chargeback; import dev.vality.swag.fraudbusters.management.model.ClientInfo; import dev.vality.swag.fraudbusters.management.model.MerchantInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java index f7bba508..ef0259fd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CheckedDataSetModelToCheckedDataSetApiConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; import dev.vality.swag.fraudbusters.management.model.CheckedDataSet; import dev.vality.swag.fraudbusters.management.model.MerchantInfo; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java index 02056401..385101dc 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CheckedPaymentModelToCheckedDataSetRowConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedPaymentModel; import dev.vality.swag.fraudbusters.management.model.CheckedDataSetRow; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java similarity index 84% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java index b8ab8e11..eccbb81c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CommandToPaymentGroupReferenceModelConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.GroupReference; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java index 22d4fd2f..99687db8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/CommandToPaymentReferenceModelConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.TemplateReference; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java similarity index 89% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java index 6824ef5e..5242df13 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetModelToDataSetApiConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; import dev.vality.swag.fraudbusters.management.model.DataSet; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java index f1dfb931..12d0dfb9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetRowToTestPaymentModelConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.fraudbusters.management.exception.UnknownPaymentException; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.exception.UnknownPaymentException; import dev.vality.swag.fraudbusters.management.model.DataSetRow; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java index 61343020..37e3958f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DataSetToTestDataSetModelConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import dev.vality.swag.fraudbusters.management.model.DataSet; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java index d8db8973..cdfd4be4 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/DefaultPaymentReferenceModelToPaymentReferenceConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/EventToListRecordConverter.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/EventToListRecordConverter.java index 516eff9c..32a8a458 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/EventToListRecordConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/EventToListRecordConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.wb_list.Event; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java index 6af5653e..38e7bde6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/FraudPaymentInfoToFraudPaymentConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.swag.fraudbusters.management.model.FraudPayment; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java index 096cd6ec..c6996c43 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/FraudResultToInspectResultConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.swag.fraudbusters.management.model.InspectResult; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java index 266369c0..8655b46b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/GroupModelToGroupConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; import dev.vality.swag.fraudbusters.management.model.Group; import dev.vality.swag.fraudbusters.management.model.PriorityId; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/GroupToCommandConverter.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/GroupToCommandConverter.java index 3c317a7b..4a75886a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/GroupToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/GroupToCommandConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java index 908d23d6..e35616be 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/HistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedPaymentModel; import dev.vality.damsel.fraudbusters.HistoricalDataSetCheckResult; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ListToListConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ListToListConverter.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ListToListConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/ListToListConverter.java index d41a6a78..5dd984ca 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ListToListConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ListToListConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java similarity index 98% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java index 70c25ccb..b8fef3e5 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentApiToPaymentConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.domain.BankCard; import dev.vality.damsel.domain.Cash; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java index d5e5b848..b2f2c0ca 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentCountInfoRequestToRowConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.utils.CountInfoApiUtils; +import dev.vality.fraudbusters.management.utils.CountInfoApiUtils; import dev.vality.damsel.wb_list.Row; import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java index 632d988d..9ac9e015 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToCommandConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java index 975a33c5..b5d73448 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentGroupReferenceModelToGroupReferenceConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.GroupReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java index 76c88a05..1dac92e9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentListRecordToRowConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.wb_list.IdInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java index a5f242c6..572e0af6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentModelToDataSetRowConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import dev.vality.swag.fraudbusters.management.model.DataSetRow; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java index fd5627a7..f986a4d0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentModelToPaymentApiConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import dev.vality.swag.fraudbusters.management.model.Error; import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java index 3e7d9095..6f7494d3 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentReferenceModelToCommandConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; import dev.vality.damsel.fraudbusters.TemplateReference; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java index 79bac37f..a6f3d16f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentReferenceModelToPaymentReferenceConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java index 3d7d7c4e..378c65d2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentToApiPaymentConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.Error; import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java similarity index 78% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java index 98e6c3ff..f9324677 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PaymentToTestPaymentModelConverter.java @@ -1,14 +1,11 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; -import static com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel.PaymentModelBuilder; -import static com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel.builder; - @Component public class PaymentToTestPaymentModelConverter @@ -17,7 +14,7 @@ public class PaymentToTestPaymentModelConverter @NonNull @Override public PaymentModel convert(dev.vality.damsel.fraudbusters.Payment payment) { - PaymentModelBuilder builder = builder(); + PaymentModel.PaymentModelBuilder builder = PaymentModel.builder(); if (payment.isSetReferenceInfo()) { updateReferenceInfo(builder, payment.getReferenceInfo()); } @@ -48,26 +45,26 @@ public PaymentModel convert(dev.vality.damsel.fraudbusters.Payment payment) { .build(); } - private void updateError(PaymentModelBuilder builder, dev.vality.damsel.fraudbusters.Error error) { + private void updateError(PaymentModel.PaymentModelBuilder builder, dev.vality.damsel.fraudbusters.Error error) { builder.errorCode(error.getErrorCode()) .errorReason(error.getErrorReason()); } - private void updateClientInfo(PaymentModelBuilder builder, + private void updateClientInfo(PaymentModel.PaymentModelBuilder builder, dev.vality.damsel.fraudbusters.ClientInfo clientInfo) { builder.ip(clientInfo.getIp()) .fingerprint(clientInfo.getFingerprint()) .email(clientInfo.getEmail()); } - private void updateProviderInfo(PaymentModelBuilder builder, + private void updateProviderInfo(PaymentModel.PaymentModelBuilder builder, dev.vality.damsel.fraudbusters.ProviderInfo providerInfo) { builder.terminalId(providerInfo.getTerminalId()) .providerId(providerInfo.getProviderId()) .country(providerInfo.getCountry()); } - private void updateBankCardData(PaymentModelBuilder builder, + private void updateBankCardData(PaymentModel.PaymentModelBuilder builder, dev.vality.damsel.domain.BankCard bankCard) { builder.paymentSystem(bankCard.isSetPaymentSystem() ? bankCard.getPaymentSystem().getId() : null) .paymentCountry(bankCard.isSetIssuerCountry() ? bankCard.getIssuerCountry().name() : null) @@ -76,7 +73,7 @@ private void updateBankCardData(PaymentModelBuilder builder, .lastDigits(bankCard.getLastDigits()); } - private void updateReferenceInfo(PaymentModelBuilder builder, + private void updateReferenceInfo(PaymentModel.PaymentModelBuilder builder, dev.vality.damsel.fraudbusters.ReferenceInfo referenceInfo) { builder.partyId(referenceInfo.getMerchantInfo().getPartyId()) .shopId(referenceInfo.getMerchantInfo().getShopId()); diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java similarity index 65% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java index 1a078d15..e5b4332e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/PriorityModelToPriorityIdConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; import dev.vality.swag.fraudbusters.management.model.PriorityId; import org.mapstruct.Mapper; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java index c0b7ab3c..44462316 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/ReferenceToCommandConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java index 64902a33..733bb5ff 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/RefundToApiRefundConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.Error; import dev.vality.swag.fraudbusters.management.model.*; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java index 74f820ae..569dca00 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/RowToWbListRecordsConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.utils.RowUtilsService; +import dev.vality.fraudbusters.management.utils.RowUtilsService; import dev.vality.damsel.wb_list.PaymentId; import dev.vality.damsel.wb_list.Row; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java similarity index 65% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java index 5591e768..4630da48 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateModelToTemplateConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.TemplateModel; import dev.vality.swag.fraudbusters.management.model.Template; import org.mapstruct.Mapper; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateToCommandConverter.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateToCommandConverter.java index 4d436894..cb4c8e67 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateToCommandConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateToCommandConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandBody; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java index 63f03b81..1cd23f89 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/TemplateValidateErrorsToValidateTemplateResponseConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.fraudbusters.TemplateValidateError; import dev.vality.swag.fraudbusters.management.model.ErrorTemplate; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java index 4b50ae34..104ef68e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordToRowConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.damsel.wb_list.IdInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java index de20ee4c..42949f3d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsModelToWbListRecordConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import dev.vality.swag.fraudbusters.management.model.WbListRecord; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java index bfba609f..26e1d4b0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsToCountInfoListRequestConverter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; +import dev.vality.fraudbusters.management.utils.PaymentCountInfoGenerator; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java similarity index 67% rename from src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java rename to src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java index 793d9c33..ea6845cd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/converter/payment/WbListRecordsToListRecordConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.ListRecord; +import dev.vality.fraudbusters.management.domain.ListRecord; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import org.mapstruct.Mapper; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/AbstractDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/AbstractDao.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/AbstractDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/AbstractDao.java index 2bbdf9bd..6d87153a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/AbstractDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/AbstractDao.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; import com.rbkmoney.dao.impl.AbstractGenericDao; -import com.rbkmoney.fraudbusters.management.dao.condition.ConditionField; -import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; +import dev.vality.fraudbusters.management.dao.condition.ConditionField; +import dev.vality.fraudbusters.management.dao.condition.ConditionParameterSource; import org.jooq.Record; import org.jooq.*; import org.jooq.impl.DSL; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/CdDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/CdDao.java similarity index 68% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/CdDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/CdDao.java index 6d21988c..860a8a29 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/CdDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/CdDao.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; public interface CdDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/DefaultReferenceDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/DefaultReferenceDao.java similarity index 60% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/DefaultReferenceDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/DefaultReferenceDao.java index 4e48307d..68e6dcd0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/DefaultReferenceDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/DefaultReferenceDao.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; -import com.rbkmoney.fraudbusters.management.domain.DefaultReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.domain.DefaultReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/GroupDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/GroupDao.java similarity index 74% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/GroupDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/GroupDao.java index 5ad38870..3aaf9999 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/GroupDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/GroupDao.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.GroupModel; import org.codehaus.commons.nullanalysis.Nullable; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/GroupReferenceDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/GroupReferenceDao.java similarity index 62% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/GroupReferenceDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/GroupReferenceDao.java index 72535aad..a87cf47d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/GroupReferenceDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/GroupReferenceDao.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; -import com.rbkmoney.fraudbusters.management.domain.GroupReferenceModel; +import dev.vality.fraudbusters.management.domain.GroupReferenceModel; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/ReferenceDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/ReferenceDao.java similarity index 65% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/ReferenceDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/ReferenceDao.java index 66673ca2..a6afd613 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/ReferenceDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/ReferenceDao.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; -import com.rbkmoney.fraudbusters.management.domain.ReferenceModel; +import dev.vality.fraudbusters.management.domain.ReferenceModel; public interface ReferenceDao { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/TemplateDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/TemplateDao.java similarity index 66% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/TemplateDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/TemplateDao.java index 75c5ffe5..ac32bfe1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/TemplateDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/TemplateDao.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao; +package dev.vality.fraudbusters.management.dao; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDao.java similarity index 85% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDao.java index 2b721ad5..d16c4a74 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDao.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao.audit; +package dev.vality.fraudbusters.management.dao.audit; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import java.time.LocalDateTime; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java index 54786b23..559db97e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDaoImpl.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao.audit; +package dev.vality.fraudbusters.management.dao.audit; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import dev.vality.fraudbusters.management.domain.tables.records.CommandAuditRecord; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/ConditionField.java b/src/main/java/dev/vality/fraudbusters/management/dao/condition/ConditionField.java similarity index 74% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/ConditionField.java rename to src/main/java/dev/vality/fraudbusters/management/dao/condition/ConditionField.java index 9403f210..68312b13 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/ConditionField.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/condition/ConditionField.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.dao.condition; +package dev.vality.fraudbusters.management.dao.condition; import org.jooq.Comparator; import org.jooq.Field; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/ConditionParameterSource.java b/src/main/java/dev/vality/fraudbusters/management/dao/condition/ConditionParameterSource.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/ConditionParameterSource.java rename to src/main/java/dev/vality/fraudbusters/management/dao/condition/ConditionParameterSource.java index bca5f68f..3b0cbaad 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/ConditionParameterSource.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/condition/ConditionParameterSource.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.dao.condition; +package dev.vality.fraudbusters.management.dao.condition; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/SimpleConditionField.java b/src/main/java/dev/vality/fraudbusters/management/dao/condition/SimpleConditionField.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/SimpleConditionField.java rename to src/main/java/dev/vality/fraudbusters/management/dao/condition/SimpleConditionField.java index f72d252f..298d7b39 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/condition/SimpleConditionField.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/condition/SimpleConditionField.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.dao.condition; +package dev.vality.fraudbusters.management.dao.condition; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java index 54672dee..4cfc99dc 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImpl.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.dao.payment; +package dev.vality.fraudbusters.management.dao.payment; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.DefaultReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.DefaultReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.records.FDefaultRefRecord; import org.jooq.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java similarity index 55% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java index fbb1c19c..29f36c90 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDao.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; import java.util.Optional; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java index 5f1d6b4d..26d8a1ea 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetCheckingResultDaoImpl.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.mapper.CheckedPaymentModelRowMapper; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.mapper.DataSetRowMapper; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.payment.dataset.mapper.CheckedPaymentModelRowMapper; +import dev.vality.fraudbusters.management.dao.payment.dataset.mapper.DataSetRowMapper; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedPaymentModel; import org.jooq.Query; import org.jooq.Record; import org.jooq.SelectConditionStep; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetDao.java similarity index 61% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetDao.java index 70fb68ff..82d26290 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetDao.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java index 604b426a..7ff41428 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/DataSetDaoImpl.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.records.TestDataSetRecord; import org.jooq.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/PaymentDao.java similarity index 66% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/PaymentDao.java index 12f3eba6..6d7f6536 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/PaymentDao.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java index 894139aa..5953250e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/PaymentDaoImpl.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.records.TestPaymentRecord; import org.jooq.DeleteConditionStep; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java index 5569c894..883a64ed 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/mapper/CheckedPaymentModelRowMapper.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset.mapper; +package dev.vality.fraudbusters.management.dao.payment.dataset.mapper; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedPaymentModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java index 75fe2d05..dc8ad3da 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/dataset/mapper/DataSetRowMapper.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset.mapper; +package dev.vality.fraudbusters.management.dao.payment.dataset.mapper; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java index 49c55193..ff9855cb 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/GroupReferenceDaoImpl.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.group; +package dev.vality.fraudbusters.management.dao.payment.group; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.condition.ConditionParameterSource; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.records.FGroupReferenceRecord; import org.jooq.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/PaymentGroupDao.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/group/PaymentGroupDao.java index 8163c410..984b5ba9 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/PaymentGroupDao.java @@ -1,11 +1,11 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.group; +package dev.vality.fraudbusters.management.dao.payment.group; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.GroupDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.model.GroupPriorityRow; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.fraudbusters.management.utils.GroupRowToModelMapper; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.GroupDao; +import dev.vality.fraudbusters.management.dao.payment.group.model.GroupPriorityRow; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.utils.GroupRowToModelMapper; import dev.vality.fraudbusters.management.domain.tables.records.FGroupRecord; import org.jooq.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java similarity index 58% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java index c7d0884f..72da0329 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/PaymentGroupReferenceDao.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.group; +package dev.vality.fraudbusters.management.dao.payment.group; -import com.rbkmoney.fraudbusters.management.dao.GroupReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.GroupReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java similarity index 56% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java index 2f429e0d..02e51ded 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/group/model/GroupPriorityRow.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.group.model; +package dev.vality.fraudbusters.management.dao.payment.group.model; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java similarity index 63% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java index 9a65fdcc..ae9e227b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/reference/PaymentReferenceDao.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.reference; +package dev.vality.fraudbusters.management.dao.payment.reference; -import com.rbkmoney.fraudbusters.management.dao.ReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.ReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import java.util.List; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java index 2a48c113..d1e86183 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/reference/PaymentReferenceDaoImpl.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.reference; +package dev.vality.fraudbusters.management.dao.payment.reference; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.condition.ConditionParameterSource; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.records.FReferenceRecord; import org.jooq.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java similarity index 89% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java index 08605145..ca9b69bf 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/template/PaymentTemplateDao.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.template; +package dev.vality.fraudbusters.management.dao.payment.template; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.TemplateDao; -import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.TemplateDao; +import dev.vality.fraudbusters.management.dao.condition.ConditionParameterSource; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.tables.records.FTemplateRecord; import org.jooq.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDao.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDao.java index d6040eda..9de311c0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDao.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDao.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.wblist; +package dev.vality.fraudbusters.management.dao.payment.wblist; -import com.rbkmoney.fraudbusters.management.dao.CdDao; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.CdDao; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import dev.vality.fraudbusters.management.domain.enums.ListType; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import org.springframework.lang.NonNull; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java b/src/main/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java similarity index 97% rename from src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java rename to src/main/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java index 45518d81..d6de1bb1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImpl.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.wblist; +package dev.vality.fraudbusters.management.dao.payment.wblist; -import com.rbkmoney.fraudbusters.management.dao.AbstractDao; -import com.rbkmoney.fraudbusters.management.dao.condition.ConditionParameterSource; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.dao.AbstractDao; +import dev.vality.fraudbusters.management.dao.condition.ConditionParameterSource; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import com.rbkmoney.mapper.RecordRowMapper; import dev.vality.fraudbusters.management.domain.enums.ListType; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java b/src/main/java/dev/vality/fraudbusters/management/domain/CommandAuditFilterResponse.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java rename to src/main/java/dev/vality/fraudbusters/management/domain/CommandAuditFilterResponse.java index d808d1ab..94dd5204 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/CommandAuditFilterResponse.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/CommandAuditFilterResponse.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/CountInfo.java b/src/main/java/dev/vality/fraudbusters/management/domain/CountInfo.java similarity index 73% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/CountInfo.java rename to src/main/java/dev/vality/fraudbusters/management/domain/CountInfo.java index c29b2e36..8b459051 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/CountInfo.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/CountInfo.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/DefaultReferenceModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/DefaultReferenceModel.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/DefaultReferenceModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/DefaultReferenceModel.java index 9580828c..c7dfce2b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/DefaultReferenceModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/DefaultReferenceModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/ErrorTemplateModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/ErrorTemplateModel.java similarity index 77% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/ErrorTemplateModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/ErrorTemplateModel.java index d8cefab5..a569eaa6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/ErrorTemplateModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/ErrorTemplateModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/GroupModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/GroupModel.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/GroupModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/GroupModel.java index 8df12aae..8a6708bf 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/GroupModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/GroupModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/GroupReferenceModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/GroupReferenceModel.java similarity index 78% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/GroupReferenceModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/GroupReferenceModel.java index 5d6c708c..089a25c0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/GroupReferenceModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/GroupReferenceModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/ListRecord.java b/src/main/java/dev/vality/fraudbusters/management/domain/ListRecord.java similarity index 77% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/ListRecord.java rename to src/main/java/dev/vality/fraudbusters/management/domain/ListRecord.java index 30d51111..72240651 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/ListRecord.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/ListRecord.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/PriorityIdModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/PriorityIdModel.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/PriorityIdModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/PriorityIdModel.java index f46e89ad..fa9f27b8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/PriorityIdModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/PriorityIdModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/ReferenceModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/ReferenceModel.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/ReferenceModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/ReferenceModel.java index 46b2d58a..4ba6157b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/ReferenceModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/ReferenceModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/TemplateModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/TemplateModel.java similarity index 85% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/TemplateModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/TemplateModel.java index 385ad8bd..fc5d2ea5 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/TemplateModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/TemplateModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain; +package dev.vality.fraudbusters.management.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/CheckedDataSetModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/CheckedDataSetModel.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/CheckedDataSetModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/CheckedDataSetModel.java index e976990f..e2d3d27f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/CheckedDataSetModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/CheckedDataSetModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/CheckedPaymentModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/CheckedPaymentModel.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/CheckedPaymentModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/CheckedPaymentModel.java index b8527348..ed2b9a62 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/CheckedPaymentModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/CheckedPaymentModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DataSetModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/DataSetModel.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DataSetModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/DataSetModel.java index e07fe088..c8beb5b1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DataSetModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/DataSetModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java similarity index 70% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java index f733cf27..57ec0cf4 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/DefaultPaymentReferenceModel.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; -import com.rbkmoney.fraudbusters.management.domain.DefaultReferenceModel; +import dev.vality.fraudbusters.management.domain.DefaultReferenceModel; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentCountInfo.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentCountInfo.java similarity index 53% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentCountInfo.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentCountInfo.java index a39399b9..0e34fc53 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentCountInfo.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentCountInfo.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; -import com.rbkmoney.fraudbusters.management.domain.CountInfo; +import dev.vality.fraudbusters.management.domain.CountInfo; import lombok.Data; @Data diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java similarity index 67% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java index f6438d23..ae200b03 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentGroupReferenceModel.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; -import com.rbkmoney.fraudbusters.management.domain.GroupReferenceModel; +import dev.vality.fraudbusters.management.domain.GroupReferenceModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentListRecord.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentListRecord.java similarity index 67% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentListRecord.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentListRecord.java index 2222cd3d..a783b1d4 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentListRecord.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentListRecord.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; -import com.rbkmoney.fraudbusters.management.domain.ListRecord; +import dev.vality.fraudbusters.management.domain.ListRecord; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentModel.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentModel.java index 60578fe1..285ea4db 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentModel.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentReferenceModel.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentReferenceModel.java similarity index 71% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentReferenceModel.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentReferenceModel.java index 7e2c98eb..6cb8d4fd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/PaymentReferenceModel.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/PaymentReferenceModel.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.payment; +package dev.vality.fraudbusters.management.domain.payment; -import com.rbkmoney.fraudbusters.management.domain.ReferenceModel; +import dev.vality.fraudbusters.management.domain.ReferenceModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/AddReferencesRequest.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/request/AddReferencesRequest.java similarity index 69% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/AddReferencesRequest.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/request/AddReferencesRequest.java index 42caae6b..64beabbd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/AddReferencesRequest.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/request/AddReferencesRequest.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.payment.request; +package dev.vality.fraudbusters.management.domain.payment.request; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java b/src/main/java/dev/vality/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java similarity index 68% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java rename to src/main/java/dev/vality/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java index f2916dd9..6ecfad0a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/payment/request/ListRowsInsertRequest.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.payment.request; +package dev.vality.fraudbusters.management.domain.payment.request; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; +import dev.vality.fraudbusters.management.domain.payment.PaymentCountInfo; import dev.vality.damsel.wb_list.ListType; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/request/FilterRequest.java b/src/main/java/dev/vality/fraudbusters/management/domain/request/FilterRequest.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/request/FilterRequest.java rename to src/main/java/dev/vality/fraudbusters/management/domain/request/FilterRequest.java index 4afad5eb..a8640944 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/request/FilterRequest.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/request/FilterRequest.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.request; +package dev.vality.fraudbusters.management.domain.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/CreateTemplateResponse.java b/src/main/java/dev/vality/fraudbusters/management/domain/response/CreateTemplateResponse.java similarity index 77% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/response/CreateTemplateResponse.java rename to src/main/java/dev/vality/fraudbusters/management/domain/response/CreateTemplateResponse.java index d9df3b9e..736f73a8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/CreateTemplateResponse.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/response/CreateTemplateResponse.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.response; +package dev.vality.fraudbusters.management.domain.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/ErrorResponse.java b/src/main/java/dev/vality/fraudbusters/management/domain/response/ErrorResponse.java similarity index 70% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/response/ErrorResponse.java rename to src/main/java/dev/vality/fraudbusters/management/domain/response/ErrorResponse.java index 3e202e2f..f468103f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/ErrorResponse.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/response/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.response; +package dev.vality.fraudbusters.management.domain.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/FilterResponse.java b/src/main/java/dev/vality/fraudbusters/management/domain/response/FilterResponse.java similarity index 81% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/response/FilterResponse.java rename to src/main/java/dev/vality/fraudbusters/management/domain/response/FilterResponse.java index ae5fd05f..5367b05d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/FilterResponse.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/response/FilterResponse.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.domain.response; +package dev.vality.fraudbusters.management.domain.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/ValidateTemplatesResponse.java b/src/main/java/dev/vality/fraudbusters/management/domain/response/ValidateTemplatesResponse.java similarity index 57% rename from src/main/java/com/rbkmoney/fraudbusters/management/domain/response/ValidateTemplatesResponse.java rename to src/main/java/dev/vality/fraudbusters/management/domain/response/ValidateTemplatesResponse.java index fb32e7b8..2fd7a282 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/domain/response/ValidateTemplatesResponse.java +++ b/src/main/java/dev/vality/fraudbusters/management/domain/response/ValidateTemplatesResponse.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.domain.response; +package dev.vality.fraudbusters.management.domain.response; -import com.rbkmoney.fraudbusters.management.domain.ErrorTemplateModel; +import dev.vality.fraudbusters.management.domain.ErrorTemplateModel; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/DateFormatException.java b/src/main/java/dev/vality/fraudbusters/management/exception/DateFormatException.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/DateFormatException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/DateFormatException.java index feaeb03e..969af9d1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/DateFormatException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/DateFormatException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class DateFormatException extends RuntimeException { public DateFormatException() { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/KafkaProduceException.java b/src/main/java/dev/vality/fraudbusters/management/exception/KafkaProduceException.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/KafkaProduceException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/KafkaProduceException.java index 0c23bb69..c57bbc05 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/KafkaProduceException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/KafkaProduceException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class KafkaProduceException extends RuntimeException { public KafkaProduceException() { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/KafkaSerializationException.java b/src/main/java/dev/vality/fraudbusters/management/exception/KafkaSerializationException.java similarity index 81% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/KafkaSerializationException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/KafkaSerializationException.java index 7862b680..5baa4cc2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/KafkaSerializationException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/KafkaSerializationException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class KafkaSerializationException extends RuntimeException { public KafkaSerializationException(String message) { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/NotFoundException.java b/src/main/java/dev/vality/fraudbusters/management/exception/NotFoundException.java similarity index 69% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/NotFoundException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/NotFoundException.java index 7eebd46d..5bc15af2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/NotFoundException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/NotFoundException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class NotFoundException extends RuntimeException { public NotFoundException(String s) { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/NotificatorCallException.java b/src/main/java/dev/vality/fraudbusters/management/exception/NotificatorCallException.java similarity index 84% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/NotificatorCallException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/NotificatorCallException.java index 24565e8e..cf63a8f6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/NotificatorCallException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/NotificatorCallException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; import lombok.Getter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownEventException.java b/src/main/java/dev/vality/fraudbusters/management/exception/UnknownEventException.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownEventException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/UnknownEventException.java index bccb3cc7..3c632ffe 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownEventException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/UnknownEventException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class UnknownEventException extends RuntimeException { public UnknownEventException() { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownPaymentException.java b/src/main/java/dev/vality/fraudbusters/management/exception/UnknownPaymentException.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownPaymentException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/UnknownPaymentException.java index c85da0b9..57048154 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownPaymentException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/UnknownPaymentException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class UnknownPaymentException extends RuntimeException { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownReferenceException.java b/src/main/java/dev/vality/fraudbusters/management/exception/UnknownReferenceException.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownReferenceException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/UnknownReferenceException.java index 43b207b7..4090c637 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/UnknownReferenceException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/UnknownReferenceException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class UnknownReferenceException extends RuntimeException { public UnknownReferenceException() { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/exception/ValidationException.java b/src/main/java/dev/vality/fraudbusters/management/exception/ValidationException.java similarity index 91% rename from src/main/java/com/rbkmoney/fraudbusters/management/exception/ValidationException.java rename to src/main/java/dev/vality/fraudbusters/management/exception/ValidationException.java index 2deaee76..73544a8c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/exception/ValidationException.java +++ b/src/main/java/dev/vality/fraudbusters/management/exception/ValidationException.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.exception; +package dev.vality.fraudbusters.management.exception; public class ValidationException extends RuntimeException { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java b/src/main/java/dev/vality/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java rename to src/main/java/dev/vality/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java index d98e2255..e077df8c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java +++ b/src/main/java/dev/vality/fraudbusters/management/filter/UnknownPaymentTemplateInReferenceFilter.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.filter; +package dev.vality.fraudbusters.management.filter; -import com.rbkmoney.fraudbusters.management.dao.payment.template.PaymentTemplateDao; +import dev.vality.fraudbusters.management.dao.payment.template.PaymentTemplateDao; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/CommandListener.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/CommandListener.java index bb14ee53..ab6c5afe 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/CommandListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/CommandListener.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.listener; +package dev.vality.fraudbusters.management.listener; import dev.vality.damsel.fraudbusters.Command; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java index f848db42..bb996342 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/InitiatingEntityEventSinkListener.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.listener; +package dev.vality.fraudbusters.management.listener; -import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentTemplateReferenceService; +import dev.vality.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.service.payment.PaymentTemplateReferenceService; import dev.vality.damsel.fraudbusters.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/WbListEventListener.java similarity index 79% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/WbListEventListener.java index 92a4c8b6..7c93fd8b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/WbListEventListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/WbListEventListener.java @@ -1,11 +1,11 @@ -package com.rbkmoney.fraudbusters.management.listener; +package dev.vality.fraudbusters.management.listener; import com.rbkmoney.dao.DaoException; -import com.rbkmoney.fraudbusters.management.converter.payment.EventToListRecordConverter; -import com.rbkmoney.fraudbusters.management.dao.CdDao; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.exception.UnknownEventException; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.converter.payment.EventToListRecordConverter; +import dev.vality.fraudbusters.management.dao.CdDao; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.exception.UnknownEventException; +import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.damsel.wb_list.Event; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/payment/GroupReferenceListener.java similarity index 74% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/payment/GroupReferenceListener.java index 6b878868..a45eb5f0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/GroupReferenceListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/payment/GroupReferenceListener.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.listener.payment; +package dev.vality.fraudbusters.management.listener.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.CommandToPaymentGroupReferenceModelConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; -import com.rbkmoney.fraudbusters.management.listener.CommandListener; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.converter.payment.CommandToPaymentGroupReferenceModelConverter; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; +import dev.vality.fraudbusters.management.listener.CommandListener; +import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/payment/PaymentGroupListener.java similarity index 71% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/payment/PaymentGroupListener.java index 0307a733..cfe9a518 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentGroupListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/payment/PaymentGroupListener.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.listener.payment; +package dev.vality.fraudbusters.management.listener.payment; -import com.rbkmoney.fraudbusters.management.converter.CommandToGroupModelConverter; -import com.rbkmoney.fraudbusters.management.dao.GroupDao; -import com.rbkmoney.fraudbusters.management.listener.CommandListener; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.converter.CommandToGroupModelConverter; +import dev.vality.fraudbusters.management.dao.GroupDao; +import dev.vality.fraudbusters.management.listener.CommandListener; +import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/payment/PaymentTemplateListener.java similarity index 71% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/payment/PaymentTemplateListener.java index 84b7de4b..66eabe63 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/PaymentTemplateListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/payment/PaymentTemplateListener.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.listener.payment; +package dev.vality.fraudbusters.management.listener.payment; -import com.rbkmoney.fraudbusters.management.converter.CommandToTemplateModelConverter; -import com.rbkmoney.fraudbusters.management.dao.TemplateDao; -import com.rbkmoney.fraudbusters.management.listener.CommandListener; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.converter.CommandToTemplateModelConverter; +import dev.vality.fraudbusters.management.dao.TemplateDao; +import dev.vality.fraudbusters.management.listener.CommandListener; +import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java b/src/main/java/dev/vality/fraudbusters/management/listener/payment/ReferenceListener.java similarity index 71% rename from src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java rename to src/main/java/dev/vality/fraudbusters/management/listener/payment/ReferenceListener.java index 5b9fa23e..7fe0d09c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/listener/payment/ReferenceListener.java +++ b/src/main/java/dev/vality/fraudbusters/management/listener/payment/ReferenceListener.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.listener.payment; +package dev.vality.fraudbusters.management.listener.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.CommandToPaymentReferenceModelConverter; -import com.rbkmoney.fraudbusters.management.dao.ReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.listener.CommandListener; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.converter.payment.CommandToPaymentReferenceModelConverter; +import dev.vality.fraudbusters.management.dao.ReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.listener.CommandListener; +import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/AuditResource.java similarity index 89% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/AuditResource.java index 75e03972..5aea6bad 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/AuditResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/AuditResource.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.resource; +package dev.vality.fraudbusters.management.resource; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; -import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.utils.PagingDataUtils; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.damsel.fraudbusters.CommandType; import dev.vality.fraudbusters.management.domain.enums.ObjectType; import dev.vality.swag.fraudbusters.management.api.AuditApi; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/NotificationResource.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/notificator/NotificationResource.java index bf4801cc..eaf5f328 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/NotificationResource.java @@ -1,12 +1,12 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator; - -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.ChannelConverter; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.NotificationConverter; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.NotificationTemplateConverter; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.ValidationConverter; -import com.rbkmoney.fraudbusters.management.service.iface.ChannelService; -import com.rbkmoney.fraudbusters.management.service.iface.NotificationService; -import com.rbkmoney.fraudbusters.management.service.iface.NotificationTemplateService; +package dev.vality.fraudbusters.management.resource.notificator; + +import dev.vality.fraudbusters.management.resource.notificator.converter.ChannelConverter; +import dev.vality.fraudbusters.management.resource.notificator.converter.NotificationConverter; +import dev.vality.fraudbusters.management.resource.notificator.converter.NotificationTemplateConverter; +import dev.vality.fraudbusters.management.resource.notificator.converter.ValidationConverter; +import dev.vality.fraudbusters.management.service.iface.ChannelService; +import dev.vality.fraudbusters.management.service.iface.NotificationService; +import dev.vality.fraudbusters.management.service.iface.NotificationTemplateService; import dev.vality.damsel.fraudbusters_notificator.Filter; import dev.vality.damsel.fraudbusters_notificator.Page; import dev.vality.swag.fraudbusters.management.api.NotificationsApi; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/BiConverter.java b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/BiConverter.java similarity index 52% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/BiConverter.java rename to src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/BiConverter.java index d3db51b0..de11d9a1 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/BiConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/BiConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator.converter; +package dev.vality.fraudbusters.management.resource.notificator.converter; public interface BiConverter { diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/ChannelConverter.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java rename to src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/ChannelConverter.java index ee7578c9..e2124bda 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ChannelConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/ChannelConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator.converter; +package dev.vality.fraudbusters.management.resource.notificator.converter; import dev.vality.damsel.fraudbusters_notificator.ChannelType; import dev.vality.swag.fraudbusters.management.model.Channel; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/NotificationConverter.java similarity index 97% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java rename to src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/NotificationConverter.java index ad17336b..fc53df26 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/NotificationConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator.converter; +package dev.vality.fraudbusters.management.resource.notificator.converter; import dev.vality.damsel.fraudbusters_notificator.NotificationStatus; import dev.vality.swag.fraudbusters.management.model.Notification; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java rename to src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java index 04b29b5e..f98fbc25 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/NotificationTemplateConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator.converter; +package dev.vality.fraudbusters.management.resource.notificator.converter; import dev.vality.swag.fraudbusters.management.model.NotificationTemplate; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/ValidationConverter.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java rename to src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/ValidationConverter.java index 7818c59c..9152c025 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/notificator/converter/ValidationConverter.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/notificator/converter/ValidationConverter.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator.converter; +package dev.vality.fraudbusters.management.resource.notificator.converter; import dev.vality.swag.fraudbusters.management.model.ValidationError; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentDataSetsResource.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentDataSetsResource.java index 2c4de75f..ab809607 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentDataSetsResource.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.*; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsDataSetService; -import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; import dev.vality.damsel.fraudbusters.HistoricalDataSetCheckResult; +import dev.vality.fraudbusters.management.converter.payment.*; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.payment.PaymentsDataSetService; +import dev.vality.fraudbusters.management.utils.PagingDataUtils; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.api.PaymentsDataSetApi; import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentEmulateResource.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentEmulateResource.java index 2aac4311..ff41665a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentEmulateResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentEmulateResource.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.TemplateModelToTemplateConverter; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentEmulateService; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.converter.payment.TemplateModelToTemplateConverter; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.service.payment.PaymentEmulateService; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.api.PaymentsEmulationsApi; import dev.vality.swag.fraudbusters.management.model.EmulateResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentGroupsResource.java similarity index 85% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentGroupsResource.java index 94a6f4b2..20344ac6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentGroupsResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentGroupsResource.java @@ -1,17 +1,17 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.GroupModelToGroupConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.GroupToCommandConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToGroupReferenceConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentGroupCommandService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentGroupReferenceCommandService; -import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.converter.payment.GroupModelToGroupConverter; +import dev.vality.fraudbusters.management.converter.payment.GroupToCommandConverter; +import dev.vality.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToGroupReferenceConverter; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupDao; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.payment.PaymentGroupCommandService; +import dev.vality.fraudbusters.management.service.payment.PaymentGroupReferenceCommandService; +import dev.vality.fraudbusters.management.utils.PagingDataUtils; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.api.PaymentsGroupsApi; import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java similarity index 99% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java index 2355c463..bbc9ef02 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.*; import dev.vality.damsel.base.BoundType; import dev.vality.damsel.base.TimestampInterval; import dev.vality.damsel.base.TimestampIntervalBound; import dev.vality.damsel.fraudbusters.*; +import dev.vality.fraudbusters.management.converter.payment.*; import dev.vality.swag.fraudbusters.management.api.PaymentsHistoricalDataApi; import dev.vality.swag.fraudbusters.management.model.*; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentLoadDataResource.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentLoadDataResource.java index 419e5969..e20fd4f8 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentLoadDataResource.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentLoadDataService; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.service.payment.PaymentLoadDataService; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.api.PaymentsLoadDataApi; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsListsResource.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsListsResource.java index 993e49b2..1f6fe550 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsListsResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsListsResource.java @@ -1,12 +1,12 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.WbListCommandService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsListsService; -import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; -import com.rbkmoney.fraudbusters.management.utils.ParametersService; -import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.WbListCommandService; +import dev.vality.fraudbusters.management.service.payment.PaymentsListsService; +import dev.vality.fraudbusters.management.utils.PagingDataUtils; +import dev.vality.fraudbusters.management.utils.ParametersService; +import dev.vality.fraudbusters.management.utils.PaymentCountInfoGenerator; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.api.PaymentsListsApi; import dev.vality.swag.fraudbusters.management.model.ListResponse; import dev.vality.swag.fraudbusters.management.model.RowListRequest; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsReferenceResource.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsReferenceResource.java index a906a174..b8fbbdcd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsReferenceResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsReferenceResource.java @@ -1,19 +1,19 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.DefaultPaymentReferenceModelToPaymentReferenceConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentReferenceModelToPaymentReferenceConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.filter.UnknownPaymentTemplateInReferenceFilter; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsDefaultReferenceService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsReferenceService; -import com.rbkmoney.fraudbusters.management.utils.FilterRequestUtils; -import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; -import com.rbkmoney.fraudbusters.management.utils.PaymentUnknownTemplateFinder; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.converter.payment.DefaultPaymentReferenceModelToPaymentReferenceConverter; +import dev.vality.fraudbusters.management.converter.payment.PaymentReferenceModelToPaymentReferenceConverter; +import dev.vality.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.filter.UnknownPaymentTemplateInReferenceFilter; +import dev.vality.fraudbusters.management.service.payment.PaymentsDefaultReferenceService; +import dev.vality.fraudbusters.management.service.payment.PaymentsReferenceService; +import dev.vality.fraudbusters.management.utils.FilterRequestUtils; +import dev.vality.fraudbusters.management.utils.PagingDataUtils; +import dev.vality.fraudbusters.management.utils.PaymentUnknownTemplateFinder; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.api.PaymentsReferencesApi; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import dev.vality.swag.fraudbusters.management.model.ReferencesResponse; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java similarity index 84% rename from src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java rename to src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java index a506c8f9..3d15d51f 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java +++ b/src/main/java/dev/vality/fraudbusters/management/resource/payment/PaymentsTemplatesResource.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.TemplateValidateErrorsToValidateTemplateResponseConverter; -import com.rbkmoney.fraudbusters.management.dao.TemplateDao; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.TemplateCommandService; -import com.rbkmoney.fraudbusters.management.service.iface.ValidationTemplateService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsTemplatesService; -import com.rbkmoney.fraudbusters.management.utils.CommandMapper; -import com.rbkmoney.fraudbusters.management.utils.PagingDataUtils; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.converter.payment.TemplateValidateErrorsToValidateTemplateResponseConverter; +import dev.vality.fraudbusters.management.dao.TemplateDao; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.TemplateCommandService; +import dev.vality.fraudbusters.management.service.iface.ValidationTemplateService; +import dev.vality.fraudbusters.management.service.payment.PaymentsTemplatesService; +import dev.vality.fraudbusters.management.utils.CommandMapper; +import dev.vality.fraudbusters.management.utils.PagingDataUtils; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.damsel.fraudbusters.CommandType; import dev.vality.damsel.fraudbusters.TemplateValidateError; import dev.vality.swag.fraudbusters.management.api.PaymentsTemplatesApi; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java b/src/main/java/dev/vality/fraudbusters/management/serializer/CommandChangeDeserializer.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java rename to src/main/java/dev/vality/fraudbusters/management/serializer/CommandChangeDeserializer.java index d4e103f2..4ddf4cbd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandChangeDeserializer.java +++ b/src/main/java/dev/vality/fraudbusters/management/serializer/CommandChangeDeserializer.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.serializer; +package dev.vality.fraudbusters.management.serializer; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java b/src/main/java/dev/vality/fraudbusters/management/serializer/CommandFraudDeserializer.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java rename to src/main/java/dev/vality/fraudbusters/management/serializer/CommandFraudDeserializer.java index fdb8e787..78052396 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/CommandFraudDeserializer.java +++ b/src/main/java/dev/vality/fraudbusters/management/serializer/CommandFraudDeserializer.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.serializer; +package dev.vality.fraudbusters.management.serializer; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java b/src/main/java/dev/vality/fraudbusters/management/serializer/EventDeserializer.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java rename to src/main/java/dev/vality/fraudbusters/management/serializer/EventDeserializer.java index d9760fa4..9f5fc640 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/EventDeserializer.java +++ b/src/main/java/dev/vality/fraudbusters/management/serializer/EventDeserializer.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.serializer; +package dev.vality.fraudbusters.management.serializer; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java b/src/main/java/dev/vality/fraudbusters/management/serializer/ReferenceInfoDeserializer.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java rename to src/main/java/dev/vality/fraudbusters/management/serializer/ReferenceInfoDeserializer.java index 2cf81480..005785e3 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/serializer/ReferenceInfoDeserializer.java +++ b/src/main/java/dev/vality/fraudbusters/management/serializer/ReferenceInfoDeserializer.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.serializer; +package dev.vality.fraudbusters.management.serializer; import com.rbkmoney.kafka.common.serialization.AbstractThriftDeserializer; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java b/src/main/java/dev/vality/fraudbusters/management/service/AuditServiceImpl.java similarity index 77% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java rename to src/main/java/dev/vality/fraudbusters/management/service/AuditServiceImpl.java index 7f922aa8..9af0b94b 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/AuditServiceImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/AuditServiceImpl.java @@ -1,12 +1,12 @@ -package com.rbkmoney.fraudbusters.management.service; - -import com.rbkmoney.fraudbusters.management.converter.CommandToAuditLogConverter; -import com.rbkmoney.fraudbusters.management.converter.CommonAuditInternalToCommonAuditConverter; -import com.rbkmoney.fraudbusters.management.converter.EventToAuditLogConverter; -import com.rbkmoney.fraudbusters.management.dao.audit.CommandAuditDao; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +package dev.vality.fraudbusters.management.service; + +import dev.vality.fraudbusters.management.converter.CommandToAuditLogConverter; +import dev.vality.fraudbusters.management.converter.CommonAuditInternalToCommonAuditConverter; +import dev.vality.fraudbusters.management.converter.EventToAuditLogConverter; +import dev.vality.fraudbusters.management.dao.audit.CommandAuditDao; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.wb_list.Event; import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java b/src/main/java/dev/vality/fraudbusters/management/service/ChannelServiceImpl.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java rename to src/main/java/dev/vality/fraudbusters/management/service/ChannelServiceImpl.java index 41c84cf2..800af2fe 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/ChannelServiceImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/ChannelServiceImpl.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; -import com.rbkmoney.fraudbusters.management.service.iface.ChannelService; +import dev.vality.fraudbusters.management.exception.NotificatorCallException; +import dev.vality.fraudbusters.management.service.iface.ChannelService; import dev.vality.damsel.fraudbusters_notificator.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java b/src/main/java/dev/vality/fraudbusters/management/service/CommandSender.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java rename to src/main/java/dev/vality/fraudbusters/management/service/CommandSender.java index e7d423ac..fa9c7f04 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/CommandSender.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/CommandSender.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.exception.KafkaProduceException; +import dev.vality.fraudbusters.management.exception.KafkaProduceException; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java b/src/main/java/dev/vality/fraudbusters/management/service/GreyRottenRuleCleanerService.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java rename to src/main/java/dev/vality/fraudbusters/management/service/GreyRottenRuleCleanerService.java index cf611ae6..425cd257 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/GreyRottenRuleCleanerService.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.converter.payment.WbListRecordToRowConverter; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; import dev.vality.damsel.wb_list.Command; import dev.vality.damsel.wb_list.Row; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java b/src/main/java/dev/vality/fraudbusters/management/service/NotificationServiceImpl.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java rename to src/main/java/dev/vality/fraudbusters/management/service/NotificationServiceImpl.java index 6e115361..cbf148cd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationServiceImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/NotificationServiceImpl.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; -import com.rbkmoney.fraudbusters.management.service.iface.NotificationService; +import dev.vality.fraudbusters.management.exception.NotificatorCallException; +import dev.vality.fraudbusters.management.service.iface.NotificationService; import dev.vality.damsel.fraudbusters_notificator.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java b/src/main/java/dev/vality/fraudbusters/management/service/NotificationTemplateServiceImpl.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java rename to src/main/java/dev/vality/fraudbusters/management/service/NotificationTemplateServiceImpl.java index 1c26b5f4..33b3908c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/NotificationTemplateServiceImpl.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/NotificationTemplateServiceImpl.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.exception.NotificatorCallException; -import com.rbkmoney.fraudbusters.management.service.iface.NotificationTemplateService; +import dev.vality.fraudbusters.management.exception.NotificatorCallException; +import dev.vality.fraudbusters.management.service.iface.NotificationTemplateService; import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateListResponse; import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateServiceSrv; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java b/src/main/java/dev/vality/fraudbusters/management/service/TemplateCommandService.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java rename to src/main/java/dev/vality/fraudbusters/management/service/TemplateCommandService.java index 55177812..04ea6ec0 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/TemplateCommandService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/TemplateCommandService.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.converter.TemplateModelToCommandConverter; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.converter.TemplateModelToCommandConverter; +import dev.vality.fraudbusters.management.domain.TemplateModel; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java b/src/main/java/dev/vality/fraudbusters/management/service/WbListCommandService.java similarity index 95% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java rename to src/main/java/dev/vality/fraudbusters/management/service/WbListCommandService.java index 18443fe3..d44bea79 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/WbListCommandService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/WbListCommandService.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.exception.KafkaProduceException; +import dev.vality.fraudbusters.management.exception.KafkaProduceException; import dev.vality.damsel.wb_list.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java b/src/main/java/dev/vality/fraudbusters/management/service/iface/AuditService.java similarity index 77% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java rename to src/main/java/dev/vality/fraudbusters/management/service/iface/AuditService.java index de5734f7..fb940d92 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/AuditService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/iface/AuditService.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.service.iface; +package dev.vality.fraudbusters.management.service.iface; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.wb_list.Event; import dev.vality.swag.fraudbusters.management.model.FilterLogsResponse; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java b/src/main/java/dev/vality/fraudbusters/management/service/iface/ChannelService.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java rename to src/main/java/dev/vality/fraudbusters/management/service/iface/ChannelService.java index 2baf7116..00b10155 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ChannelService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/iface/ChannelService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.service.iface; +package dev.vality.fraudbusters.management.service.iface; import dev.vality.damsel.fraudbusters_notificator.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java b/src/main/java/dev/vality/fraudbusters/management/service/iface/NotificationService.java similarity index 86% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java rename to src/main/java/dev/vality/fraudbusters/management/service/iface/NotificationService.java index 1f134a79..d9a9c33c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/iface/NotificationService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.service.iface; +package dev.vality.fraudbusters.management.service.iface; import dev.vality.damsel.fraudbusters_notificator.*; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java b/src/main/java/dev/vality/fraudbusters/management/service/iface/NotificationTemplateService.java similarity index 75% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java rename to src/main/java/dev/vality/fraudbusters/management/service/iface/NotificationTemplateService.java index aa07c8c9..9cb624ca 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/NotificationTemplateService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/iface/NotificationTemplateService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.service.iface; +package dev.vality.fraudbusters.management.service.iface; import dev.vality.damsel.fraudbusters_notificator.NotificationTemplateListResponse; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java b/src/main/java/dev/vality/fraudbusters/management/service/iface/ValidationTemplateService.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java rename to src/main/java/dev/vality/fraudbusters/management/service/iface/ValidationTemplateService.java index 6790f781..a79f45bb 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/iface/ValidationTemplateService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/iface/ValidationTemplateService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.service.iface; +package dev.vality.fraudbusters.management.service.iface; import dev.vality.damsel.fraudbusters.Template; import dev.vality.damsel.fraudbusters.TemplateValidateError; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java b/src/main/java/dev/vality/fraudbusters/management/service/p2p/GroupModelCommandService.java similarity index 78% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java rename to src/main/java/dev/vality/fraudbusters/management/service/p2p/GroupModelCommandService.java index 11233b99..adcb0a67 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/p2p/GroupModelCommandService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/p2p/GroupModelCommandService.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.service.p2p; +package dev.vality.fraudbusters.management.service.p2p; -import com.rbkmoney.fraudbusters.management.service.CommandSender; +import dev.vality.fraudbusters.management.service.CommandSender; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentEmulateService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentEmulateService.java similarity index 76% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentEmulateService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentEmulateService.java index 3343213d..aea727c2 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentEmulateService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentEmulateService.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; -import com.rbkmoney.fraudbusters.management.dao.payment.template.PaymentTemplateDao; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.fraudbusters.management.domain.ReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupDao; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; +import dev.vality.fraudbusters.management.dao.payment.template.PaymentTemplateDao; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.ReferenceModel; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.antlr.v4.runtime.misc.Pair; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentGroupCommandService.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentGroupCommandService.java index 9e551ec9..45fba031 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupCommandService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentGroupCommandService.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.GroupToCommandConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToCommandConverter; -import com.rbkmoney.fraudbusters.management.service.CommandSender; +import dev.vality.fraudbusters.management.converter.payment.GroupToCommandConverter; +import dev.vality.fraudbusters.management.converter.payment.PaymentGroupReferenceModelToCommandConverter; +import dev.vality.fraudbusters.management.service.CommandSender; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandType; import dev.vality.damsel.fraudbusters.UserInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java index 1f85770e..806379fb 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentGroupReferenceCommandService.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.service.CommandSender; -import com.rbkmoney.fraudbusters.management.utils.ReferenceKeyGenerator; +import dev.vality.fraudbusters.management.service.CommandSender; +import dev.vality.fraudbusters.management.utils.ReferenceKeyGenerator; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.GroupReference; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentLoadDataService.java similarity index 90% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentLoadDataService.java index db1e254d..783f5afd 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentLoadDataService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentLoadDataService.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.utils.parser.CsvFraudPaymentParser; +import dev.vality.fraudbusters.management.utils.parser.CsvFraudPaymentParser; import dev.vality.damsel.fraudbusters.FraudPayment; import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java similarity index 77% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java index b4a4d0c0..c55e2779 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentTemplateReferenceService.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.service.CommandSender; -import com.rbkmoney.fraudbusters.management.utils.ReferenceKeyGenerator; +import dev.vality.fraudbusters.management.service.CommandSender; +import dev.vality.fraudbusters.management.utils.ReferenceKeyGenerator; import dev.vality.damsel.fraudbusters.Command; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentValidationService.java similarity index 80% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentValidationService.java index cdb6aee3..3cd03b3e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentValidationService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentValidationService.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.exception.ValidationException; -import com.rbkmoney.fraudbusters.management.service.iface.ValidationTemplateService; +import dev.vality.fraudbusters.management.exception.ValidationException; +import dev.vality.fraudbusters.management.service.iface.ValidationTemplateService; import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import dev.vality.damsel.fraudbusters.Template; import dev.vality.damsel.fraudbusters.TemplateValidateError; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsDataSetService.java similarity index 79% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsDataSetService.java index 8d8b471a..322cd8d7 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsDataSetService.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.DataSetCheckingResultDao; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.DataSetDao; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.PaymentDao; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.fraudbusters.management.utils.FilterRequestUtils; +import dev.vality.fraudbusters.management.dao.payment.dataset.DataSetCheckingResultDao; +import dev.vality.fraudbusters.management.dao.payment.dataset.DataSetDao; +import dev.vality.fraudbusters.management.dao.payment.dataset.PaymentDao; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.utils.FilterRequestUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java similarity index 78% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java index 98ec8f25..a53bd662 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsDefaultReferenceService.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsListsService.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsListsService.java index 09da9c15..6109b15a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsListsService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsListsService.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordsModelToWbListRecordConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.exception.NotFoundException; -import com.rbkmoney.fraudbusters.management.service.WbListCommandService; -import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; +import dev.vality.fraudbusters.management.converter.payment.WbListRecordToRowConverter; +import dev.vality.fraudbusters.management.converter.payment.WbListRecordsModelToWbListRecordConverter; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.exception.NotFoundException; +import dev.vality.fraudbusters.management.service.WbListCommandService; +import dev.vality.fraudbusters.management.utils.PaymentCountInfoGenerator; +import dev.vality.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; import dev.vality.damsel.wb_list.Command; import dev.vality.fraudbusters.management.domain.enums.ListType; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsReferenceService.java similarity index 76% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsReferenceService.java index 968e8507..0252545a 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsReferenceService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsReferenceService.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentReferenceModelToCommandConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.ReferenceToCommandConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.utils.CommandMapper; +import dev.vality.fraudbusters.management.converter.payment.PaymentReferenceModelToCommandConverter; +import dev.vality.fraudbusters.management.converter.payment.ReferenceToCommandConverter; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.utils.CommandMapper; import dev.vality.damsel.fraudbusters.CommandType; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsTemplatesService.java similarity index 79% rename from src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java rename to src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsTemplatesService.java index 83718c5a..d3746e86 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsTemplatesService.java +++ b/src/main/java/dev/vality/fraudbusters/management/service/payment/PaymentsTemplatesService.java @@ -1,13 +1,13 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.converter.payment.TemplateModelToTemplateConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.TemplateToCommandConverter; -import com.rbkmoney.fraudbusters.management.dao.TemplateDao; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.service.TemplateCommandService; -import com.rbkmoney.fraudbusters.management.service.iface.ValidationTemplateService; -import com.rbkmoney.fraudbusters.management.utils.FilterRequestUtils; +import dev.vality.fraudbusters.management.converter.payment.TemplateModelToTemplateConverter; +import dev.vality.fraudbusters.management.converter.payment.TemplateToCommandConverter; +import dev.vality.fraudbusters.management.dao.TemplateDao; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.service.TemplateCommandService; +import dev.vality.fraudbusters.management.service.iface.ValidationTemplateService; +import dev.vality.fraudbusters.management.utils.FilterRequestUtils; import dev.vality.damsel.fraudbusters.CommandType; import dev.vality.damsel.fraudbusters.TemplateValidateError; import dev.vality.damsel.fraudbusters.UserInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java b/src/main/java/dev/vality/fraudbusters/management/utils/CommandMapper.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java rename to src/main/java/dev/vality/fraudbusters/management/utils/CommandMapper.java index 4cd4cbdf..0bba306e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CommandMapper.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/CommandMapper.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import dev.vality.damsel.fraudbusters.Command; import dev.vality.damsel.fraudbusters.CommandType; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java b/src/main/java/dev/vality/fraudbusters/management/utils/CountInfoApiUtils.java similarity index 97% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java rename to src/main/java/dev/vality/fraudbusters/management/utils/CountInfoApiUtils.java index 8c4cbdf2..632f0354 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtils.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/CountInfoApiUtils.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.damsel.wb_list.RowInfo; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java b/src/main/java/dev/vality/fraudbusters/management/utils/CountInfoUtils.java similarity index 93% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java rename to src/main/java/dev/vality/fraudbusters/management/utils/CountInfoUtils.java index c29f9f5e..f13e3c20 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/CountInfoUtils.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/CountInfoUtils.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.fraudbusters.management.domain.CountInfo; +import dev.vality.fraudbusters.management.domain.CountInfo; import dev.vality.damsel.wb_list.Row; import dev.vality.damsel.wb_list.RowInfo; import io.micrometer.shaded.io.netty.util.internal.StringUtil; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/DateTimeUtils.java b/src/main/java/dev/vality/fraudbusters/management/utils/DateTimeUtils.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/DateTimeUtils.java rename to src/main/java/dev/vality/fraudbusters/management/utils/DateTimeUtils.java index 6051b44d..51f46781 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/DateTimeUtils.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/DateTimeUtils.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/FilterRequestUtils.java b/src/main/java/dev/vality/fraudbusters/management/utils/FilterRequestUtils.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/FilterRequestUtils.java rename to src/main/java/dev/vality/fraudbusters/management/utils/FilterRequestUtils.java index aac2e465..14b4526e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/FilterRequestUtils.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/FilterRequestUtils.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/GroupRowToModelMapper.java b/src/main/java/dev/vality/fraudbusters/management/utils/GroupRowToModelMapper.java similarity index 82% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/GroupRowToModelMapper.java rename to src/main/java/dev/vality/fraudbusters/management/utils/GroupRowToModelMapper.java index 7783eeb8..edb7b82c 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/GroupRowToModelMapper.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/GroupRowToModelMapper.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; -import com.rbkmoney.fraudbusters.management.dao.payment.group.model.GroupPriorityRow; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.dao.payment.group.model.GroupPriorityRow; +import dev.vality.fraudbusters.management.domain.GroupModel; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PagingDataUtils.java b/src/main/java/dev/vality/fraudbusters/management/utils/PagingDataUtils.java similarity index 85% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/PagingDataUtils.java rename to src/main/java/dev/vality/fraudbusters/management/utils/PagingDataUtils.java index 5e912061..d1e07a65 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PagingDataUtils.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/PagingDataUtils.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/ParametersService.java b/src/main/java/dev/vality/fraudbusters/management/utils/ParametersService.java similarity index 87% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/ParametersService.java rename to src/main/java/dev/vality/fraudbusters/management/utils/ParametersService.java index f249724b..ba6e2d77 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/ParametersService.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/ParametersService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java b/src/main/java/dev/vality/fraudbusters/management/utils/PaymentCountInfoGenerator.java similarity index 83% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java rename to src/main/java/dev/vality/fraudbusters/management/utils/PaymentCountInfoGenerator.java index 2e1abfc1..e7e66dab 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentCountInfoGenerator.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/PaymentCountInfoGenerator.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; -import com.rbkmoney.fraudbusters.management.exception.UnknownEventException; +import dev.vality.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; +import dev.vality.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; +import dev.vality.fraudbusters.management.exception.UnknownEventException; import dev.vality.damsel.wb_list.Row; import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java b/src/main/java/dev/vality/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java similarity index 92% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java rename to src/main/java/dev/vality/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java index 7e1b9b07..d14d06df 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/PaymentUnknownTemplateFinder.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import dev.vality.swag.fraudbusters.management.model.PaymentReference; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java b/src/main/java/dev/vality/fraudbusters/management/utils/ReferenceKeyGenerator.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java rename to src/main/java/dev/vality/fraudbusters/management/utils/ReferenceKeyGenerator.java index 1e113663..10504300 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/ReferenceKeyGenerator.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/ReferenceKeyGenerator.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import dev.vality.damsel.fraudbusters.TemplateReference; import io.micrometer.shaded.io.netty.util.internal.StringUtil; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java b/src/main/java/dev/vality/fraudbusters/management/utils/RowUtilsService.java similarity index 97% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java rename to src/main/java/dev/vality/fraudbusters/management/utils/RowUtilsService.java index 9694af8c..83e9dfca 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/RowUtilsService.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/RowUtilsService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/UnknownTemplateFinder.java b/src/main/java/dev/vality/fraudbusters/management/utils/UnknownTemplateFinder.java similarity index 84% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/UnknownTemplateFinder.java rename to src/main/java/dev/vality/fraudbusters/management/utils/UnknownTemplateFinder.java index 07078d8c..33e00be6 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/UnknownTemplateFinder.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/UnknownTemplateFinder.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; -import com.rbkmoney.fraudbusters.management.domain.ReferenceModel; +import dev.vality.fraudbusters.management.domain.ReferenceModel; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/UserInfoService.java b/src/main/java/dev/vality/fraudbusters/management/utils/UserInfoService.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/UserInfoService.java rename to src/main/java/dev/vality/fraudbusters/management/utils/UserInfoService.java index 2d5ef1e3..0e644d7e 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/UserInfoService.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/UserInfoService.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/WbListUtils.java b/src/main/java/dev/vality/fraudbusters/management/utils/WbListUtils.java similarity index 94% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/WbListUtils.java rename to src/main/java/dev/vality/fraudbusters/management/utils/WbListUtils.java index cb7d0d3a..e95f4f2d 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/WbListUtils.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/WbListUtils.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java b/src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java similarity index 88% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java rename to src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java index 85db0730..0521bfbf 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvFraudPaymentParser.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.utils.parser; +package dev.vality.fraudbusters.management.utils.parser; -import com.rbkmoney.fraudbusters.management.constant.CsvFraudPaymentFields; -import com.rbkmoney.fraudbusters.management.exception.DateFormatException; +import dev.vality.fraudbusters.management.constant.CsvFraudPaymentFields; +import dev.vality.fraudbusters.management.exception.DateFormatException; import dev.vality.damsel.fraudbusters.FraudPayment; import lombok.extern.slf4j.Slf4j; import org.apache.commons.csv.CSVRecord; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvParser.java b/src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvParser.java similarity index 96% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvParser.java rename to src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvParser.java index 485a6437..8f0748fb 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvParser.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvParser.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils.parser; +package dev.vality.fraudbusters.management.utils.parser; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; diff --git a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java b/src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java similarity index 89% rename from src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java rename to src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java index f8316aaf..308ecdc5 100644 --- a/src/main/java/com/rbkmoney/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java +++ b/src/main/java/dev/vality/fraudbusters/management/utils/parser/CsvPaymentCountInfoParser.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.utils.parser; +package dev.vality.fraudbusters.management.utils.parser; -import com.rbkmoney.fraudbusters.management.constant.CsvPaymentListLoadFields; -import com.rbkmoney.fraudbusters.management.exception.DateFormatException; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.constant.CsvPaymentListLoadFields; +import dev.vality.fraudbusters.management.exception.DateFormatException; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.swag.fraudbusters.management.model.CountInfo; import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; import dev.vality.swag.fraudbusters.management.model.PaymentListRecord; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java b/src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java similarity index 85% rename from src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java rename to src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java index a4687b84..7d26a5f6 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/ExceptionApplicationTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java @@ -1,22 +1,24 @@ -package com.rbkmoney.fraudbusters.management; +package dev.vality.fraudbusters.management; import com.rbkmoney.dao.DaoException; import com.rbkmoney.fraudbusters.management.converter.payment.*; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.ListRecord; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; -import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; -import com.rbkmoney.fraudbusters.management.domain.response.ErrorResponse; -import com.rbkmoney.fraudbusters.management.exception.KafkaSerializationException; -import com.rbkmoney.fraudbusters.management.listener.WbListEventListener; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsListsResource; -import com.rbkmoney.fraudbusters.management.service.WbListCommandService; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsListsService; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.domain.ListRecord; +import dev.vality.fraudbusters.management.domain.payment.PaymentCountInfo; +import dev.vality.fraudbusters.management.domain.payment.PaymentListRecord; +import dev.vality.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; +import dev.vality.fraudbusters.management.domain.response.ErrorResponse; +import dev.vality.fraudbusters.management.exception.KafkaSerializationException; +import dev.vality.fraudbusters.management.listener.WbListEventListener; +import dev.vality.fraudbusters.management.resource.payment.PaymentsListsResource; +import dev.vality.fraudbusters.management.service.WbListCommandService; +import dev.vality.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.service.payment.PaymentsListsService; import com.rbkmoney.fraudbusters.management.utils.*; -import com.rbkmoney.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; +import dev.vality.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; import dev.vality.damsel.wb_list.ListType; +import dev.vality.fraudbusters.management.converter.payment.*; +import dev.vality.fraudbusters.management.utils.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java b/src/test/java/dev/vality/fraudbusters/management/TestObjectFactory.java similarity index 96% rename from src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java rename to src/test/java/dev/vality/fraudbusters/management/TestObjectFactory.java index d37acd85..30035392 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/TestObjectFactory.java +++ b/src/test/java/dev/vality/fraudbusters/management/TestObjectFactory.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management; +package dev.vality.fraudbusters.management; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; -import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; +import dev.vality.fraudbusters.management.domain.payment.PaymentCountInfo; +import dev.vality.fraudbusters.management.domain.payment.PaymentListRecord; +import dev.vality.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; import dev.vality.damsel.fraudbusters_notificator.ChannelType; import dev.vality.damsel.fraudbusters_notificator.NotificationStatus; import dev.vality.damsel.wb_list.*; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java b/src/test/java/dev/vality/fraudbusters/management/config/ConsumerConfig.java similarity index 81% rename from src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java rename to src/test/java/dev/vality/fraudbusters/management/config/ConsumerConfig.java index 9eadf956..1f3f86c4 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/config/ConsumerConfig.java +++ b/src/test/java/dev/vality/fraudbusters/management/config/ConsumerConfig.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; -import com.rbkmoney.fraudbusters.management.serializer.CommandChangeDeserializer; +import dev.vality.fraudbusters.management.serializer.CommandChangeDeserializer; import dev.vality.damsel.wb_list.ChangeCommand; import dev.vality.testcontainers.annotations.kafka.config.KafkaConsumer; import org.springframework.beans.factory.annotation.Value; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java b/src/test/java/dev/vality/fraudbusters/management/config/KafkaITest.java similarity index 95% rename from src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java rename to src/test/java/dev/vality/fraudbusters/management/config/KafkaITest.java index 4e8f7a20..76b4656b 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/config/KafkaITest.java +++ b/src/test/java/dev/vality/fraudbusters/management/config/KafkaITest.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import dev.vality.testcontainers.annotations.KafkaSpringBootTest; import dev.vality.testcontainers.annotations.kafka.KafkaTestcontainer; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java b/src/test/java/dev/vality/fraudbusters/management/config/PostgresqlJooqITest.java similarity index 89% rename from src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java rename to src/test/java/dev/vality/fraudbusters/management/config/PostgresqlJooqITest.java index f661fcf0..ea594293 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/config/PostgresqlJooqITest.java +++ b/src/test/java/dev/vality/fraudbusters/management/config/PostgresqlJooqITest.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.config; +package dev.vality.fraudbusters.management.config; import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainer; import org.springframework.boot.test.autoconfigure.jooq.JooqTest; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java b/src/test/java/dev/vality/fraudbusters/management/converter/EventToAuditLogConverterTest.java similarity index 96% rename from src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java rename to src/test/java/dev/vality/fraudbusters/management/converter/EventToAuditLogConverterTest.java index 1f36c6ef..d4413db0 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/EventToAuditLogConverterTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/converter/EventToAuditLogConverterTest.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.converter; +package dev.vality.fraudbusters.management.converter; import dev.vality.damsel.wb_list.*; import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java b/src/test/java/dev/vality/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java similarity index 90% rename from src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java rename to src/test/java/dev/vality/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java index d369b1fb..d2f233e1 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/converter/payment/RowToWbListRecordsConverterTest.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.fraudbusters.management.TestObjectFactory; -import com.rbkmoney.fraudbusters.management.utils.RowUtilsService; +import dev.vality.fraudbusters.management.TestObjectFactory; +import dev.vality.fraudbusters.management.utils.RowUtilsService; import dev.vality.damsel.wb_list.Row; import dev.vality.fraudbusters.management.domain.enums.ListType; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java b/src/test/java/dev/vality/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java similarity index 92% rename from src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java rename to src/test/java/dev/vality/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java index 9d0ed669..5bcd3c54 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/converter/payment/TestCheckedDataSetModelToCheckedDataSetApiConverterTest.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java b/src/test/java/dev/vality/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java similarity index 82% rename from src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java rename to src/test/java/dev/vality/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java index 8e9bc5de..3cc08a72 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java +++ b/src/test/java/dev/vality/fraudbusters/management/converter/payment/TestHistoricalDataSetCheckResultToTestCheckedDataSetModelConverter.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.converter.payment; +package dev.vality.fraudbusters.management.converter.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.utils.DataSourceBeanUtils; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.utils.DataSourceBeanUtils; import dev.vality.damsel.fraudbusters.*; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java similarity index 94% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java index 3c36ddee..d411c148 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/audit/CommandAuditDaoImplTest.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.dao.audit; +package dev.vality.fraudbusters.management.dao.audit; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import dev.vality.fraudbusters.management.domain.enums.CommandType; import dev.vality.fraudbusters.management.domain.enums.ObjectType; import dev.vality.fraudbusters.management.domain.tables.pojos.CommandAudit; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java similarity index 89% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java index 580cce9d..18b08416 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/group/GroupReferenceDaoImplTest.java @@ -1,11 +1,12 @@ -package com.rbkmoney.fraudbusters.management.dao.group; +package dev.vality.fraudbusters.management.dao.group; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import org.jooq.SortOrder; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; @@ -133,7 +134,7 @@ void insert() { SortOrder.DESC)); assertNotEquals(paymentGroupReferenceModels.get(0).getShopId(), secondPage.get(0).getShopId()); - assertNotEquals(paymentGroupReferenceModels.get(0).getGroupId(), secondPage.get(0).getGroupId()); + Assertions.assertNotEquals(paymentGroupReferenceModels.get(0).getGroupId(), secondPage.get(0).getGroupId()); paymentGroupReferenceModels = groupReferenceDao.filterReference(new FilterRequest( GROUP_ID, diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/group/PaymentGroupDaoTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/group/PaymentGroupDaoTest.java similarity index 87% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/group/PaymentGroupDaoTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/group/PaymentGroupDaoTest.java index 7db61fb8..a02894f0 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/group/PaymentGroupDaoTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/group/PaymentGroupDaoTest.java @@ -1,11 +1,11 @@ -package com.rbkmoney.fraudbusters.management.dao.group; - -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.dao.GroupDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupDao; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.fraudbusters.management.utils.GroupRowToModelMapper; +package dev.vality.fraudbusters.management.dao.group; + +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.dao.GroupDao; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupDao; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.utils.GroupRowToModelMapper; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java similarity index 92% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java index 0d4aee43..aac720da 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/DefaultPaymentReferenceDaoImplTest.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.dao.payment; +package dev.vality.fraudbusters.management.dao.payment; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java similarity index 89% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java index 378bd7bf..fa9dfb6e 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/PaymentGroupReferenceDaoImplTest.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.dao.payment; +package dev.vality.fraudbusters.management.dao.payment; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; import dev.vality.fraudbusters.management.domain.tables.records.FGroupReferenceRecord; import org.jooq.DSLContext; import org.jooq.Result; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java similarity index 92% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java index d0d4fb40..43933bdc 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/PaymentTemplateDaoTest.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.dao.payment; +package dev.vality.fraudbusters.management.dao.payment; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.dao.TemplateDao; -import com.rbkmoney.fraudbusters.management.dao.payment.template.PaymentTemplateDao; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.dao.TemplateDao; +import dev.vality.fraudbusters.management.dao.payment.template.PaymentTemplateDao; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import lombok.extern.slf4j.Slf4j; import org.jooq.SortOrder; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java similarity index 88% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java index 4b06d500..6692c33a 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/ReferenceDaoImplTest.java @@ -1,15 +1,16 @@ -package com.rbkmoney.fraudbusters.management.dao.payment; - -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.domain.ReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; +package dev.vality.fraudbusters.management.dao.payment; + +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.domain.ReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; import org.jooq.DSLContext; import org.jooq.SortOrder; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; @@ -205,7 +206,7 @@ void filterTest() { 5, "template_id", SortOrder.ASC)); - assertEquals(SECOND + id, paymentReferenceModels.get(0).getId()); + Assertions.assertEquals(SECOND + id, paymentReferenceModels.get(0).getId()); paymentReferenceModels = referenceDao.filterReferences(new FilterRequest( null, @@ -214,7 +215,7 @@ void filterTest() { 5, "template_id", SortOrder.DESC)); - assertEquals(THIRD + id, paymentReferenceModels.get(0).getId()); + Assertions.assertEquals(THIRD + id, paymentReferenceModels.get(0).getId()); //check paging paymentReferenceModels = referenceDao.filterReferences(new FilterRequest( @@ -224,7 +225,7 @@ void filterTest() { 1, null, null)); - assertEquals(SECOND + id, paymentReferenceModels.get(0).getId()); + Assertions.assertEquals(SECOND + id, paymentReferenceModels.get(0).getId()); paymentReferenceModels = referenceDao.filterReferences(new FilterRequest( null, @@ -233,7 +234,7 @@ void filterTest() { 1, null, null)); - assertEquals(id, paymentReferenceModels.get(0).getId()); + Assertions.assertEquals(id, paymentReferenceModels.get(0).getId()); paymentReferenceModels = referenceDao.filterReferences(new FilterRequest( null, @@ -242,7 +243,7 @@ void filterTest() { 1, null, null)); - assertEquals(THIRD + id, paymentReferenceModels.get(0).getId()); + Assertions.assertEquals(THIRD + id, paymentReferenceModels.get(0).getId()); paymentReferenceModels .forEach(paymentReferenceModel -> referenceDao.remove(paymentReferenceModel)); diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java similarity index 87% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java rename to src/test/java/dev/vality/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java index 69ed6f4e..d121c05a 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/dataset/TestDataSetCheckingResultDaoImpl.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.dataset; +package dev.vality.fraudbusters.management.dao.payment.dataset; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedPaymentModel; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.CheckedPaymentModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java similarity index 81% rename from src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java rename to src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java index 1aa9547c..4afc77c2 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java @@ -1,14 +1,15 @@ -package com.rbkmoney.fraudbusters.management.dao.payment.wblist; +package dev.vality.fraudbusters.management.dao.payment.wblist; -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; import com.rbkmoney.fraudbusters.management.converter.ListRecordToRowConverterImpl; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordsToCountInfoListRequestConverter; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.utils.CountInfoApiUtils; -import com.rbkmoney.fraudbusters.management.utils.CountInfoUtils; -import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; +import dev.vality.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; +import dev.vality.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; +import dev.vality.fraudbusters.management.converter.payment.WbListRecordsToCountInfoListRequestConverter; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.utils.CountInfoApiUtils; +import dev.vality.fraudbusters.management.utils.CountInfoUtils; +import dev.vality.fraudbusters.management.utils.PaymentCountInfoGenerator; +import dev.vality.fraudbusters.management.TestObjectFactory; import dev.vality.fraudbusters.management.domain.enums.ListType; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import dev.vality.fraudbusters.management.domain.tables.records.WbListRecordsRecord; @@ -25,8 +26,6 @@ import java.util.List; import java.util.stream.Collectors; -import static com.rbkmoney.fraudbusters.management.TestObjectFactory.createWbListRecordsRecord; -import static com.rbkmoney.fraudbusters.management.TestObjectFactory.randomString; import static dev.vality.fraudbusters.management.domain.tables.WbListRecords.WB_LIST_RECORDS; import static org.junit.jupiter.api.Assertions.*; @@ -193,12 +192,14 @@ void shouldGetNothingWithNotExistRecords() { @Test void shouldGetNothingRottenRecords() { - WbListRecordsRecord freshRecord1 = createWbListRecordsRecord(randomString()); + WbListRecordsRecord freshRecord1 = TestObjectFactory.createWbListRecordsRecord( + TestObjectFactory.randomString()); freshRecord1.setTimeToLive(LocalDateTime.now().plusDays(1)); - freshRecord1.setValue(randomString()); - WbListRecordsRecord freshRecord2 = createWbListRecordsRecord(randomString()); + freshRecord1.setValue(TestObjectFactory.randomString()); + WbListRecordsRecord freshRecord2 = TestObjectFactory.createWbListRecordsRecord( + TestObjectFactory.randomString()); freshRecord2.setTimeToLive(LocalDateTime.now().plusDays(2)); - freshRecord2.setValue(randomString()); + freshRecord2.setValue(TestObjectFactory.randomString()); dslContext.insertInto(WB_LIST_RECORDS) .set(freshRecord1) .newRecord() @@ -211,18 +212,20 @@ void shouldGetNothingRottenRecords() { @Test void shouldGetRottenRecords() { - WbListRecordsRecord rotRecord1 = createWbListRecordsRecord(randomString()); + WbListRecordsRecord rotRecord1 = TestObjectFactory.createWbListRecordsRecord(TestObjectFactory.randomString()); rotRecord1.setTimeToLive(LocalDateTime.now().minusDays(1)); - rotRecord1.setValue(randomString()); - WbListRecordsRecord rotRecord2 = createWbListRecordsRecord(randomString()); + rotRecord1.setValue(TestObjectFactory.randomString()); + WbListRecordsRecord rotRecord2 = TestObjectFactory.createWbListRecordsRecord(TestObjectFactory.randomString()); rotRecord2.setTimeToLive(LocalDateTime.now().minusDays(2)); - rotRecord2.setValue(randomString()); - WbListRecordsRecord freshRecord1 = createWbListRecordsRecord(randomString()); + rotRecord2.setValue(TestObjectFactory.randomString()); + WbListRecordsRecord freshRecord1 = TestObjectFactory.createWbListRecordsRecord( + TestObjectFactory.randomString()); freshRecord1.setTimeToLive(LocalDateTime.now().plusDays(1)); - freshRecord1.setValue(randomString()); - WbListRecordsRecord freshRecord2 = createWbListRecordsRecord(randomString()); + freshRecord1.setValue(TestObjectFactory.randomString()); + WbListRecordsRecord freshRecord2 = TestObjectFactory.createWbListRecordsRecord( + TestObjectFactory.randomString()); freshRecord2.setTimeToLive(LocalDateTime.now().plusDays(2)); - freshRecord2.setValue(randomString()); + freshRecord2.setValue(TestObjectFactory.randomString()); dslContext.insertInto(WB_LIST_RECORDS) .set(rotRecord1) .newRecord() diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java b/src/test/java/dev/vality/fraudbusters/management/kafka/DeleteFromListTest.java similarity index 88% rename from src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java rename to src/test/java/dev/vality/fraudbusters/management/kafka/DeleteFromListTest.java index 738bacd9..c10969de 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/DeleteFromListTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/kafka/DeleteFromListTest.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.kafka; +package dev.vality.fraudbusters.management.kafka; -import com.rbkmoney.fraudbusters.management.config.KafkaITest; -import com.rbkmoney.fraudbusters.management.controller.ErrorController; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsListsResource; +import dev.vality.fraudbusters.management.config.KafkaITest; +import dev.vality.fraudbusters.management.controller.ErrorController; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.resource.payment.PaymentsListsResource; import dev.vality.damsel.wb_list.ChangeCommand; import dev.vality.damsel.wb_list.Command; import dev.vality.damsel.wb_list.ListType; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java b/src/test/java/dev/vality/fraudbusters/management/kafka/InsertInListTest.java similarity index 85% rename from src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java rename to src/test/java/dev/vality/fraudbusters/management/kafka/InsertInListTest.java index 354db5eb..e336f296 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/InsertInListTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/kafka/InsertInListTest.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.kafka; +package dev.vality.fraudbusters.management.kafka; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.rbkmoney.fraudbusters.management.TestObjectFactory; -import com.rbkmoney.fraudbusters.management.config.KafkaITest; -import com.rbkmoney.fraudbusters.management.controller.ErrorController; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; -import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsListsResource; +import dev.vality.fraudbusters.management.TestObjectFactory; +import dev.vality.fraudbusters.management.config.KafkaITest; +import dev.vality.fraudbusters.management.controller.ErrorController; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentListRecord; +import dev.vality.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; +import dev.vality.fraudbusters.management.resource.payment.PaymentsListsResource; import dev.vality.damsel.wb_list.ChangeCommand; import dev.vality.damsel.wb_list.Command; import dev.vality.damsel.wb_list.ListType; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java b/src/test/java/dev/vality/fraudbusters/management/kafka/TemplateApplicationTest.java similarity index 85% rename from src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java rename to src/test/java/dev/vality/fraudbusters/management/kafka/TemplateApplicationTest.java index 6e188bda..0eb20085 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/TemplateApplicationTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/kafka/TemplateApplicationTest.java @@ -1,22 +1,22 @@ -package com.rbkmoney.fraudbusters.management.kafka; - -import com.rbkmoney.fraudbusters.management.config.KafkaITest; -import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.template.PaymentTemplateDao; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.filter.UnknownPaymentTemplateInReferenceFilter; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentGroupsResource; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsReferenceResource; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentsTemplatesResource; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; +package dev.vality.fraudbusters.management.kafka; + +import dev.vality.fraudbusters.management.config.KafkaITest; +import dev.vality.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupDao; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.template.PaymentTemplateDao; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.filter.UnknownPaymentTemplateInReferenceFilter; +import dev.vality.fraudbusters.management.resource.payment.PaymentGroupsResource; +import dev.vality.fraudbusters.management.resource.payment.PaymentsReferenceResource; +import dev.vality.fraudbusters.management.resource.payment.PaymentsTemplatesResource; +import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.damsel.fraudbusters.MerchantInfo; import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import dev.vality.damsel.fraudbusters.ReferenceInfo; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java b/src/test/java/dev/vality/fraudbusters/management/kafka/WbListApplicationTest.java similarity index 91% rename from src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java rename to src/test/java/dev/vality/fraudbusters/management/kafka/WbListApplicationTest.java index 2f2f91fa..1c1184ff 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/kafka/WbListApplicationTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/kafka/WbListApplicationTest.java @@ -1,12 +1,12 @@ -package com.rbkmoney.fraudbusters.management.kafka; - -import com.rbkmoney.fraudbusters.management.config.KafkaITest; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentCountInfo; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentListRecord; -import com.rbkmoney.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; -import com.rbkmoney.fraudbusters.management.service.iface.AuditService; -import com.rbkmoney.fraudbusters.management.utils.MethodPaths; +package dev.vality.fraudbusters.management.kafka; + +import dev.vality.fraudbusters.management.config.KafkaITest; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.domain.payment.PaymentCountInfo; +import dev.vality.fraudbusters.management.domain.payment.PaymentListRecord; +import dev.vality.fraudbusters.management.domain.payment.request.ListRowsInsertRequest; +import dev.vality.fraudbusters.management.service.iface.AuditService; +import dev.vality.fraudbusters.management.utils.MethodPaths; import dev.vality.damsel.wb_list.*; import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; import dev.vality.swag.fraudbusters.management.model.ListResponse; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java b/src/test/java/dev/vality/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java similarity index 83% rename from src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java rename to src/test/java/dev/vality/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java index 045128ea..fdce5b83 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/listener/InitiatingEntityEventSinkListenerTest.java @@ -1,9 +1,9 @@ -package com.rbkmoney.fraudbusters.management.listener; +package dev.vality.fraudbusters.management.listener; -import com.rbkmoney.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentTemplateReferenceService; +import dev.vality.fraudbusters.management.dao.payment.DefaultPaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.domain.payment.DefaultPaymentReferenceModel; +import dev.vality.fraudbusters.management.service.payment.PaymentTemplateReferenceService; import dev.vality.damsel.fraudbusters.MerchantInfo; import dev.vality.damsel.fraudbusters.ReferenceInfo; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/AuditResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/AuditResourceTest.java similarity index 92% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/AuditResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/AuditResourceTest.java index e8986dd6..404b31d9 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/AuditResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/AuditResourceTest.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.resource; +package dev.vality.fraudbusters.management.resource; -import com.rbkmoney.fraudbusters.management.dao.audit.CommandAuditDao; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +import dev.vality.fraudbusters.management.dao.audit.CommandAuditDao; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java similarity index 79% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java index d281b149..45632ab4 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/PaymentEmulateResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java @@ -1,23 +1,23 @@ -package com.rbkmoney.fraudbusters.management.resource; +package dev.vality.fraudbusters.management.resource; import com.rbkmoney.fraudbusters.management.converter.payment.TemplateModelToTemplateConverterImpl; -import com.rbkmoney.fraudbusters.management.dao.GroupDao; -import com.rbkmoney.fraudbusters.management.dao.TemplateDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupDao; -import com.rbkmoney.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; -import com.rbkmoney.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.template.PaymentTemplateDao; -import com.rbkmoney.fraudbusters.management.domain.GroupModel; -import com.rbkmoney.fraudbusters.management.domain.PriorityIdModel; -import com.rbkmoney.fraudbusters.management.domain.TemplateModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentReferenceModel; -import com.rbkmoney.fraudbusters.management.resource.payment.PaymentEmulateResource; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentEmulateService; -import com.rbkmoney.fraudbusters.management.utils.GroupRowToModelMapper; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.dao.GroupDao; +import dev.vality.fraudbusters.management.dao.TemplateDao; +import dev.vality.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupDao; +import dev.vality.fraudbusters.management.dao.payment.group.PaymentGroupReferenceDao; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDao; +import dev.vality.fraudbusters.management.dao.payment.reference.PaymentReferenceDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.template.PaymentTemplateDao; +import dev.vality.fraudbusters.management.domain.GroupModel; +import dev.vality.fraudbusters.management.domain.PriorityIdModel; +import dev.vality.fraudbusters.management.domain.TemplateModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentGroupReferenceModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentReferenceModel; +import dev.vality.fraudbusters.management.resource.payment.PaymentEmulateResource; +import dev.vality.fraudbusters.management.service.payment.PaymentEmulateService; +import dev.vality.fraudbusters.management.utils.GroupRowToModelMapper; +import dev.vality.fraudbusters.management.utils.UserInfoService; import dev.vality.swag.fraudbusters.management.model.EmulateResponse; import dev.vality.swag.fraudbusters.management.model.Template; import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/notificator/NotificationResourceTest.java similarity index 90% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/notificator/NotificationResourceTest.java index 739663a3..ae71411c 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/notificator/NotificationResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/notificator/NotificationResourceTest.java @@ -1,22 +1,23 @@ -package com.rbkmoney.fraudbusters.management.resource.notificator; +package dev.vality.fraudbusters.management.resource.notificator; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.rbkmoney.fraudbusters.management.TestObjectFactory; -import com.rbkmoney.fraudbusters.management.controller.ErrorController; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.ChannelConverter; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.NotificationConverter; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.NotificationTemplateConverter; -import com.rbkmoney.fraudbusters.management.resource.notificator.converter.ValidationConverter; -import com.rbkmoney.fraudbusters.management.service.ChannelServiceImpl; -import com.rbkmoney.fraudbusters.management.service.NotificationServiceImpl; -import com.rbkmoney.fraudbusters.management.service.NotificationTemplateServiceImpl; +import dev.vality.fraudbusters.management.TestObjectFactory; +import dev.vality.fraudbusters.management.controller.ErrorController; +import dev.vality.fraudbusters.management.resource.notificator.converter.ChannelConverter; +import dev.vality.fraudbusters.management.resource.notificator.converter.NotificationConverter; +import dev.vality.fraudbusters.management.resource.notificator.converter.NotificationTemplateConverter; +import dev.vality.fraudbusters.management.resource.notificator.converter.ValidationConverter; +import dev.vality.fraudbusters.management.service.ChannelServiceImpl; +import dev.vality.fraudbusters.management.service.NotificationServiceImpl; +import dev.vality.fraudbusters.management.service.NotificationTemplateServiceImpl; import dev.vality.damsel.fraudbusters_notificator.*; import dev.vality.swag.fraudbusters.management.model.Channel; import dev.vality.swag.fraudbusters.management.model.Notification; import dev.vality.swag.fraudbusters.management.model.ValidationError; import dev.vality.swag.fraudbusters.management.model.ValidationResponse; import org.apache.thrift.TException; +import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,7 +32,6 @@ import java.util.List; import java.util.stream.Collectors; -import static com.rbkmoney.fraudbusters.management.controller.ErrorController.NOTIFICATOR_CALL_EXCEPTION; import static dev.vality.damsel.fraudbusters_notificator.fraudbusters_notificatorConstants.VALIDATION_ERROR; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; @@ -81,7 +81,7 @@ void createChannelWithErrorCall() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(channel))) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator create channel"))); } @@ -116,7 +116,7 @@ void createOrUpdateNotificationWithErrorCall() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(notification))) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator create notification"))); } @@ -133,7 +133,7 @@ void createOrUpdateNotificationWithValidationErrorCall() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(notification))) .andExpect(status().isBadRequest()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is(reason))); } @@ -169,7 +169,7 @@ void removeChannelWithErrorCall() throws Exception { mockMvc.perform(delete("/notifications/channels/channel/{name}", channelName)) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator remove channel"))); } @@ -191,7 +191,7 @@ void removeNotificationWithErrorCall() throws Exception { mockMvc.perform(delete("/notifications/{id}", notificationId)) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator remove notification"))); } @@ -216,7 +216,7 @@ void validateNotificationWithErrorCall() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(notification))) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator validate notification"))); } @@ -281,7 +281,7 @@ void getNotificationsWithErrorCall() throws Exception { .param("size", String.valueOf(size)) .param("searchValue", searchValue)) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getAll notifications"))); } @@ -330,7 +330,7 @@ void getNotificationByIDWithErrorCall() throws Exception { mockMvc.perform(get("/notifications/{id}", id) .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getById notification"))); } @@ -350,7 +350,7 @@ void getChannelsWithErrorCall() throws Exception { .param("size", String.valueOf(size)) .param("searchValue", searchValue)) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getAll channels"))); } @@ -398,7 +398,7 @@ void getChannelByIDWithErrorCall() throws Exception { mockMvc.perform(get("/notifications/channels/channel/{name}", name) .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getById channel"))); } @@ -412,7 +412,7 @@ void updateNotificationStatusWithErrorCall() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(dev.vality.swag.fraudbusters.management.model.NotificationStatus.ACTIVE.getValue())) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator update notification status"))); @@ -440,7 +440,7 @@ void getChannelTypesWithErrorCall() throws Exception { mockMvc.perform(get("/notifications/channels/types")) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getAll channel types"))); } @@ -463,7 +463,7 @@ void getTemplatesWithErrorCall() throws Exception { mockMvc.perform(get("/notifications/templates")) .andExpect(status().isBadGateway()) - .andExpect(jsonPath("$.code", is(NOTIFICATOR_CALL_EXCEPTION))) + .andExpect(jsonPath("$.code", Matchers.is(ErrorController.NOTIFICATOR_CALL_EXCEPTION))) .andExpect(jsonPath("$.message", is("Error call notificator getAll templates"))); } diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java similarity index 93% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java index 04616d17..922df0e1 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentDataSetsResourceTest.java @@ -1,10 +1,10 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; import com.fasterxml.jackson.databind.ObjectMapper; -import com.rbkmoney.fraudbusters.management.domain.payment.CheckedDataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsDataSetService; -import com.rbkmoney.fraudbusters.management.utils.DataSourceBeanUtils; +import dev.vality.fraudbusters.management.domain.payment.CheckedDataSetModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.service.payment.PaymentsDataSetService; +import dev.vality.fraudbusters.management.utils.DataSourceBeanUtils; import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; import dev.vality.swag.fraudbusters.management.model.DataSet; import dev.vality.swag.fraudbusters.management.model.Payment; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java similarity index 94% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java index 3a6971e5..d6ca4513 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java @@ -1,7 +1,8 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; import dev.vality.damsel.fraudbusters.HistoricalDataResponse; import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; +import dev.vality.fraudbusters.management.resource.utils.ExternalModelBeanFactory; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +15,6 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; -import static com.rbkmoney.fraudbusters.management.resource.utils.ExternalModelBeanFactory.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -37,7 +37,7 @@ public class PaymentHistoricalDataResourceTest { @Test public void filterPaymentsInfo() throws Exception { when(iface.getPayments(any(), any(), any())).thenReturn(new HistoricalDataResponse() - .setData(createHistoricalData())); + .setData(ExternalModelBeanFactory.createHistoricalData())); LinkedMultiValueMap params = createParams(); this.mockMvc.perform(get("/payments-historical-data/payments-info") .queryParams(params)) @@ -59,7 +59,7 @@ public void filterPaymentsInfo() throws Exception { @Test public void filterRefundsInfo() throws Exception { when(iface.getRefunds(any(), any(), any())).thenReturn(new HistoricalDataResponse() - .setData(createHistoricalDataRefunds())); + .setData(ExternalModelBeanFactory.createHistoricalDataRefunds())); LinkedMultiValueMap params = createParams(); this.mockMvc.perform(get("/payments-historical-data/refunds") .queryParams(params)) @@ -80,7 +80,7 @@ public void filterRefundsInfo() throws Exception { @Test public void filterInspectResults() throws Exception { when(iface.getFraudResults(any(), any(), any())).thenReturn(new HistoricalDataResponse() - .setData(createHistoricalDataInspectResults())); + .setData(ExternalModelBeanFactory.createHistoricalDataInspectResults())); LinkedMultiValueMap params = createParams(); this.mockMvc.perform(get("/payments-historical-data/inspect-results") .queryParams(params)) @@ -104,7 +104,7 @@ public void filterInspectResults() throws Exception { @Test public void filterFraudPayments() throws Exception { when(iface.getFraudPayments(any(), any(), any())).thenReturn(new HistoricalDataResponse() - .setData(createHistoricalDataFraudPaymentInfos())); + .setData(ExternalModelBeanFactory.createHistoricalDataFraudPaymentInfos())); LinkedMultiValueMap params = createParams(); this.mockMvc.perform(get("/payments-historical-data/fraud-payments") .queryParams(params)) @@ -127,7 +127,7 @@ public void filterFraudPayments() throws Exception { @Test public void filterChargebacks() throws Exception { when(iface.getChargebacks(any(), any(), any())).thenReturn(new HistoricalDataResponse() - .setData(createHistoricalDataChargebacks())); + .setData(ExternalModelBeanFactory.createHistoricalDataChargebacks())); LinkedMultiValueMap params = createParams(); this.mockMvc.perform(get("/payments-historical-data/chargebacks") .queryParams(params)) diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java similarity index 71% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java index 5c30835c..275f0037 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentListLoadDataResourceTest.java @@ -1,14 +1,14 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; - -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordsModelToWbListRecordConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; -import com.rbkmoney.fraudbusters.management.service.WbListCommandService; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentsListsService; -import com.rbkmoney.fraudbusters.management.utils.ParametersService; -import com.rbkmoney.fraudbusters.management.utils.PaymentCountInfoGenerator; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; +package dev.vality.fraudbusters.management.resource.payment; + +import dev.vality.fraudbusters.management.converter.payment.WbListRecordToRowConverter; +import dev.vality.fraudbusters.management.converter.payment.WbListRecordsModelToWbListRecordConverter; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.service.WbListCommandService; +import dev.vality.fraudbusters.management.service.payment.PaymentsListsService; +import dev.vality.fraudbusters.management.utils.ParametersService; +import dev.vality.fraudbusters.management.utils.PaymentCountInfoGenerator; +import dev.vality.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; import dev.vality.damsel.wb_list.ListType; import org.apache.commons.compress.utils.IOUtils; import org.apache.thrift.TException; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java similarity index 84% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java rename to src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java index 0cb09145..f16c8b48 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/payment/PaymentLoadDataResourceTest.java @@ -1,8 +1,8 @@ -package com.rbkmoney.fraudbusters.management.resource.payment; +package dev.vality.fraudbusters.management.resource.payment; -import com.rbkmoney.fraudbusters.management.service.payment.PaymentLoadDataService; -import com.rbkmoney.fraudbusters.management.utils.UserInfoService; -import com.rbkmoney.fraudbusters.management.utils.parser.CsvFraudPaymentParser; +import dev.vality.fraudbusters.management.service.payment.PaymentLoadDataService; +import dev.vality.fraudbusters.management.utils.UserInfoService; +import dev.vality.fraudbusters.management.utils.parser.CsvFraudPaymentParser; import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import org.apache.commons.compress.utils.IOUtils; import org.apache.thrift.TException; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java b/src/test/java/dev/vality/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java similarity index 99% rename from src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java rename to src/test/java/dev/vality/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java index 90586517..331c971f 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/utils/ExternalModelBeanFactory.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.resource.utils; +package dev.vality.fraudbusters.management.resource.utils; import dev.vality.damsel.domain.*; import dev.vality.damsel.fraudbusters.ClientInfo; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java b/src/test/java/dev/vality/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java similarity index 81% rename from src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java rename to src/test/java/dev/vality/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java index 4beb0d76..e2f5c1be 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/service/GreyRottenRuleCleanerServiceTest.java @@ -1,10 +1,11 @@ -package com.rbkmoney.fraudbusters.management.service; +package dev.vality.fraudbusters.management.service; -import com.rbkmoney.fraudbusters.management.converter.payment.WbListRecordToRowConverter; -import com.rbkmoney.fraudbusters.management.dao.payment.wblist.WbListDao; +import dev.vality.fraudbusters.management.converter.payment.WbListRecordToRowConverter; +import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; import dev.vality.damsel.wb_list.Command; import dev.vality.damsel.wb_list.ListType; import dev.vality.damsel.wb_list.Row; +import dev.vality.fraudbusters.management.TestObjectFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,8 +17,6 @@ import java.util.Collections; import java.util.List; -import static com.rbkmoney.fraudbusters.management.TestObjectFactory.createWbListRecords; -import static com.rbkmoney.fraudbusters.management.TestObjectFactory.randomString; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; @@ -57,7 +56,7 @@ void notExistRottenRecords() { @Test void cleanRottenRecords() { when(wbListDao.getRottenRecords(any(LocalDateTime.class))) - .thenReturn(List.of(createWbListRecords(randomString()))); + .thenReturn(List.of(TestObjectFactory.createWbListRecords(TestObjectFactory.randomString()))); greyRottenRuleCleanerService.clean(); diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java b/src/test/java/dev/vality/fraudbusters/management/service/payment/DataSetModelUtils.java similarity index 87% rename from src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java rename to src/test/java/dev/vality/fraudbusters/management/service/payment/DataSetModelUtils.java index 3a1c25c1..a674a885 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/DataSetModelUtils.java +++ b/src/test/java/dev/vality/fraudbusters/management/service/payment/DataSetModelUtils.java @@ -1,7 +1,7 @@ -package com.rbkmoney.fraudbusters.management.service.payment; +package dev.vality.fraudbusters.management.service.payment; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.payment.PaymentModel; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.payment.PaymentModel; import dev.vality.swag.fraudbusters.management.model.Payment; import java.time.LocalDateTime; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java b/src/test/java/dev/vality/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java similarity index 84% rename from src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java rename to src/test/java/dev/vality/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java index 47ef0777..be4b142f 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/service/payment/PaymentsDataSetServiceTest.java @@ -1,12 +1,12 @@ -package com.rbkmoney.fraudbusters.management.service.payment; - -import com.rbkmoney.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.DataSetCheckingResultDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.DataSetDaoImpl; -import com.rbkmoney.fraudbusters.management.dao.payment.dataset.PaymentDaoImpl; -import com.rbkmoney.fraudbusters.management.domain.payment.DataSetModel; -import com.rbkmoney.fraudbusters.management.domain.request.FilterRequest; -import com.rbkmoney.fraudbusters.management.utils.DateTimeUtils; +package dev.vality.fraudbusters.management.service.payment; + +import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; +import dev.vality.fraudbusters.management.dao.payment.dataset.DataSetCheckingResultDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.dataset.DataSetDaoImpl; +import dev.vality.fraudbusters.management.dao.payment.dataset.PaymentDaoImpl; +import dev.vality.fraudbusters.management.domain.payment.DataSetModel; +import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.utils.DateTimeUtils; import dev.vality.fraudbusters.management.domain.tables.records.TestPaymentRecord; import org.jooq.DSLContext; import org.jooq.Result; @@ -17,7 +17,7 @@ import java.time.LocalDateTime; import java.util.List; -import static com.rbkmoney.fraudbusters.management.service.payment.DataSetModelUtils.TEST_INITIATOR; +import static dev.vality.fraudbusters.management.service.payment.DataSetModelUtils.TEST_INITIATOR; import static dev.vality.fraudbusters.management.domain.tables.TestPayment.TEST_PAYMENT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java b/src/test/java/dev/vality/fraudbusters/management/utils/CountInfoApiUtilsTest.java similarity index 97% rename from src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java rename to src/test/java/dev/vality/fraudbusters/management/utils/CountInfoApiUtilsTest.java index a2a9bd43..22f5457d 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CountInfoApiUtilsTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/utils/CountInfoApiUtilsTest.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.damsel.wb_list.RowInfo; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java b/src/test/java/dev/vality/fraudbusters/management/utils/CsvFraudPaymentParserTest.java similarity index 91% rename from src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java rename to src/test/java/dev/vality/fraudbusters/management/utils/CsvFraudPaymentParserTest.java index 64c0a6e2..8c7bbc45 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/CsvFraudPaymentParserTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/utils/CsvFraudPaymentParserTest.java @@ -1,6 +1,6 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; -import com.rbkmoney.fraudbusters.management.utils.parser.CsvFraudPaymentParser; +import dev.vality.fraudbusters.management.utils.parser.CsvFraudPaymentParser; import dev.vality.damsel.fraudbusters.FraudPayment; import org.apache.commons.compress.utils.IOUtils; import org.apache.thrift.TException; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java b/src/test/java/dev/vality/fraudbusters/management/utils/DataSourceBeanUtils.java similarity index 98% rename from src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java rename to src/test/java/dev/vality/fraudbusters/management/utils/DataSourceBeanUtils.java index 54410cd2..061216d1 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/DataSourceBeanUtils.java +++ b/src/test/java/dev/vality/fraudbusters/management/utils/DataSourceBeanUtils.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; import dev.vality.damsel.domain.BankCard; import dev.vality.damsel.domain.Cash; diff --git a/src/test/java/com/rbkmoney/fraudbusters/management/utils/MethodPaths.java b/src/test/java/dev/vality/fraudbusters/management/utils/MethodPaths.java similarity index 90% rename from src/test/java/com/rbkmoney/fraudbusters/management/utils/MethodPaths.java rename to src/test/java/dev/vality/fraudbusters/management/utils/MethodPaths.java index fec1ab81..a3ea05e0 100644 --- a/src/test/java/com/rbkmoney/fraudbusters/management/utils/MethodPaths.java +++ b/src/test/java/dev/vality/fraudbusters/management/utils/MethodPaths.java @@ -1,4 +1,4 @@ -package com.rbkmoney.fraudbusters.management.utils; +package dev.vality.fraudbusters.management.utils; public class MethodPaths { From e4b15abcfabc9e920c73a894ad3db68c8cec25d6 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Mon, 31 Jan 2022 17:37:02 +0300 Subject: [PATCH 9/9] Fix --- .../management/ExceptionApplicationTest.java | 8 +++----- .../dao/payment/wblist/WbListDaoImplTest.java | 10 +++++----- .../resource/PaymentEmulateResourceTest.java | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java b/src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java index 7d26a5f6..6996f6da 100644 --- a/src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/ExceptionApplicationTest.java @@ -1,7 +1,8 @@ package dev.vality.fraudbusters.management; import com.rbkmoney.dao.DaoException; -import com.rbkmoney.fraudbusters.management.converter.payment.*; +import dev.vality.damsel.wb_list.ListType; +import dev.vality.fraudbusters.management.converter.payment.*; import dev.vality.fraudbusters.management.dao.payment.wblist.WbListDao; import dev.vality.fraudbusters.management.domain.ListRecord; import dev.vality.fraudbusters.management.domain.payment.PaymentCountInfo; @@ -14,11 +15,8 @@ import dev.vality.fraudbusters.management.service.WbListCommandService; import dev.vality.fraudbusters.management.service.iface.AuditService; import dev.vality.fraudbusters.management.service.payment.PaymentsListsService; -import com.rbkmoney.fraudbusters.management.utils.*; -import dev.vality.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; -import dev.vality.damsel.wb_list.ListType; -import dev.vality.fraudbusters.management.converter.payment.*; import dev.vality.fraudbusters.management.utils.*; +import dev.vality.fraudbusters.management.utils.parser.CsvPaymentCountInfoParser; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java b/src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java index 4afc77c2..9f033630 100644 --- a/src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/dao/payment/wblist/WbListDaoImplTest.java @@ -1,18 +1,18 @@ package dev.vality.fraudbusters.management.dao.payment.wblist; +import dev.vality.fraudbusters.management.TestObjectFactory; import dev.vality.fraudbusters.management.config.PostgresqlJooqITest; -import com.rbkmoney.fraudbusters.management.converter.ListRecordToRowConverterImpl; +import dev.vality.fraudbusters.management.converter.ListRecordToRowConverterImpl; import dev.vality.fraudbusters.management.converter.payment.PaymentCountInfoRequestToRowConverter; import dev.vality.fraudbusters.management.converter.payment.PaymentListRecordToRowConverter; import dev.vality.fraudbusters.management.converter.payment.WbListRecordsToCountInfoListRequestConverter; +import dev.vality.fraudbusters.management.domain.enums.ListType; import dev.vality.fraudbusters.management.domain.request.FilterRequest; +import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; +import dev.vality.fraudbusters.management.domain.tables.records.WbListRecordsRecord; import dev.vality.fraudbusters.management.utils.CountInfoApiUtils; import dev.vality.fraudbusters.management.utils.CountInfoUtils; import dev.vality.fraudbusters.management.utils.PaymentCountInfoGenerator; -import dev.vality.fraudbusters.management.TestObjectFactory; -import dev.vality.fraudbusters.management.domain.enums.ListType; -import dev.vality.fraudbusters.management.domain.tables.pojos.WbListRecords; -import dev.vality.fraudbusters.management.domain.tables.records.WbListRecordsRecord; import dev.vality.swag.fraudbusters.management.model.PaymentCountInfo; import org.jooq.DSLContext; import org.jooq.SortOrder; diff --git a/src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java b/src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java index 45632ab4..06855d10 100644 --- a/src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/management/resource/PaymentEmulateResourceTest.java @@ -1,6 +1,6 @@ package dev.vality.fraudbusters.management.resource; -import com.rbkmoney.fraudbusters.management.converter.payment.TemplateModelToTemplateConverterImpl; +import dev.vality.fraudbusters.management.converter.payment.TemplateModelToTemplateConverterImpl; import dev.vality.fraudbusters.management.dao.GroupDao; import dev.vality.fraudbusters.management.dao.TemplateDao; import dev.vality.fraudbusters.management.dao.payment.group.GroupReferenceDaoImpl;