From f2559677d0c0ec61b2628b74e8c7d6c1bdb722cb Mon Sep 17 00:00:00 2001 From: Denis Plotnikov Date: Wed, 11 Oct 2023 14:41:24 +0400 Subject: [PATCH] update core version --- build.gradle | 13 +++++++------ src/main/java/com/exactpro/th2/FixHandler.java | 2 +- .../brokenconn/configuration/RuleConfiguration.kt | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 9c07a38..4dda953 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version '1.6.21' + id 'org.jetbrains.kotlin.jvm' version '1.8.22' id 'com.palantir.docker' version '0.25.0' id "org.owasp.dependencycheck" version "8.2.1" id "com.gorylenko.gradle-git-properties" version "2.4.1" @@ -38,17 +38,18 @@ repositories { } dependencies { - api platform('com.exactpro.th2:bom:4.4.0') + api platform('com.exactpro.th2:bom:4.5.0') - implementation("com.exactpro.th2:common:5.3.0-separate-executor+") { - exclude group: 'com.exactpro.th2', module: 'task-utils' + implementation("com.exactpro.th2:common:5.4.0-dev") { + exclude group: 'com.exactpro.th2', module: 'cradle-core' + exclude group: 'com.exactpro.th2', module: 'cradle-cassandra' } - implementation "com.exactpro.th2:common-utils:2.1.0-TH2-5001+" + implementation group: 'com.exactpro.th2', name: 'common-utils', version: '2.2.1-dev' implementation 'com.exactpro.th2:netty-bytebuf-utils:0.0.1' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:3.1.0-TH2-5001+' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:3.2.1-TH2-5001+' implementation 'com.exactpro.th2:grpc-lw-data-provider:2.0.0-dev-version-2+' implementation 'org.slf4j:slf4j-api' diff --git a/src/main/java/com/exactpro/th2/FixHandler.java b/src/main/java/com/exactpro/th2/FixHandler.java index 85378da..2b6e9e0 100644 --- a/src/main/java/com/exactpro/th2/FixHandler.java +++ b/src/main/java/com/exactpro/th2/FixHandler.java @@ -1237,7 +1237,7 @@ private Map transformProcessor( ByteBuf message, Map metadata ) { - long timeToBlock = strategy.getConfig().getDuration().toMillis(); + long timeToBlock = strategy.getConfig().getDuration().toMillis() + 3000; long startTime = System.currentTimeMillis(); while (System.currentTimeMillis() - startTime <= timeToBlock) { try { diff --git a/src/main/kotlin/com/exactpro/th2/conn/dirty/fix/brokenconn/configuration/RuleConfiguration.kt b/src/main/kotlin/com/exactpro/th2/conn/dirty/fix/brokenconn/configuration/RuleConfiguration.kt index 57dd086..f2b4fab 100644 --- a/src/main/kotlin/com/exactpro/th2/conn/dirty/fix/brokenconn/configuration/RuleConfiguration.kt +++ b/src/main/kotlin/com/exactpro/th2/conn/dirty/fix/brokenconn/configuration/RuleConfiguration.kt @@ -65,6 +65,7 @@ data class RuleConfiguration( RuleType.SPLIT_SEND -> { require(splitSendConfiguration != null) { "`splitSendConfiguration` is required for $ruleType" } } + else -> {} } }