From acd08bd8da8f8cd957a69b35a7a782be60a89069 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 19 Mar 2024 15:00:04 +0700 Subject: [PATCH 1/9] Bump libs --- pom.xml | 18 +++++------------- .../service/ListenersConfigurationService.java | 9 ++++----- .../dgraph/DgraphExtendedSideObject.java | 3 +++ .../domain/dgraph/DgraphSideObject.java | 3 +++ .../domain/dgraph/side/DgraphBin.java | 3 +++ .../domain/dgraph/side/DgraphCountry.java | 3 +++ .../domain/dgraph/side/DgraphCurrency.java | 3 +++ .../domain/dgraph/side/DgraphEmail.java | 3 +++ .../domain/dgraph/side/DgraphFingerprint.java | 2 ++ .../domain/dgraph/side/DgraphIp.java | 3 +++ .../domain/dgraph/side/DgraphParty.java | 3 +++ .../domain/dgraph/side/DgraphShop.java | 3 +++ .../domain/dgraph/side/DgraphToken.java | 3 +++ .../LocalCountAggregatorDecorator.java | 2 +- .../resolver/DatabasePaymentFieldResolver.java | 2 +- .../clickhouse/ChargebackEventListener.java | 2 +- .../clickhouse/FraudPaymentListener.java | 2 +- .../clickhouse/PaymentEventListener.java | 2 +- .../events/clickhouse/RefundEventListener.java | 2 +- .../clickhouse/WithdrawalEventListener.java | 2 +- .../payment/ResultAggregatorListener.java | 2 +- .../payment/FraudPaymentInspectorServlet.java | 4 ++-- .../payment/HistoricalDataServiceServlet.java | 4 ++-- .../payment/PaymentServiceServlet.java | 4 ++-- .../payment/PaymentTemplateServlet.java | 4 ++-- src/main/resources/application.yml | 4 ++-- .../fraudbusters/EndToEndIntegrationTest.java | 2 +- .../vality/fraudbusters/FraudPaymentTest.java | 3 +-- .../fraudbusters/LoadDataIntegrationTest.java | 2 +- .../dev/vality/fraudbusters/PreLoadTest.java | 2 +- 30 files changed, 63 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index 5717588b..957809f1 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 1.0.16 + 3.0.0 fraudbusters @@ -27,17 +27,13 @@ 1.7-6d29f86 1.44-5dbd6d4 21.12.0 - 2.2 + 2.3 1.3-979c2b6 - 1.4.3 + 2.0.3 - e1 - squid:S2095 - - **/*StreamFactoryImpl.java - ./src/main/resources/checkstyle/checkstyle-suppressions.xml + 2.1.0 @@ -118,6 +114,7 @@ dev.vality.woody woody-thrift + 2.0.0 dev.vality @@ -143,11 +140,6 @@ columbus-proto ${columbus-proto.version} - - dev.vality - shared-resources - - org.jetbrains diff --git a/src/main/java/dev/vality/fraudbusters/config/service/ListenersConfigurationService.java b/src/main/java/dev/vality/fraudbusters/config/service/ListenersConfigurationService.java index f0f609cd..d7673e10 100644 --- a/src/main/java/dev/vality/fraudbusters/config/service/ListenersConfigurationService.java +++ b/src/main/java/dev/vality/fraudbusters/config/service/ListenersConfigurationService.java @@ -3,7 +3,7 @@ import dev.vality.damsel.fraudbusters.Command; import dev.vality.fraudbusters.serde.CommandDeserializer; import dev.vality.fraudbusters.service.ConsumerGroupIdService; -import dev.vality.kafka.common.exception.handler.SeekToCurrentWithSleepBatchErrorHandler; +import dev.vality.kafka.common.util.ExponentialBackOffDefaultErrorHandlerFactory; import lombok.RequiredArgsConstructor; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.serialization.Deserializer; @@ -14,7 +14,7 @@ import org.springframework.kafka.core.ConsumerFactory; import org.springframework.kafka.core.DefaultKafkaConsumerFactory; import org.springframework.kafka.listener.ContainerProperties; -import org.springframework.kafka.listener.LoggingErrorHandler; +import org.springframework.kafka.listener.DefaultErrorHandler; import org.springframework.retry.RetryPolicy; import org.springframework.retry.backoff.BackOffPolicy; import org.springframework.retry.backoff.ExponentialBackOffPolicy; @@ -62,8 +62,7 @@ public ConcurrentKafkaListenerContainerFactory createDefaultFac new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(stringCommandConsumerFactory); factory.setConcurrency(1); - factory.setRetryTemplate(retryTemplate()); - factory.setErrorHandler(new LoggingErrorHandler()); + factory.setCommonErrorHandler(new DefaultErrorHandler()); return factory; } @@ -118,7 +117,7 @@ public ConcurrentKafkaListenerContainerFactory createDgraphFactor props.put(ConsumerConfig.FETCH_MAX_WAIT_MS_CONFIG, MAX_WAIT_FETCH_MS); props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, false); final ConcurrentKafkaListenerContainerFactory factory = createFactoryWithProps(deserializer, props); - factory.setBatchErrorHandler(new SeekToCurrentWithSleepBatchErrorHandler()); + factory.setCommonErrorHandler(ExponentialBackOffDefaultErrorHandlerFactory.create()); factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL); factory.setConcurrency(dgraphPaymentConcurrency); return factory; diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphExtendedSideObject.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphExtendedSideObject.java index 9d865ea7..3be08560 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphExtendedSideObject.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphExtendedSideObject.java @@ -4,14 +4,17 @@ import dev.vality.fraudbusters.domain.dgraph.side.DgraphFingerprint; import dev.vality.fraudbusters.domain.dgraph.side.DgraphToken; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public abstract class DgraphExtendedSideObject extends DgraphSideObject { public DgraphExtendedSideObject(String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphSideObject.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphSideObject.java index 5566cfd8..119368f7 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphSideObject.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/DgraphSideObject.java @@ -4,14 +4,17 @@ import dev.vality.fraudbusters.domain.dgraph.common.DgraphPayment; import dev.vality.fraudbusters.domain.dgraph.common.DgraphRefund; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public abstract class DgraphSideObject extends DgraphObject { public DgraphSideObject(String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphBin.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphBin.java index 0689db0e..0521d324 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphBin.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphBin.java @@ -4,13 +4,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphBin extends DgraphSideObject { //TODO: добавить заполнение fingerprint'ов public DgraphBin(String cardBin) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCountry.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCountry.java index 3fd6df5c..22083bfb 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCountry.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCountry.java @@ -4,15 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphExtendedSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphCountry extends DgraphExtendedSideObject { //TODO: check fingerprints filling public DgraphCountry(String countryName) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCurrency.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCurrency.java index 22abba8b..3dbfabd4 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCurrency.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphCurrency.java @@ -5,15 +5,18 @@ import dev.vality.fraudbusters.domain.dgraph.DgraphSideObject; import dev.vality.fraudbusters.domain.dgraph.common.DgraphWithdrawal; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphCurrency extends DgraphSideObject { public DgraphCurrency(String currencyCode) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphEmail.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphEmail.java index 4eaa3bae..794dcb0c 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphEmail.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphEmail.java @@ -3,14 +3,17 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphEmail extends DgraphSideObject { public DgraphEmail(String userEmail, String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphFingerprint.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphFingerprint.java index 31303e95..3ea5b127 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphFingerprint.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphFingerprint.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; @@ -12,6 +13,7 @@ @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class DgraphFingerprint extends DgraphSideObject { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphIp.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphIp.java index efad382e..8233d6ac 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphIp.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphIp.java @@ -4,15 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphExtendedSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphIp extends DgraphExtendedSideObject { public DgraphIp(String ipAddress, String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphParty.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphParty.java index 00eb5656..5dfd1543 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphParty.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphParty.java @@ -4,15 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphExtendedSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphParty extends DgraphExtendedSideObject { public DgraphParty(String partyId, String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphShop.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphShop.java index 1c524d81..839f4a29 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphShop.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphShop.java @@ -4,13 +4,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphExtendedSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphShop extends DgraphExtendedSideObject { public DgraphShop(String shopId, String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphToken.java b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphToken.java index ec16b14e..e8bb184f 100644 --- a/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphToken.java +++ b/src/main/java/dev/vality/fraudbusters/domain/dgraph/side/DgraphToken.java @@ -4,15 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import dev.vality.fraudbusters.domain.dgraph.DgraphSideObject; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; import java.util.List; + @Data @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class DgraphToken extends DgraphSideObject { public DgraphToken(String tokenId, String lastDigits, String lastActTime) { diff --git a/src/main/java/dev/vality/fraudbusters/fraud/localstorage/aggregator/LocalCountAggregatorDecorator.java b/src/main/java/dev/vality/fraudbusters/fraud/localstorage/aggregator/LocalCountAggregatorDecorator.java index c45577c5..040e646d 100644 --- a/src/main/java/dev/vality/fraudbusters/fraud/localstorage/aggregator/LocalCountAggregatorDecorator.java +++ b/src/main/java/dev/vality/fraudbusters/fraud/localstorage/aggregator/LocalCountAggregatorDecorator.java @@ -15,8 +15,8 @@ import dev.vality.fraudo.payment.aggregator.CountPaymentAggregator; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; -import javax.validation.constraints.NotNull; import java.time.Instant; import java.util.List; diff --git a/src/main/java/dev/vality/fraudbusters/fraud/payment/resolver/DatabasePaymentFieldResolver.java b/src/main/java/dev/vality/fraudbusters/fraud/payment/resolver/DatabasePaymentFieldResolver.java index 3a4b719d..c115d330 100644 --- a/src/main/java/dev/vality/fraudbusters/fraud/payment/resolver/DatabasePaymentFieldResolver.java +++ b/src/main/java/dev/vality/fraudbusters/fraud/payment/resolver/DatabasePaymentFieldResolver.java @@ -5,9 +5,9 @@ import dev.vality.fraudbusters.fraud.constant.PaymentCheckedField; import dev.vality.fraudbusters.fraud.model.FieldModel; import dev.vality.fraudbusters.fraud.model.PaymentModel; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/ChargebackEventListener.java b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/ChargebackEventListener.java index ee75d266..651a4e62 100644 --- a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/ChargebackEventListener.java +++ b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/ChargebackEventListener.java @@ -22,7 +22,7 @@ public class ChargebackEventListener { @KafkaListener(topics = "${kafka.topic.event.sink.chargeback}", containerFactory = "kafkaChargebackResultListenerContainerFactory") public void listen( - List chargeback, @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition, + List chargeback, @Header(KafkaHeaders.RECEIVED_PARTITION) Integer partition, @Header(KafkaHeaders.OFFSET) Long offset) throws InterruptedException { try { log.info( diff --git a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/FraudPaymentListener.java b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/FraudPaymentListener.java index e6f1a459..e0fd2ab5 100644 --- a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/FraudPaymentListener.java +++ b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/FraudPaymentListener.java @@ -28,7 +28,7 @@ public class FraudPaymentListener { @KafkaListener(topics = "${kafka.topic.fraud.payment}", containerFactory = "kafkaFraudPaymentListenerContainerFactory") public void listen( - List payments, @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition, + List payments, @Header(KafkaHeaders.RECEIVED_PARTITION) Integer partition, @Header(KafkaHeaders.OFFSET) Long offset) throws InterruptedException { try { log.info("FraudPaymentListener listen result size: {} partition: {} offset: {} payments: {}", diff --git a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/PaymentEventListener.java b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/PaymentEventListener.java index 32cac80c..56d0488f 100644 --- a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/PaymentEventListener.java +++ b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/PaymentEventListener.java @@ -44,7 +44,7 @@ public class PaymentEventListener { containerFactory = "kafkaPaymentResultListenerContainerFactory") public void listen( List payments, - @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition, + @Header(KafkaHeaders.RECEIVED_PARTITION) Integer partition, @Header(KafkaHeaders.OFFSET) Long offset) throws InterruptedException { try { log.info( diff --git a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/RefundEventListener.java b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/RefundEventListener.java index faccde97..eac989b2 100644 --- a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/RefundEventListener.java +++ b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/RefundEventListener.java @@ -23,7 +23,7 @@ public class RefundEventListener { containerFactory = "kafkaRefundResultListenerContainerFactory") public void listen( List refunds, - @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition, + @Header(KafkaHeaders.RECEIVED_PARTITION) Integer partition, @Header(KafkaHeaders.OFFSET) Long offset) throws InterruptedException { try { log.info( diff --git a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/WithdrawalEventListener.java b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/WithdrawalEventListener.java index b7ee1139..0cd3099f 100644 --- a/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/WithdrawalEventListener.java +++ b/src/main/java/dev/vality/fraudbusters/listener/events/clickhouse/WithdrawalEventListener.java @@ -26,7 +26,7 @@ public class WithdrawalEventListener { containerFactory = "kafkaWithdrawalResultListenerContainerFactory") public void listen( List withdrawals, - @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition, + @Header(KafkaHeaders.RECEIVED_PARTITION) Integer partition, @Header(KafkaHeaders.OFFSET) Long offset) throws InterruptedException { try { log.info("Listen withdrawals size: {} partition: {} offset: {}", withdrawals.size(), partition, offset); diff --git a/src/main/java/dev/vality/fraudbusters/listener/payment/ResultAggregatorListener.java b/src/main/java/dev/vality/fraudbusters/listener/payment/ResultAggregatorListener.java index 13a5cc73..a838e81d 100644 --- a/src/main/java/dev/vality/fraudbusters/listener/payment/ResultAggregatorListener.java +++ b/src/main/java/dev/vality/fraudbusters/listener/payment/ResultAggregatorListener.java @@ -32,7 +32,7 @@ public class ResultAggregatorListener { @KafkaListener(topics = "${kafka.topic.result}", containerFactory = "kafkaListenerContainerFactory") public void listen( - List batch, @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition, + List batch, @Header(KafkaHeaders.RECEIVED_PARTITION) Integer partition, @Header(KafkaHeaders.OFFSET) Long offset) throws InterruptedException { try { log.info("ResultAggregatorListener listen result size: {} partition: {} offset: {}", diff --git a/src/main/java/dev/vality/fraudbusters/resource/payment/FraudPaymentInspectorServlet.java b/src/main/java/dev/vality/fraudbusters/resource/payment/FraudPaymentInspectorServlet.java index 125cc8eb..58eedd81 100644 --- a/src/main/java/dev/vality/fraudbusters/resource/payment/FraudPaymentInspectorServlet.java +++ b/src/main/java/dev/vality/fraudbusters/resource/payment/FraudPaymentInspectorServlet.java @@ -2,10 +2,10 @@ import dev.vality.damsel.proxy_inspector.InspectorProxySrv; import dev.vality.woody.thrift.impl.http.THServiceBuilder; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebServlet; import lombok.RequiredArgsConstructor; -import javax.servlet.*; -import javax.servlet.annotation.WebServlet; import java.io.IOException; @WebServlet("/fraud_inspector/v1") diff --git a/src/main/java/dev/vality/fraudbusters/resource/payment/HistoricalDataServiceServlet.java b/src/main/java/dev/vality/fraudbusters/resource/payment/HistoricalDataServiceServlet.java index a07d68d7..c0ab06fa 100644 --- a/src/main/java/dev/vality/fraudbusters/resource/payment/HistoricalDataServiceServlet.java +++ b/src/main/java/dev/vality/fraudbusters/resource/payment/HistoricalDataServiceServlet.java @@ -2,10 +2,10 @@ import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv; import dev.vality.woody.thrift.impl.http.THServiceBuilder; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebServlet; import lombok.RequiredArgsConstructor; -import javax.servlet.*; -import javax.servlet.annotation.WebServlet; import java.io.IOException; @WebServlet("/historical_data/v1/") diff --git a/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentServiceServlet.java b/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentServiceServlet.java index 5702e096..b1990fea 100644 --- a/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentServiceServlet.java +++ b/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentServiceServlet.java @@ -2,10 +2,10 @@ import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import dev.vality.woody.thrift.impl.http.THServiceBuilder; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebServlet; import lombok.RequiredArgsConstructor; -import javax.servlet.*; -import javax.servlet.annotation.WebServlet; import java.io.IOException; @WebServlet("/fraud_payment/v1/") diff --git a/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentTemplateServlet.java b/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentTemplateServlet.java index 3f9cefef..9bc107fd 100644 --- a/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentTemplateServlet.java +++ b/src/main/java/dev/vality/fraudbusters/resource/payment/PaymentTemplateServlet.java @@ -2,10 +2,10 @@ import dev.vality.damsel.fraudbusters.PaymentServiceSrv; import dev.vality.woody.thrift.impl.http.THServiceBuilder; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebServlet; import lombok.RequiredArgsConstructor; -import javax.servlet.*; -import javax.servlet.annotation.WebServlet; import java.io.IOException; @WebServlet("/fraud_payment_validator/v1/") diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6659c4a3..a91aa09b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,9 +1,9 @@ -server.port: '@server.port@' +server.port: ${server.port} management: security: enabled: false server: - port: '@management.port@' + port: ${management.port} metrics: export: resolveCountry: true diff --git a/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java b/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java index b86e8eea..5da2c187 100644 --- a/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java +++ b/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java @@ -35,7 +35,7 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.annotation.DirtiesContext; diff --git a/src/test/java/dev/vality/fraudbusters/FraudPaymentTest.java b/src/test/java/dev/vality/fraudbusters/FraudPaymentTest.java index 84ea6c3d..bafdc223 100644 --- a/src/test/java/dev/vality/fraudbusters/FraudPaymentTest.java +++ b/src/test/java/dev/vality/fraudbusters/FraudPaymentTest.java @@ -12,12 +12,11 @@ import dev.vality.woody.thrift.impl.http.THClientBuilder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.apache.thrift.TException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.annotation.DirtiesContext; diff --git a/src/test/java/dev/vality/fraudbusters/LoadDataIntegrationTest.java b/src/test/java/dev/vality/fraudbusters/LoadDataIntegrationTest.java index 4958c14d..155f3bde 100644 --- a/src/test/java/dev/vality/fraudbusters/LoadDataIntegrationTest.java +++ b/src/test/java/dev/vality/fraudbusters/LoadDataIntegrationTest.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.annotation.DirtiesContext; diff --git a/src/test/java/dev/vality/fraudbusters/PreLoadTest.java b/src/test/java/dev/vality/fraudbusters/PreLoadTest.java index 3370087b..fe9b4c81 100644 --- a/src/test/java/dev/vality/fraudbusters/PreLoadTest.java +++ b/src/test/java/dev/vality/fraudbusters/PreLoadTest.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.annotation.DirtiesContext; From 25a7cad4acd32e65e6eb5104260a97b5bfd239c7 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 19 Mar 2024 15:20:04 +0700 Subject: [PATCH 2/9] Bump libs --- .github/workflows/build.yml | 6 +++++- .github/workflows/deploy.yml | 17 +++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6547029..d8193dce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,8 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1 + uses: empayre/java-workflow/.github/workflows/maven-service-build.yml@v2 + secrets: + action-fetch-token: ${{ secrets.ACTIONS_FETCH_TOKEN }} + github-pkg-ro-pat: ${{ secrets.GH_PACKAGES_RO_PAT2 }} + github-pkg-ro-user: 'empayre-bot' diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 91625034..8d9c70fe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,15 +1,20 @@ -name: Deploy Docker Image +name: Maven Deploy Artifact on: push: branches: - 'master' + - 'main' + - 'epic/**' jobs: - build-and-deploy: - uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1 - with: - ignore-coverage: true + deploy: + uses: empayre/java-workflow/.github/workflows/maven-service-deploy.yml@v2 secrets: - github-token: ${{ secrets.GITHUB_TOKEN }} + action-fetch-token: ${{ secrets.ACTIONS_FETCH_TOKEN }} mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }} + github-pkg-ro-pat: ${{ secrets.GH_PACKAGES_RO_PAT2 }} + github-pkg-ro-user: 'empayre-bot' + aws-ecr-access_key: ${{ secrets.ECR_ACCESS_KEY }} + aws-ecr-secret-key: ${{ secrets.ECR_SECRET_KEYS }} + aws-region: ${{ secrets.AWS_REGION }} From aa128b2015b30e8809427e23928be8d074fb7d63 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 19 Mar 2024 15:22:12 +0700 Subject: [PATCH 3/9] Bump libs --- .github/workflows/build.yml | 6 +----- .github/workflows/deploy.yml | 17 ++++++----------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8193dce..4d5c06ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,4 @@ on: jobs: build: - uses: empayre/java-workflow/.github/workflows/maven-service-build.yml@v2 - secrets: - action-fetch-token: ${{ secrets.ACTIONS_FETCH_TOKEN }} - github-pkg-ro-pat: ${{ secrets.GH_PACKAGES_RO_PAT2 }} - github-pkg-ro-user: 'empayre-bot' + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8d9c70fe..e57f79ba 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,20 +1,15 @@ -name: Maven Deploy Artifact +name: Deploy Docker Image on: push: branches: - 'master' - - 'main' - - 'epic/**' jobs: - deploy: - uses: empayre/java-workflow/.github/workflows/maven-service-deploy.yml@v2 + build-and-deploy: + uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2 + with: + ignore-coverage: true secrets: - action-fetch-token: ${{ secrets.ACTIONS_FETCH_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }} - github-pkg-ro-pat: ${{ secrets.GH_PACKAGES_RO_PAT2 }} - github-pkg-ro-user: 'empayre-bot' - aws-ecr-access_key: ${{ secrets.ECR_ACCESS_KEY }} - aws-ecr-secret-key: ${{ secrets.ECR_SECRET_KEYS }} - aws-region: ${{ secrets.AWS_REGION }} From 374f7b4d541dc1eb88249381540b9aab05553234 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 19 Mar 2024 15:43:57 +0700 Subject: [PATCH 4/9] Bump libs --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 957809f1..1de0368e 100644 --- a/pom.xml +++ b/pom.xml @@ -198,8 +198,8 @@ com.github.tomakehurst - wiremock-jre8 - 2.31.0 + wiremock + 3.0.1 test @@ -215,7 +215,7 @@ io.netty netty-codec-http2 - 4.1.76.Final + 4.1.107.Final org.testcontainers From fd4b8dd00cd5146001ce005c2a88df3151f5c0d6 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 19 Mar 2024 16:06:35 +0700 Subject: [PATCH 5/9] Bump libs --- pom.xml | 2 +- .../fraudbusters/repository/HistoricalChargebackDataTest.java | 3 ++- .../clickhouse/impl/HistoricalFraudPaymentDataTest.java | 3 ++- .../clickhouse/impl/HistoricalFraudResultDataTest.java | 3 ++- .../repository/clickhouse/impl/HistoricalPaymentDataTest.java | 3 ++- .../repository/clickhouse/impl/HistoricalRefundDataTest.java | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1de0368e..a5c43b51 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ io.netty netty-codec-http2 - 4.1.107.Final + 4.1.76.Final org.testcontainers diff --git a/src/test/java/dev/vality/fraudbusters/repository/HistoricalChargebackDataTest.java b/src/test/java/dev/vality/fraudbusters/repository/HistoricalChargebackDataTest.java index 1dca533f..163fbb47 100644 --- a/src/test/java/dev/vality/fraudbusters/repository/HistoricalChargebackDataTest.java +++ b/src/test/java/dev/vality/fraudbusters/repository/HistoricalChargebackDataTest.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.jdbc.DataJdbcTest; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.ContextConfiguration; @@ -36,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; @Testcontainers -@DataJdbcTest +@SpringBootTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @ExtendWith({SpringExtension.class, ClickHouseContainerExtension.class}) @ContextConfiguration(classes = { diff --git a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudPaymentDataTest.java b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudPaymentDataTest.java index 1056c6f0..bf8796fb 100644 --- a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudPaymentDataTest.java +++ b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudPaymentDataTest.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.jdbc.DataJdbcTest; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.testcontainers.junit.jupiter.Testcontainers; @@ -32,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; @Testcontainers -@DataJdbcTest +@SpringBootTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @ExtendWith({SpringExtension.class, ClickHouseContainerExtension.class}) @ContextConfiguration(classes = { diff --git a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudResultDataTest.java b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudResultDataTest.java index a2a9a9d2..d6ce7627 100644 --- a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudResultDataTest.java +++ b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalFraudResultDataTest.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.jdbc.DataJdbcTest; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.ContextConfiguration; @@ -34,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.*; @Testcontainers -@DataJdbcTest +@SpringBootTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @ExtendWith({SpringExtension.class, ClickHouseContainerExtension.class}) @ContextConfiguration(classes = { diff --git a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalPaymentDataTest.java b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalPaymentDataTest.java index 649b2984..e4a6387a 100644 --- a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalPaymentDataTest.java +++ b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalPaymentDataTest.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.jdbc.DataJdbcTest; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -33,7 +34,7 @@ @ActiveProfiles("full-prod") @Testcontainers -@DataJdbcTest +@SpringBootTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @ExtendWith({SpringExtension.class, ClickHouseContainerExtension.class}) @ContextConfiguration(classes = { diff --git a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalRefundDataTest.java b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalRefundDataTest.java index af9a70a6..f7330256 100644 --- a/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalRefundDataTest.java +++ b/src/test/java/dev/vality/fraudbusters/repository/clickhouse/impl/HistoricalRefundDataTest.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.jdbc.DataJdbcTest; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.testcontainers.junit.jupiter.Testcontainers; @@ -32,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; @Testcontainers -@DataJdbcTest +@SpringBootTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) @ExtendWith({SpringExtension.class, ClickHouseContainerExtension.class}) @ContextConfiguration(classes = { From 2b570dc4bb701e828e5b33e551e68a9139539e81 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 19 Mar 2024 16:25:28 +0700 Subject: [PATCH 6/9] Bump libs --- .../vality/fraudbusters/service/ShopManagementServiceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java b/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java index 8eff681e..a2b9847d 100644 --- a/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java +++ b/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java @@ -1,6 +1,5 @@ package dev.vality.fraudbusters.service; -import com.github.tomakehurst.wiremock.junit5.WireMockTest; import dev.vality.damsel.fraudbusters.MerchantInfo; import dev.vality.damsel.fraudbusters.ReferenceInfo; import dev.vality.fraudbusters.config.RestTemplateConfig; @@ -20,7 +19,6 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -@WireMockTest(httpPort = 8089) @ExtendWith(SpringExtension.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @ContextConfiguration(classes = {ShopManagementService.class, From a152068b854d9295a5491eec9334ebc667ae7eab Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Wed, 20 Mar 2024 15:20:28 +0700 Subject: [PATCH 7/9] Bump action --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d5c06ce..21b58ab6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2.0.12 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e57f79ba..177f6e75 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ on: jobs: build-and-deploy: - uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2 + uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2.0.12 with: ignore-coverage: true secrets: From 33b97879fbf5eeac160c7ef2d5b666e69999d0a3 Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Wed, 20 Mar 2024 17:02:52 +0700 Subject: [PATCH 8/9] Bump libs --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21b58ab6..dbb1a95a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2.0.12 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 177f6e75..5cbf7454 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ on: jobs: build-and-deploy: - uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2.0.12 + uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3 with: ignore-coverage: true secrets: From b58637eea83e56fac423cc1e2ee918d05de4296e Mon Sep 17 00:00:00 2001 From: Kostya Struga Date: Tue, 26 Mar 2024 15:02:46 +0300 Subject: [PATCH 9/9] Bump damsel --- pom.xml | 2 +- .../resource/payment/handler/FraudInspectorHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a5c43b51..b20b619e 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ dev.vality damsel - 1.623-f8e56c6 + 1.624-781e192 dev.vality.woody diff --git a/src/main/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandler.java b/src/main/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandler.java index e66412b6..af4ad44e 100644 --- a/src/main/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandler.java +++ b/src/main/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandler.java @@ -59,7 +59,7 @@ public boolean isBlacklisted(BlackListContext blackListContext) throws InvalidRe .setValue(blackListContext.getValue()); return wbListServiceSrv.isExist(row); } catch (Exception e) { - log.warn("FraudInspectorHandler error when isExistInBlackList e: ", e); + log.warn("FraudInspectorHandler error when isBlacklisted e: ", e); return false; } }