[GH-68] Fix: can't encoded typed value for STRING filed (#69)

Author: Nikita-Smirnov-Exactpro

README.md

@@ -1,4 +1,4 @@
-# th2-codec-fix-ng 0.1.5
+# th2-codec-fix-ng 0.1.6
 
 This codec can be used in dirty mode for decoding and encoding messages via the FIX protocol.
 
@@ -130,6 +130,17 @@ Component benchmark results available [here](docs/benchmarks/jmh-benchmark.md).
 
 ## Release notes
 
+### 0.1.6
+
++ Fixes:
+  + encoded typed value without error for STRING filed
++ Updated:
+  + th2 gradle plugin: `0.3.8` (bom: `4.14.1`)
+  + kotlin: `2.2.10`
+  + kotlin-logging: `7.0.13`
+  + common: `5.16.1-dev`
+  + codec: `5.6.0-dev`
+
 ### 0.1.5
 
 + Fixes:

gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-release_version=0.1.5
+release_version=0.1.6
 vcs_url=https://github.com/th2-net/th2-codec-fix-ng

src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt

@@ -506,23 +506,25 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings)
     }
 
     private fun encodeField(field: Field, value: Any, target: ByteBuf, isDirty: Boolean, dictionaryFields: Map<String, Field>, context: IReportingContext) {
-        when {
-            field is Primitive -> {
+        when (field) {
+            is Primitive -> {
                 val valueToEncode = when {
                     isCompatibleType(value.javaClass, field.primitiveType) -> value
+                    field.primitiveType == String::class.java -> value
                     value is String -> {
                         try {
                             when (field.primitiveType) {
-                                LocalDateTime::class.java -> MultiConverter.convert<LocalDateTime>(value, LocalDateTime::class.java)
-                                LocalDate::class.java -> MultiConverter.convert<LocalDate>(value, LocalDate::class.java)
-                                LocalTime::class.java -> MultiConverter.convert<LocalTime>(value, LocalTime::class.java)
+                                LocalDateTime::class.java -> MultiConverter.convert(value, LocalDateTime::class.java)
+                                LocalDate::class.java -> MultiConverter.convert(value, LocalDate::class.java)
+                                LocalTime::class.java -> MultiConverter.convert(value, LocalTime::class.java)
                                 java.lang.Boolean::class.java -> when {
                                     value.equals("true", true) -> true
                                     value.equals("Y", true) -> true // https://github.com/th2-net/th2-codec-fix-ng/issues/43
                                     value.equals("false", true) -> false
                                     value.equals("N", true) -> false // https://github.com/th2-net/th2-codec-fix-ng/issues/43
                                     else -> handleError(isDirty, context, "Wrong boolean value in ${field.primitiveType.name} field '$field.name'. Value: $value.", value)
                                 }
+
                                 else -> {
                                     // we reuse decode() method for the types that have the same string representation
                                     // of values in FIX protocol and in TH2 transport protocol
@@ -535,6 +537,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings)
                             handleError(isDirty, context, "Wrong date/time value in ${field.primitiveType.name} field '$field.name'. Value: $value.", value)
                         }
                     }
+
                     else -> handleError(isDirty, context, "Wrong type value in field ${field.name}. Actual: ${value.javaClass} (value: $value). Expected ${field.primitiveType}", value)
                 }
 
@@ -555,8 +558,8 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings)
                 target.writeField(field.tag, stringValue, SOH_BYTE, charset)
             }
 
-            field is Group && value is List<*> -> field.encode(value, target, isDirty, dictionaryFields, context)
-            field is Message && value is Map<*,*> -> {
+            is Group if value is List<*> -> field.encode(value, target, isDirty, dictionaryFields, context)
+            is Message if value is Map<*,*> -> {
                 @Suppress("UNCHECKED_CAST")
                 val messageValue = value as Map<String, *>
                 field.encode(messageValue, target, isDirty, dictionaryFields, context)
@@ -711,7 +714,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings)
             java.lang.Short::class.java to 2,
             java.lang.Integer::class.java to 3,
             java.lang.Long::class.java to 4,
-            BigDecimal:: class.java to 5
+            BigDecimal::class.java to 5
         )
 
         private fun isCompatibleType(from: Class<*>, to: Class<*>): Boolean {

src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt

@@ -31,7 +31,7 @@ data class FixNgCodecSettings(
     val decodeDelimiter: Char = SOH_CHAR,
     val dirtyMode: Boolean = false,
     val decodeValuesToStrings: Boolean = true,
-    val decodeComponentsToNestedMaps: Boolean = true
+    val decodeComponentsToNestedMaps: Boolean = true,
 ) : IPipelineCodecSettings
 
 object CharsetDeserializer : JsonDeserializer<Charset>() {

src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt

@@ -18,6 +18,7 @@ package com.exactpro.th2.codec.fixng
 
 import com.exactpro.sf.common.messages.structures.IDictionaryStructure
 import com.exactpro.sf.common.messages.structures.loaders.XmlDictionaryStructureLoader
+import com.exactpro.sf.comparison.conversion.MultiConverter
 import com.exactpro.th2.codec.api.IReportingContext
 import com.exactpro.th2.codec.fixng.FixNgCodecFactory.Companion.PROTOCOL
 import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.Direction
@@ -69,6 +70,53 @@ class FixNgCodecTest {
     @MethodSource("configs")
     fun `simple encode`(isDirty: Boolean, delimiter: Char) = encodeTest(MSG_CORRECT, isDirty, delimiter)
 
+    @ParameterizedTest
+    @CsvSource(
+        "true,java.lang.Character,a,,287,072",
+        "true,java.lang.Byte,127,,289,131",
+        "true,java.lang.Short,32767,,291,235",
+        "true,java.lang.Integer,2147483647,,296,245",
+        "true,java.lang.Long,9223372036854775807,,305,198",
+        "true,java.lang.Float,3.4028234,,295,174",
+        "true,java.lang.Double,1.7976931348623157,,304,141",
+        "true,java.math.BigDecimal,1.7976931348623157,,304,141",
+        "true,java.time.LocalDateTime,2025-09-29T14:07:53.168966352,20250929-14:07:53.168966352,313,091",
+        "true,java.time.LocalDate,2025-09-29,20250929,294,130",
+        "true,java.time.LocalTime,14:07:53.168,,298,094", // FIXME: Seconds unit should depend of settings
+        "true,java.lang.Boolean,true,Y,287,064",
+
+        "false,java.lang.Character,a,,287,072",
+        "false,java.lang.Byte,127,,289,131",
+        "false,java.lang.Short,32767,,291,235",
+        "false,java.lang.Integer,2147483647,,296,245",
+        "false,java.lang.Long,9223372036854775807,,305,198",
+        "false,java.lang.Float,3.4028234,,295,174",
+        "false,java.lang.Double,1.7976931348623157,,304,141",
+        "false,java.math.BigDecimal,1.7976931348623157,,304,141",
+        "false,java.time.LocalDateTime,2025-09-29T14:07:53.168966352,20250929-14:07:53.168966352,313,091",
+        "false,java.time.LocalDate,2025-09-29,20250929,294,130",
+        "false,java.time.LocalTime,14:07:53.168,,298,094", // FIXME: Seconds unit should depend of settings
+        "false,java.lang.Boolean,true,Y,287,064",
+    )
+    fun `encode with different value types for string field`(
+        isDirty: Boolean,
+        clazz: Class<*>,
+        value: String,
+        encodedValue: String?,
+        length: Int,
+        checkSum: String,
+    ) {
+        parsedBody["ExecID"] = MultiConverter.convert(value, clazz)
+        encodeTest(
+            MSG_CORRECT
+                .replace("
17=495504662
", "
17=${encodedValue ?: value}
")
+                .replace("
9=295
", "
9=${length}
")
+                .replace("
10=191
", "
10=${checkSum}
"),
+            dirtyMode = isDirty,
+            '
',
+        )
+    }
+
     @ParameterizedTest
     @MethodSource("configs")
     fun `simple encode from string values`(isDirty: Boolean, delimiter: Char) =
@@ -297,6 +345,7 @@ class FixNgCodecTest {
 
     @ParameterizedTest
     @ValueSource(chars = ['
', '|'])
+    @Suppress("SpellCheckingInspection")
     fun `tags with 0 prefix decode (dirty)`(delimiter: Char) {
         with(parsedMessage) {
             (body map "header").set("BodyLength", 302)
@@ -1007,7 +1056,7 @@ class FixNgCodecTest {
         return FixNgCodec(dictionary, FixNgCodecSettings(
             dictionary = "",
             decodeValuesToStrings = decodeValuesToStrings,
-            decodeDelimiter = delimiter
+            decodeDelimiter = delimiter,
         ))
     }
 
@@ -1031,7 +1080,7 @@ class FixNgCodecTest {
         parsedMessage: ParsedMessage,
         delimiter: Char,
         expectedWarning: String? = null,
-        encodeFromStringValues: Boolean = false
+        encodeFromStringValues: Boolean = false,
     ) {
         val parsedBody = parsedMessage.body as MutableMap<String, Any?>
 
@@ -1057,7 +1106,7 @@ class FixNgCodecTest {
         parsedMessage: ParsedMessage,
         delimiter: Char,
         expectedError: String? = null,
-        encodeFromStringValues: Boolean = false
+        encodeFromStringValues: Boolean = false,
     ) {
         val parsedBody = parsedMessage.body as MutableMap<String, Any?>
 
@@ -1192,6 +1241,7 @@ class FixNgCodecTest {
         else -> value.toString()
     }
 
+    @Suppress("SpellCheckingInspection")
     private val parsedMessage = ParsedMessage(
         MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()),
         EventId("test_id", "test_book", "test_scope", Instant.now()),
@@ -1249,6 +1299,7 @@ class FixNgCodecTest {
 
     private val parsedBody: MutableMap<String, Any?> = parsedMessage.body as MutableMap
 
+    @Suppress("SpellCheckingInspection")
     private val expectedMessageWithoutBody = ParsedMessage(
         MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()),
         EventId("test_id", "test_book", "test_scope", Instant.now()),
@@ -1271,6 +1322,7 @@ class FixNgCodecTest {
         )
     )
 
+    @Suppress("SpellCheckingInspection")
     private val parsedMessageWithNestedComponents = ParsedMessage(
         MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()),
         EventId("test_id", "test_book", "test_scope", Instant.now()),
@@ -1300,6 +1352,7 @@ class FixNgCodecTest {
     )
     private val parsedBodyWithNestedComponents: MutableMap<String, Any?> = parsedMessageWithNestedComponents.body as MutableMap
 
+    @Suppress("SpellCheckingInspection")
     private val parsedMessageWithNestedGroups = ParsedMessage(
         MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()),
         EventId("test_id", "test_book", "test_scope", Instant.now()),
@@ -1368,6 +1421,7 @@ class FixNgCodecTest {
         )
     )
 
+    @Suppress("SpellCheckingInspection")
     private val parsedLogon = ParsedMessage(
         MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()),
         EventId("test_id", "test_book", "test_scope", Instant.now()),