Corrected after review

Author: Nikita-Smirnov-Exactpro

build.gradle

@@ -1,17 +1,13 @@
 plugins {
     id "application"
     id "maven-publish"
-    id "com.exactpro.th2.gradle.publish" version "0.2.4"
-    id "com.exactpro.th2.gradle.component" version "0.2.4"
+    alias(libs.plugins.th2.publish)
+    alias(libs.plugins.th2.component)
 }
 
 group = 'com.exactpro.th2'
 version = release_version
 
-ext {
-    cradleVersion = '5.4.4-dev'
-}
-
 repositories {
     mavenCentral()
     maven {
@@ -31,16 +27,16 @@ javadoc {
 }
 
 dependencies {
-    implementation('com.exactpro.th2:common:5.14.0-dev') {
+    implementation(libs.th2.common) {
         exclude group: 'com.exactpro.th2', module: 'cradle-core'
         exclude group: 'com.exactpro.th2', module: 'cradle-cassandra'
     }
-    implementation("com.exactpro.th2:common-utils:2.3.0-dev") {
+    implementation(libs.th2.common.utils) {
         because("executor service utils is used")
     }
-    implementation 'com.exactpro.th2:task-utils:0.1.3'
-    implementation "com.exactpro.th2:cradle-core:$cradleVersion"
-    implementation "com.exactpro.th2:cradle-cassandra:$cradleVersion"
+    implementation(libs.th2.task.utils)
+    implementation(libs.cradle.core)
+    implementation(libs.cradle.cassandra)
 
     // FIXME: Added as API dependency to common com.exactpro.th2.common.event.Event.toProto(...) throws `JsonProcessingException`
     implementation 'com.fasterxml.jackson.core:jackson-core'
@@ -55,8 +51,8 @@ dependencies {
     }
 
     testImplementation 'org.apache.commons:commons-lang3'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.12.0'
-    testImplementation 'org.mockito:mockito-junit-jupiter:5.15.2'
+    testImplementation(libs.junit.jupiter)
+    testImplementation(libs.mockito.junit.jupiter)
     testRuntimeOnly('org.junit.platform:junit-platform-launcher') {
         because 'This artifact will not be added automatically since gradle 9.0. You can read more information here:' +
                 'https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies'

gradle/libs.versions.toml

@@ -0,0 +1,18 @@
+[versions]
+th2-plugin = "0.2.4"
+cradle = "5.4.4-dev"
+
+[libraries]
+th2-common-utils = { group = "com.exactpro.th2", name = "common-utils", version = "2.3.0-dev" }
+th2-common = { group = "com.exactpro.th2", name = "common", version = "5.14.0-dev" }
+th2-task-utils = { group = "com.exactpro.th2", name = "task-utils", version = "0.1.3" }
+
+cradle-core = { group = "com.exactpro.th2", name = "cradle-core", version.ref = "cradle" }
+cradle-cassandra = { group = "com.exactpro.th2", name = "cradle-cassandra", version.ref = "cradle" }
+
+junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.12.0" }
+mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version = "5.16.0" }
+
+[plugins]
+th2-publish = { id = "com.exactpro.th2.gradle.publish", version.ref = "th2-plugin" }
+th2-component = { id = "com.exactpro.th2.gradle.component", version.ref = "th2-plugin" }

src/test/java/com/exactpro/th2/estore/TestEventPersistor.java

@@ -50,11 +50,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static com.exactpro.th2.common.utils.ExecutorServiceUtilsKt.shutdownGracefully;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.after;
 import static org.mockito.Mockito.doReturn;
@@ -206,7 +206,7 @@ public void testEventResubmittedLimitedTimes() throws IOException, CradleStorage
 
     @Test
     @DisplayName("Event persistence is queued by count")
-    public void testEventCountQueueing() throws IOException, CradleStorageException {
+    public void testEventCountQueueing() throws IOException, CradleStorageException, InterruptedException {
 
         final long storeExecutionTime = EVENT_PERSIST_TIMEOUT * 3;
         final long totalExecutionTime = EVENT_PERSIST_TIMEOUT * 5;
@@ -236,13 +236,14 @@ public void testEventCountQueueing() throws IOException, CradleStorageException
         verify(callback, after(totalExecutionTime).times(totalEvents)).onSuccess(any());
         verify(callback, after(totalExecutionTime).times(0)).onFail(any());
 
-        shutdownGracefully(executor, 1, TimeUnit.SECONDS);
+        executor.shutdown();
+        assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS), "Executor didn't terminate according to a timeout");
     }
 
 
     @Test
     @DisplayName("Event persistence is queued by event sizes")
-    public void testEventSizeQueueing() throws IOException, CradleStorageException {
+    public void testEventSizeQueueing() throws IOException, CradleStorageException, InterruptedException {
 
         final long storeExecutionTime = EVENT_PERSIST_TIMEOUT * 3;
         final long totalExecutionTime = EVENT_PERSIST_TIMEOUT * 6;
@@ -283,7 +284,8 @@ public void testEventSizeQueueing() throws IOException, CradleStorageException {
         verify(callback, after(totalExecutionTime).times(totalEvents)).onSuccess(any());
         verify(callback, after(totalExecutionTime).times(0)).onFail(any());
 
-        shutdownGracefully(executor, 1, TimeUnit.SECONDS);
+        executor.shutdown();
+        assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS), "Executor didn't terminate according to a timeout");
     }