From 8c6fc6a9fa099220731555d8e85ba2f8bfbf6ffc Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Tue, 17 Mar 2026 09:55:44 +0300 Subject: [PATCH 1/4] Up libs --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 32027f5c..e8227b86 100644 --- a/pom.xml +++ b/pom.xml @@ -172,12 +172,12 @@ dev.vality machinegun-proto - 1.31-b43d6fd + 1.43-3decc8f dev.vality damsel - 1.682-dfd6648 + 1.685-5c25c2e dev.vality @@ -187,17 +187,17 @@ dev.vality xrates-proto - 1.23-bf0d62d + 1.25-99d0c5c dev.vality limiter-proto - 1.41-2483f60 + 1.44-d4cdf0f dev.vality exrates-proto - 1.7-ce9563e + 1.9-5d53aec dev.vality.geck From 4f23b96b52fce0567cc340312e34e811f3b55f49 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Tue, 17 Mar 2026 09:59:09 +0300 Subject: [PATCH 2/4] Up libs --- src/test/java/dev/vality/daway/utils/LimitConfigGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/dev/vality/daway/utils/LimitConfigGenerator.java b/src/test/java/dev/vality/daway/utils/LimitConfigGenerator.java index 6fd3becd..4d99cf6c 100644 --- a/src/test/java/dev/vality/daway/utils/LimitConfigGenerator.java +++ b/src/test/java/dev/vality/daway/utils/LimitConfigGenerator.java @@ -45,7 +45,7 @@ public static LimitConfig getLimitConfig(String limitConfigId) { return randomThriftOnlyRequiredFields(LimitConfig.class) .setId(limitConfigId) .setType(LimitType.turnover(new LimitTypeTurnover().setMetric(LimitTurnoverMetric.amount(new LimitTurnoverAmount("RUB"))))) - .setScope(LimitScope.multi(Set.of(LimitScopeType.identity(new LimitScopeEmptyDetails()), + .setScope(LimitScope.multi(Set.of(LimitScopeType.provider(new LimitScopeEmptyDetails()), LimitScopeType.party(new LimitScopeEmptyDetails()), LimitScopeType.shop(new LimitScopeEmptyDetails())))) .setDescription("asd") From 47739e92bcc39d35f1098ffcd6f3233a3ef5dc3c Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Tue, 17 Mar 2026 15:28:25 +0300 Subject: [PATCH 3/4] Add log --- .../daway/listener/DominantKafkaListener.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/dev/vality/daway/listener/DominantKafkaListener.java b/src/main/java/dev/vality/daway/listener/DominantKafkaListener.java index 1529abfb..0e511869 100644 --- a/src/main/java/dev/vality/daway/listener/DominantKafkaListener.java +++ b/src/main/java/dev/vality/daway/listener/DominantKafkaListener.java @@ -23,12 +23,17 @@ public class DominantKafkaListener { topics = "${kafka.topics.dominant.id}", containerFactory = "dominantContainerFactory") public void handle(List> messages, Acknowledgment ack) { - log.info("Got historicalCommit batch with size: {}", messages.size()); - log.debug("HistoricalCommit messages: {}", messages); - dominantService.processCommit(messages.stream() - .map(ConsumerRecord::value) - .toList()); - ack.acknowledge(); - log.info("Batch has been committed, size={}", messages.size()); + try { + log.info("Got historicalCommit batch with size: {}", messages.size()); + log.debug("HistoricalCommit messages: {}", messages); + dominantService.processCommit(messages.stream() + .map(ConsumerRecord::value) + .toList()); + ack.acknowledge(); + log.info("Batch has been committed, size={}", messages.size()); + } catch (Exception e) { + log.error("Kafka batch processing failed. cause={}", e.getMessage(), e); + throw e; + } } } From 08de6360d0e4e5d43d0fc881b759f1045591757a Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Wed, 18 Mar 2026 13:43:38 +0300 Subject: [PATCH 4/4] Fix empty domain object --- .../dev/vality/daway/handler/dominant/impl/CategoryHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/CurrencyHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/PartyHandler.java | 2 +- .../daway/handler/dominant/impl/PaymentInstitutionHandler.java | 2 +- .../daway/handler/dominant/impl/PaymentRoutingRulesHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/ProviderHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/ProxyHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/ShopHandler.java | 2 +- .../daway/handler/dominant/impl/TermSetHierarchyHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/TerminalHandler.java | 2 +- .../dev/vality/daway/handler/dominant/impl/WalletHandler.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/CategoryHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/CategoryHandler.java index 44163e36..b1e9a8ae 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/CategoryHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/CategoryHandler.java @@ -41,7 +41,7 @@ protected Integer getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetCategory(); + return getDomainObject() != null && getDomainObject().isSetCategory(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/CurrencyHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/CurrencyHandler.java index 69b8af6b..b27cc30a 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/CurrencyHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/CurrencyHandler.java @@ -41,7 +41,7 @@ protected String getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetCurrency(); + return getDomainObject() != null && getDomainObject().isSetCurrency(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/PartyHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/PartyHandler.java index fbb1f8e5..18d4e090 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/PartyHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/PartyHandler.java @@ -46,7 +46,7 @@ protected String getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetPartyConfig(); + return getDomainObject() != null && getDomainObject().isSetPartyConfig(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentInstitutionHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentInstitutionHandler.java index 7225d19c..a874a0db 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentInstitutionHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentInstitutionHandler.java @@ -44,7 +44,7 @@ protected Integer getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetPaymentInstitution(); + return getDomainObject() != null && getDomainObject().isSetPaymentInstitution(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentRoutingRulesHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentRoutingRulesHandler.java index 9713318b..592a6b25 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentRoutingRulesHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/PaymentRoutingRulesHandler.java @@ -21,7 +21,7 @@ public class PaymentRoutingRulesHandler @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetRoutingRules(); + return getDomainObject() != null && getDomainObject().isSetRoutingRules(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java index f36b2723..8868a2b6 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/ProviderHandler.java @@ -44,7 +44,7 @@ protected Integer getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetProvider(); + return getDomainObject() != null && getDomainObject().isSetProvider(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/ProxyHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/ProxyHandler.java index 6126b3c9..11312073 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/ProxyHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/ProxyHandler.java @@ -42,7 +42,7 @@ protected Integer getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetProxy(); + return getDomainObject() != null && getDomainObject().isSetProxy(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/ShopHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/ShopHandler.java index 64d08600..e798b558 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/ShopHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/ShopHandler.java @@ -45,7 +45,7 @@ protected String getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetShopConfig(); + return getDomainObject() != null && getDomainObject().isSetShopConfig(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/TermSetHierarchyHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/TermSetHierarchyHandler.java index fafc57ab..46654687 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/TermSetHierarchyHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/TermSetHierarchyHandler.java @@ -44,7 +44,7 @@ protected Integer getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetTermSetHierarchy(); + return getDomainObject() != null && getDomainObject().isSetTermSetHierarchy(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/TerminalHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/TerminalHandler.java index 635febd1..8fd7a7d8 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/TerminalHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/TerminalHandler.java @@ -42,7 +42,7 @@ protected Integer getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetTerminal(); + return getDomainObject() != null && getDomainObject().isSetTerminal(); } @Override diff --git a/src/main/java/dev/vality/daway/handler/dominant/impl/WalletHandler.java b/src/main/java/dev/vality/daway/handler/dominant/impl/WalletHandler.java index 71ec73c1..34ea2caa 100644 --- a/src/main/java/dev/vality/daway/handler/dominant/impl/WalletHandler.java +++ b/src/main/java/dev/vality/daway/handler/dominant/impl/WalletHandler.java @@ -42,7 +42,7 @@ protected String getTargetRefId() { @Override protected boolean acceptDomainObject() { - return getDomainObject().isSetWalletConfig(); + return getDomainObject() != null && getDomainObject().isSetWalletConfig(); } @Override