Skip to content

Bump dependencies #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
echerniak merged 1 commit into from
Dec 22, 2025
Merged

Bump dependencies #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId>
<version>3.1.2</version>
<version>3.1.9</version>
</parent>

<name>disputes-tg-bot</name>
Expand All @@ -29,8 +29,8 @@
<db.user>postgres</db.user>
<db.password>postgres</db.password>
<db.schema>dspt_tg_bot</db.schema>
<testcontainers.annotations.version>3.2.1</testcontainers.annotations.version>
<org.telegram.telegrambots.version>9.0.0</org.telegram.telegrambots.version>
<testcontainers.annotations.version>4.0.0</testcontainers.annotations.version>
<org.telegram.telegrambots.version>9.2.0</org.telegram.telegrambots.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -84,17 +84,17 @@
<dependency>
<groupId>dev.vality</groupId>
<artifactId>damsel</artifactId>
<version>1.647-b149379</version>
<version>1.679-b5c1dc4</version>
</dependency>
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>2.0.9</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-api</artifactId>
<version>2.0.9</version>
<version>2.1.0</version>
</dependency>

<!--spring-->
Expand Down Expand Up @@ -195,7 +195,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>2.6.0</version>
<version>3.2.3</version>
</dependency>

<!--test-->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/disputes/tg/bot/config/DominantCacheConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public CacheManager terminalsCacheManager() {

private Caffeine getCacheConfig(DominantCacheProperties.CacheConfig cacheConfig) {
return Caffeine.newBuilder()
.expireAfterAccess(cacheConfig.getTtlSec(), TimeUnit.SECONDS)
.expireAfterWrite(cacheConfig.getTtlSec(), TimeUnit.SECONDS)
.maximumSize(cacheConfig.getPoolSize());
}
}
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/disputes/tg/bot/config/ExternalConnectionsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.vality.disputes.tg.bot.config;

import dev.vality.bender.BenderSrv;
import dev.vality.damsel.domain_config.RepositoryClientSrv;
import dev.vality.damsel.domain_config_v2.RepositoryClientSrv;
import dev.vality.damsel.payment_processing.InvoicingSrv;
import dev.vality.disputes.admin.AdminManagementServiceSrv;
import dev.vality.disputes.merchant.MerchantDisputesServiceSrv;
Expand Down
19 changes: 8 additions & 11 deletions src/main/java/dev/vality/disputes/tg/bot/service/external/DominantService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package dev.vality.disputes.tg.bot.service.external;

import dev.vality.damsel.domain.Provider;
import dev.vality.damsel.domain.ProviderRef;
import dev.vality.damsel.domain.Terminal;
import dev.vality.damsel.domain.TerminalRef;
import dev.vality.damsel.domain_config.*;
import dev.vality.damsel.domain.*;
import dev.vality.damsel.domain_config_v2.*;
import dev.vality.disputes.tg.bot.exception.DominantException;
import dev.vality.disputes.tg.bot.exception.NotFoundException;
import lombok.RequiredArgsConstructor;
Expand All @@ -22,10 +19,10 @@ public class DominantService {

@Cacheable(value = "providers", key = "#providerRef.id", cacheManager = "providersCacheManager")
public Provider getProvider(ProviderRef providerRef) {
return getProvider(providerRef, Reference.head(new Head()));
return getProvider(providerRef, VersionReference.head(new Head()));
}

private Provider getProvider(ProviderRef providerRef, Reference revisionReference) {
private Provider getProvider(ProviderRef providerRef, VersionReference revisionReference) {
log.debug("Trying to get provider from dominant, providerRef='{}', revisionReference='{}'", providerRef,
revisionReference);
try {
Expand All @@ -47,10 +44,10 @@ private Provider getProvider(ProviderRef providerRef, Reference revisionReferenc

@Cacheable(value = "terminals", key = "#terminalRef.id", cacheManager = "terminalsCacheManager")
public Terminal getTerminal(TerminalRef terminalRef) {
return getTerminal(terminalRef, Reference.head(new Head()));
return getTerminal(terminalRef, VersionReference.head(new Head()));
}

private Terminal getTerminal(TerminalRef terminalRef, Reference revisionReference) {
private Terminal getTerminal(TerminalRef terminalRef, VersionReference revisionReference) {
log.debug("Trying to get terminal from dominant, terminalRef='{}', revisionReference='{}'", terminalRef,
revisionReference);
try {
Expand All @@ -70,8 +67,8 @@ private Terminal getTerminal(TerminalRef terminalRef, Reference revisionReferenc
}
}

private VersionedObject checkoutObject(Reference revisionReference, dev.vality.damsel.domain.Reference reference)
private VersionedObject checkoutObject(VersionReference versionReference, Reference reference)
throws TException {
return dominantClient.checkoutObject(revisionReference, reference);
return dominantClient.checkoutObject(versionReference, reference);
}
}
Loading