Upgrade dependencies

README.md

@@ -40,9 +40,9 @@ Usually, N==2.
 The header contains the length of the following message.
 The high byte of value is transmitted first, and the low byte of value is transmitted second.
 
-| N bytes            | M bytes            |
-| ------------------ | ------------------ |
-| Message Length = M | ISO–8583 Message   |
+| N bytes            | M bytes          |
+|--------------------|------------------|
+| Message Length = M | ISO–8583 Message |
 
 # Getting Started
 
@@ -134,7 +134,7 @@ server.shutdown();// [8]
 5. Initialize a server. Now it is ready to start.
 6. Start server. Now it is ready to accept client connections.
 7. Verify that the server is started
-9. Shutdown server when you're done.
+8. Shutdown server when you're done.
 
 ## Logging
 

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
         )
     }
 }

build.sh

@@ -9,8 +9,8 @@ rm -rf build
 printf '\nBuilding 📦\n'
 
 #./gradlew build --scan
-./gradlew $GRADLE_ARGS build
+./gradlew "$GRADLE_ARGS" build
 
 printf '\nTesting 🧪\n'
 
-./gradlew $GRADLE_ARGS check --stacktrace
+./gradlew "$GRADLE_ARGS" check --stacktrace

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

publish.sh

@@ -10,5 +10,5 @@ source build.sh
 echo "Publishing 📢"
 
 ## https://github.com/gradle-nexus/publish-plugin/
-./gradlew $GRADLE_ARGS publishToSonatype
+./gradlew "$GRADLE_ARGS" publishToSonatype
 #./gradlew $GRADLE_ARGS publishToSonatype closeAndReleaseSonatypeStagingRepository

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() {
@@ -32,10 +31,6 @@ internal class Iso8583Decoder(private val messageFactory: MessageFactory<IsoMess
         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) + "...");
 
     }
 }