Upgrade dependencies

build.gradle.kts

@@ -2,14 +2,14 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     `java-library`
-    kotlin("jvm") version "1.7.0"
-    id("org.jetbrains.dokka") version "1.7.0"
-    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
+    kotlin("jvm") version "1.8.20"
+    id("org.jetbrains.dokka") version "1.8.10"
+    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
     signing
     `maven-publish`
 
     // https://github.com/gradle-nexus/publish-plugin
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 }
 
 repositories {
@@ -18,12 +18,13 @@ repositories {
 }
 
 dependencies {
+    val assertjVersion = "3.24.2"
     val awitilityVersion = "4.2.0"
-    val junitJupiterVersion = "5.8.2"
-    val mockitoVersion = "4.3.1"
-    val nettyVersion = "4.1.78.Final"
-    val slf4jVersion = "1.7.36"
-    val springVersion = "5.3.21"
+    val junitJupiterVersion = "5.9.3"
+    val mockitoVersion = "5.3.1"
+    val nettyVersion = "4.1.92.Final"
+    val slf4jVersion = "2.0.7"
+    val springVersion = "5.3.27"
 
     api("com.google.code.findbugs:jsr305:3.0.2")
     api("io.netty:netty-handler:$nettyVersion")
@@ -33,7 +34,7 @@ dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     testImplementation("net.jcip:jcip-annotations:1.0")
     testImplementation("org.apache.commons:commons-lang3:3.12.0")
-    testImplementation("org.assertj:assertj-core:3.22.0")
+    testImplementation("org.assertj:assertj-core:$assertjVersion")
     testImplementation("org.awaitility:awaitility-kotlin:$awitilityVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion")
     testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
@@ -46,8 +47,11 @@ dependencies {
 }
 
 group = "com.github.kpavlov.jreactive8583"
-version = if (findProperty("version") != "unspecified") findProperty("version")
-else "0.0.1-SNAPSHOT"
+version = if (findProperty("version") != "unspecified") {
+    findProperty("version")
+} else {
+    "0.0.1-SNAPSHOT"
+}
 description = "ISO8583 Connector for Netty"
 java.sourceCompatibility = JavaVersion.VERSION_11
 java.targetCompatibility = JavaVersion.VERSION_11
@@ -68,7 +72,9 @@ tasks.test {
     useJUnitPlatform()
     testLogging {
         events = setOf(
-            TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED
+            TestLogEvent.PASSED,
+            TestLogEvent.SKIPPED,
+            TestLogEvent.FAILED
         )
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/github/kpavlov/jreactive8583/AbstractIso8583Connector.kt

@@ -69,7 +69,8 @@ internal constructor(
             ChannelOption.TCP_NODELAY,
             parseBoolean(
                 System.getProperty(
-                    "nfs.rpc.tcp.nodelay", "true"
+                    "nfs.rpc.tcp.nodelay",
+                    "true"
                 )
             )
         )

src/main/kotlin/com/github/kpavlov/jreactive8583/netty/codec/Iso8583Decoder.kt

@@ -7,7 +7,6 @@ import com.solab.iso8583.IsoMessage
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext
 import io.netty.handler.codec.ByteToMessageDecoder
-import java.text.ParseException
 
 internal class Iso8583Decoder(private val messageFactory: MessageFactory<IsoMessage>) :
     ByteToMessageDecoder() {
@@ -24,18 +23,14 @@ internal class Iso8583Decoder(private val messageFactory: MessageFactory<IsoMess
     public override fun decode(
         ctx: ChannelHandlerContext,
         byteBuf: ByteBuf,
-        out: MutableList<Any>
+        out: MutableList<Any>,
     ) {
         if (!byteBuf.isReadable) {
             return
         }
         val bytes = ByteArray(byteBuf.readableBytes())
         byteBuf.readBytes(bytes)
         val isoMessage = messageFactory.parseMessage(bytes, 0)
-        if (isoMessage != null) {
-            out.add(isoMessage)
-        } else {
-            throw ParseException("Can't parse ISO8583 message", 0)
-        }
+        out.add(isoMessage)
     }
 }

src/main/kotlin/com/github/kpavlov/jreactive8583/netty/pipeline/CompositeIsoMessageHandler.kt

@@ -6,6 +6,7 @@ import io.netty.channel.ChannelHandler.Sharable
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelInboundHandlerAdapter
 import org.slf4j.LoggerFactory
+import java.util.Locale
 import java.util.concurrent.CopyOnWriteArrayList
 
 /**
@@ -27,7 +28,8 @@ internal class CompositeIsoMessageHandler<T : IsoMessage> @JvmOverloads construc
         } catch (e: ClassCastException) {
             logger.debug(
                 "IsoMessage subclass {} is not supported by {}. Doing nothing.",
-                msg.javaClass, javaClass
+                msg.javaClass,
+                javaClass
             )
             return
         }
@@ -42,7 +44,9 @@ internal class CompositeIsoMessageHandler<T : IsoMessage> @JvmOverloads construc
         while (applyNextListener && i < size) {
             val messageListener = messageListeners[i]
             applyNextListener = handleWithMessageListener(
-                messageListener, isoMessage, ctx
+                messageListener,
+                isoMessage,
+                ctx
             )
             if (!applyNextListener) {
                 logger.trace(
@@ -64,15 +68,17 @@ internal class CompositeIsoMessageHandler<T : IsoMessage> @JvmOverloads construc
             if (messageListener.applies(isoMessage)) {
                 logger.debug(
                     "Handling IsoMessage[@type=0x{}] with {}",
-                    String.format("%04X", isoMessage.type),
+                    String.format(Locale.ENGLISH, "%04X", isoMessage.type),
                     messageListener
                 )
                 return messageListener.onMessage(ctx, isoMessage)
             }
         } catch (e: Exception) {
             logger.debug(
                 "Can't evaluate {}.apply({})",
-                messageListener, isoMessage.javaClass, e
+                messageListener,
+                isoMessage.javaClass,
+                e
             )
             if (failOnError) {
                 throw e

src/main/kotlin/com/github/kpavlov/jreactive8583/netty/pipeline/ParseExceptionHandler.kt

@@ -35,7 +35,9 @@ internal open class ParseExceptionHandler(
 
     protected fun createErrorResponseMessage(cause: ParseException): IsoMessage {
         val message = isoMessageFactory.newMessage(
-            MessageClass.ADMINISTRATIVE, MessageFunction.NOTIFICATION, MessageOrigin.OTHER
+            MessageClass.ADMINISTRATIVE,
+            MessageFunction.NOTIFICATION,
+            MessageOrigin.OTHER
         )
         // 650 (Unable to parse message)
         message.setValue(24, 650, IsoType.NUMERIC, 3)

src/main/kotlin/com/github/kpavlov/jreactive8583/netty/pipeline/ReconnectOnCloseListener.kt

@@ -36,7 +36,8 @@ internal class ReconnectOnCloseListener(
             logger.trace("Failed to connect. Will try again in {} millis", reconnectInterval)
             executorService.schedule(
                 Callable { client.connectAsync() },
-                reconnectInterval.toLong(), TimeUnit.MILLISECONDS
+                reconnectInterval.toLong(),
+                TimeUnit.MILLISECONDS
             )
         }
     }

src/test/java/com/github/kpavlov/jreactive8583/netty/pipeline/ParseExceptionHandlerTest.java

@@ -68,7 +68,8 @@ void testExceptionCaught() throws Exception {
         assertThat(field44.getType()).as("field44.type").isEqualTo(IsoType.LLVAR);
         assertThat(field44.getLength()).as("field44.length").isEqualTo(25);
         assertThat(field44.getValue()).as("field44.value")
-                .isEqualToComparingFieldByField(errorMessage.substring(0, 22) + "...");
+            .usingRecursiveComparison()
+                .isEqualTo(errorMessage.substring(0, 22) + "...");
 
     }
 }

src/test/resources/junit-platform.properties

@@ -1,3 +1,3 @@
 junit.jupiter.execution.parallel.enabled=true
-junit.jupiter.execution.parallel.mode.default=concurrent
+#junit.jupiter.execution.parallel.mode.default=concurrent
 junit.jupiter.execution.parallel.mode.classes.default=same_thread