Migrated to th2 gradle plugin: 0.1.1 (#36)

* updated th2-codec version (added gRPC interface)
* transport protocol, book&page, gRPC (#29)
* migration to book and pages
* th2 transport protocol support
* gRPC connection support
* dependencies updated
* gradle updated
* th2 gradle plugin updated
* wordkflows updated
* version updated

Author: lumber1000

.github/workflows/ci-unwelcome-words.yml

@@ -5,19 +5,19 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.sha }}
-    - name: Checkout tool
-      uses: actions/checkout@v2
-      with:
-        repository: exactpro-th2/ci-github-action
-        ref: master
-        token: ${{ secrets.PAT_CI_ACTION }}
-        path: ci-github-action
-    - name: Run CI action
-      uses: ./ci-github-action
-      with:
-        ref: ${{ github.sha }}
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+      - name: Checkout tool
+        uses: actions/checkout@v4
+        with:
+          repository: exactpro-th2/ci-github-action
+          ref: master
+          token: ${{ secrets.PAT_CI_ACTION }}
+          path: ci-github-action
+      - name: Run CI action
+        uses: ./ci-github-action
+        with:
+          ref: ${{ github.sha }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.6-jdk11 AS build
+FROM gradle:8.7-jdk11 AS build
 ARG release_version
 COPY ./ .
 RUN gradle build dockerPrepare \

README.md

@@ -1,4 +1,4 @@
-# Csv codec (5.3.1)
+# Csv codec (5.4.0)
 
 ## Description
 
@@ -53,11 +53,7 @@ into
 {
   "A": 1,
   "B": 2,
-  "V": [
-    3,
-    4,
-    5
-  ],
+  "V": [ 3, 4, 5 ],
   "G": 6,
   "D": 7
 }
@@ -141,6 +137,11 @@ spec:
 
 ## Release notes
 
+### 5.4.0
++ Migrated to th2 gradle plugin: `0.1.1`
++ Updated common: `5.14.0-dev`
++ Updated kotlin-logging: `5.1.4`
+
 ### 5.3.1
 + Migrated to th2 gradle plugin: `0.0.8`
 
@@ -214,4 +215,4 @@ spec:
   default configuration
 + update Cradle version. Introduce async API for storing events
 + removed gRPC event loop handling
-+ fixed dictionary reading
++ fixed dictionary reading

build.gradle

@@ -1,19 +1,15 @@
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.8.22"
     id "org.jetbrains.kotlin.kapt" version "1.8.22"
-    id("java-library")
-    id("maven-publish")
-
-    id "com.exactpro.th2.gradle.publish" version "0.0.8"
-    id "com.exactpro.th2.gradle.component" version "0.0.8"
+    id "maven-publish"
+    id "com.exactpro.th2.gradle.publish" version "0.1.1"
+    id "com.exactpro.th2.gradle.component" version "0.1.1"
 }
 
 group = 'com.exactpro.th2'
 version = release_version
 
-kotlin {
-    jvmToolchain(11)
-}
+kotlin.jvmToolchain(11)
 
 repositories {
     mavenCentral()
@@ -34,34 +30,22 @@ repositories {
 }
 
 dependencies {
-    implementation "com.exactpro.th2:common:5.10.1-dev"
+    implementation "com.exactpro.th2:common:5.14.0-dev"
     implementation "com.exactpro.th2:common-utils:2.2.3-dev"
     implementation "com.exactpro.th2:codec:5.5.0-dev"
 
     implementation "org.apache.commons:commons-lang3"
     implementation "com.fasterxml.jackson.core:jackson-databind"
-
     implementation "net.sourceforge.javacsv:javacsv:2.0"
-
-    implementation "io.github.microutils:kotlin-logging:3.0.5"
+    implementation "io.github.oshai:kotlin-logging:5.1.4"
 
     compileOnly "com.google.auto.service:auto-service-annotations:1.1.1"
     kapt "com.google.auto.service:auto-service:1.1.1"
 
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'
-    testImplementation 'io.strikt:strikt-core:0.34.1'
+    testImplementation "org.junit.jupiter:junit-jupiter:5.10.3"
 }
 
-application {
-    mainClass.set("com.exactpro.th2.codec.MainKt")
-}
-
-test {
-    useJUnitPlatform()
-}
-
-dependencyCheck {
-    suppressionFile='supressions.xml'
-}
+application.mainClass = "com.exactpro.th2.codec.MainKt"
+test.useJUnitPlatform()
+dependencyCheck.suppressionFile = "supressions.xml"

gradle.properties

@@ -1,4 +1,3 @@
-release_version=5.3.1
+release_version=5.4.0
 description='th2 codec csv'
-vcs_url=https://github.com/th2-net/th2-codec-csv
-
+vcs_url=https://github.com/th2-net/th2-codec-csv

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip

src/main/kotlin/com/exactpro/th2/codec/csv/AbstractDecoder.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2023-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package com.exactpro.th2.codec.csv
 
 import com.csvreader.CsvReader
 import com.exactpro.th2.codec.DecodeException
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.nio.charset.Charset
@@ -111,9 +111,9 @@ abstract class AbstractDecoder<ANY_MESSAGE, RAW_MESSAGE, PARSED_MESSAGE, BODY_FI
                 LOGGER.debug { "Set header to: ${strings.contentToString()}" }
                 header = strings
                 if (publishHeader) {
-                    //groupBuilder += createHeadersMessage(rawMessage, strings, currentIndex)
-                    groupBuilder += createParsedMessage(rawMessage,
-                        HEADER_MSG_TYPE, mapOf(HEADER_FIELD_NAME to strings.toFieldValue()), currentIndex)
+                    groupBuilder += createParsedMessage(
+                        rawMessage, HEADER_MSG_TYPE, mapOf(HEADER_FIELD_NAME to strings.toFieldValue()), currentIndex
+                    )
                 }
                 continue
             }
@@ -122,7 +122,7 @@ abstract class AbstractDecoder<ANY_MESSAGE, RAW_MESSAGE, PARSED_MESSAGE, BODY_FI
                     "Wrong fields count in message. Expected count: %d; actual: %d; session alias: %s",
                     header.size, strings.size, rawMessage.messageSessionAlias
                 )
-                LOGGER.error(msg)
+                LOGGER.error { msg }
                 LOGGER.debug { rawMessage.toString() }
                 errors.add(ErrorHolder(msg, rawMessage))
             }

src/main/kotlin/com/exactpro/th2/codec/csv/CsvCodec.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2023-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import com.exactpro.th2.codec.api.IReportingContext
 import com.exactpro.th2.codec.csv.cfg.CsvCodecConfiguration
 import com.exactpro.th2.common.grpc.MessageGroup as ProtoMessageGroup
 import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.nio.charset.Charset
 
 class CsvCodec(private val config: CsvCodecConfiguration) : IPipelineCodec {