[TH2-1686] Use a common executor for running check rules

.github/workflows/dev-java-publish-sonatype-and-docker.yml

@@ -0,0 +1,30 @@
+name: Dev build and publish Java distributions to sonatype snapshot repository
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - version-*
+      - dependabot*
+    paths-ignore:
+      - README.md
+    # paths:
+    # - gradle.properties
+
+jobs:
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
+    with:
+      build-target: 'Sonatype,Docker'
+      runsOn: ubuntu-latest
+      gradleVersion: '7'
+      docker-username: ${{ github.actor }}
+    secrets:
+      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
+      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.github/workflows/java-publish-sonatype-and-docker.yml

@@ -0,0 +1,24 @@
+name: Build and release Java distributions to sonatype.
+
+on:
+  push:
+    branches:
+    - master
+    - version-*
+    paths:
+    - gradle.properties
+
+jobs:
+  build:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Sonatype,Docker'
+      runsOn: ubuntu-latest
+      gradleVersion: '7'
+      docker-username: ${{ github.actor }}
+    secrets:
+      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
+      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
+      docker-password: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -206,11 +206,11 @@ The `th2_check1_active_tasks_number` metric separate rules with label `rule_type
 + Support for disabling of order verification for simple collection
 + Switch for events publication in checkpoint request. Parameter `enable-checkpoint-events-publication` should be used for that.
 
-### 3.9.1
-
 #### Changed:
 + Migrated `sailfish-utils` version from `3.12.2` to `3.12.3`
   + Improved condition output format for `EQ_PRECISION`, `WILDCARD`, `LIKE`, `IN`, `MORE`, `LESS` operations and their negative versions
++ Changed the way the check1 works with threads internally.
+  Now it uses a common executor for running check rules instead of creating an executor per each rule
 
 ### 3.9.0
 

build.gradle

@@ -191,13 +191,13 @@ test {
 }
 
 application {
-    mainClassName 'com.exactpro.th2.check1.Check1Main'
+    mainClass.set('com.exactpro.th2.check1.Check1Main')
 }
 
 applicationName = 'service'
 
 distTar {
-    archiveName "${applicationName}.tar"
+    archiveFileName.set("${applicationName}.tar")
 }
 
 dockerPrepare {

src/main/java/com/exactpro/th2/check1/util/VerificationUtil.java

@@ -15,9 +15,7 @@
  */
 package com.exactpro.th2.check1.util;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import com.exactpro.sf.aml.AMLLangConst;
@@ -85,7 +83,7 @@ private static void toMetaContainer(String fieldName, ValueFilter value, MetaCon
                                         Set<String> keyFields, boolean listItemAsSeparate) {
         if (value.hasMessageFilter()) {
             parent.add(fieldName, toMetaContainer(value.getMessageFilter(), listItemAsSeparate));
-        } else if (value.hasListFilter() && value.getListFilter().getValues(0).hasMessageFilter()) {
+        } else if (value.hasListFilter() && containsMessageFilter(value.getListFilter())) {
             if (listItemAsSeparate) {
                 convertListAsSeparateContainers(parent, fieldName, value.getListFilter());
             } else {
@@ -116,4 +114,8 @@ private static void convertListAsSeparateContainers(MetaContainer parent, String
         }
         parent.add(fieldName, result);
     }
+
+    private static boolean containsMessageFilter(ListValueFilter listFilter) {
+        return listFilter.getValuesCount() > 0 && listFilter.getValues(0).hasMessageFilter();
+    }
 }

src/main/kotlin/com/exactpro/th2/check1/AbstractSessionObserver.kt

@@ -13,6 +13,7 @@
 package com.exactpro.th2.check1
 
 import io.reactivex.observers.DisposableObserver
+import mu.KotlinLogging
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -26,8 +27,7 @@ abstract class AbstractSessionObserver<T> : DisposableObserver<T>() {
     }
 
     companion object {
-        @Suppress("JAVA_CLASS_ON_COMPANION")
         @JvmField
-        val LOGGER: Logger = LoggerFactory.getLogger(javaClass.enclosingClass)
+        val LOGGER: Logger = LoggerFactory.getLogger(AbstractSessionObserver::class.java)
     }
 }