From a749c8daa7821256f9c5f5c4fdb6b4c0eac72132 Mon Sep 17 00:00:00 2001 From: "ivan.druzhinin" Date: Wed, 12 Apr 2023 11:56:54 +0400 Subject: [PATCH 01/15] Initial version --- .github/workflows/ci-unwelcome-words.yml | 23 ++ .github/workflows/dev-docker-publish.yml | 19 ++ .github/workflows/docker-publish.yml | 20 ++ .gitignore | 6 + .gitlab-ci.yml | 7 + Dockerfile | 9 + build.gradle | 152 ++++++++++ gradle.properties | 6 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 183 ++++++++++++ gradlew.bat | 100 +++++++ settings.gradle | 1 + .../exactpro/th2/codec/fixng/ByteBufUtil.kt | 115 ++++++++ .../exactpro/th2/codec/fixng/FixNgCodec.kt | 272 ++++++++++++++++++ .../th2/codec/fixng/FixNgCodecFactory.kt | 47 +++ .../th2/codec/fixng/FixNgCodecSettings.kt | 25 ++ 17 files changed, 991 insertions(+) create mode 100644 .github/workflows/ci-unwelcome-words.yml create mode 100644 .github/workflows/dev-docker-publish.yml create mode 100644 .github/workflows/docker-publish.yml create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt create mode 100644 src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt create mode 100644 src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt create mode 100644 src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml new file mode 100644 index 0000000..cd7adcf --- /dev/null +++ b/.github/workflows/ci-unwelcome-words.yml @@ -0,0 +1,23 @@ +name: CI + +on: + pull_request: + +jobs: + test: + runs-on: ubuntu-20.04 + 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 }} diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml new file mode 100644 index 0000000..6f77755 --- /dev/null +++ b/.github/workflows/dev-docker-publish.yml @@ -0,0 +1,19 @@ +name: Dev build and publish Docker distributions to Github Container Registry ghcr.io + +on: + push: + branches-ignore: + - master + - version-* + - dependabot** + paths-ignore: + - README.md + +jobs: + build-job: + uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main + with: + build-target: 'Docker' + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 0000000..cec50a6 --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,20 @@ +name: Build and publish Docker distributions to Github Container Registry ghcr.io + +on: + push: + branches: + - master + - version-* + paths: + - gradle.properties +# - package_info.json + +jobs: + build-job: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} + \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e7f2eee --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +build/ +shared/ +.gradle/ +.idea/ +logs/ +out/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..08668be --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +variables: + APP_NAME: th2-codec-fix-ng + +include: + - project: vivarium/th2/pipelines + ref: v2 + file: /.gitlab-ci-java.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3ee4f84 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM gradle:7.6-jdk11 AS build +ARG release_version +COPY ./ . +RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version} + +FROM adoptopenjdk/openjdk11:alpine +WORKDIR /home +COPY --from=build /home/gradle/build/docker . +ENTRYPOINT ["/home/service/bin/service"] \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0d74521 --- /dev/null +++ b/build.gradle @@ -0,0 +1,152 @@ +plugins { + id 'com.palantir.docker' version '0.25.0' apply false + id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}" + id "org.owasp.dependencycheck" version "8.2.1" + id 'org.jetbrains.kotlin.kapt' version "${kotlin_version}" +} + +dependencyCheck { + format='HTML' + failBuildOnCVSS=5 +} + +apply plugin: 'kotlin' +apply plugin: 'application' +apply plugin: 'com.palantir.docker' + +ext { + sharedDir = file("${project.rootDir}/shared") + sailfishVersion = '3.3.54' + commonVersion = '5.2.0-separate-executor-+' +} + +group = 'com.exactpro.th2' +version = release_version + +sourceCompatibility = 11 +targetCompatibility = 11 + +ext.excludeSailfish = { rcd -> + rcd.excludeModule("com.exactpro.sf", "sailfish-core") + rcd.excludeModule("com.exactpro.sf", "sailfish-common") + rcd.excludeModule("com.exactpro.sf", "sailfish-rest-api-client") + rcd.excludeModule("com.exactpro.sf", "service-http") +} + +repositories { + maven { + name 'MavenLocal' + url sharedDir + } + + maven { + name 'Sonatype_snapshots' + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + content { + excludeSailfish(it) + } + } + + // ignoreGradleMetadataRedirection is used for sonatype because + // Sailfish dependencies have constrains that interfere with our BOM + // so we exclude Gradle metadata for this repositories. + // We've checked these versions - they are compatible and safe to use + maven { + name 'Sonatype_snapshots' + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + metadataSources { + mavenPom() + artifact() + ignoreGradleMetadataRedirection() + } + } + + maven { + name 'Sonatype_releases' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' + content { + excludeSailfish(it) + } + } + + maven { + name 'Sonatype_releases' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' + metadataSources { + mavenPom() + artifact() + ignoreGradleMetadataRedirection() + } + } + + mavenCentral() + mavenLocal() + + configurations.all { + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' + resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' + } +} + +jar { + manifest { + attributes( + 'Created-By': "${System.getProperty('java.version')} (${System.getProperty('java.vendor')})", + 'Specification-Title': '', + 'Specification-Vendor': 'Exactpro Systems LLC', + 'Implementation-Title': project.archivesBaseName, + 'Implementation-Vendor': 'Exactpro Systems LLC', + 'Implementation-Vendor-Id': 'com.exactpro', + 'Implementation-Version': project.version + ) + } +} + +dependencies { + api platform('com.exactpro.th2:bom:4.2.0') + + implementation "com.exactpro.th2:common:${commonVersion}" + + implementation 'com.exactpro.th2:codec:5.2.0-new-proto-+' + implementation 'com.exactpro.th2:sailfish-utils:3.14.0' + + implementation "com.exactpro.sf:service-http:${sailfishVersion}" + + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}" + implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" + implementation 'io.github.microutils:kotlin-logging' + + compileOnly 'com.google.auto.service:auto-service:1.0.1' + annotationProcessor 'com.google.auto.service:auto-service:1.0.1' + kapt 'com.google.auto.service:auto-service:1.0.1' +} + +application { + mainClassName 'com.exactpro.th2.codec.MainKt' +} + +applicationName = 'service' + +distTar { + archiveName "${applicationName}.tar" +} + +dockerPrepare { + dependsOn distTar +} + +docker { + copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) +} + +compileKotlin { + kotlinOptions { + jvmTarget = "11" + } +} + +compileTestKotlin { + kotlinOptions { + jvmTarget = "11" + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f2f1988 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +kotlin.code.style=official + +kotlin_version=1.6.21 +release_version=0.0.1 + +vcs_url=https://github.com/th2-net/th2-codec-fix-ng \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..10c66bb --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 25 11:22:24 MSK 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..80709cd --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'codec-fix-ng' diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt new file mode 100644 index 0000000..3ac98df --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt @@ -0,0 +1,115 @@ +/* + * Copyright 2023 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.codec.fixng + +import io.netty.buffer.ByteBuf +import java.nio.charset.Charset + +private const val SEP_BYTE = '='.code.toByte() +private const val SOH_BYTE = 1.toByte() +private const val DIGIT_0 = '0'.code.toByte() +private const val DIGIT_9 = '9'.code.toByte() + +private fun Int.getDigitCount(): Int = when { + this < 10 -> 1 + this < 100 -> 2 + this < 1000 -> 3 + this < 10000 -> 4 + this < 100000 -> 5 + this < 1000000 -> 6 + this < 10000000 -> 7 + this < 100000000 -> 8 + this < 1000000000 -> 9 + else -> 10 +} + +private fun ByteBuf.printInt(value: Int, digits: Int = value.getDigitCount()): ByteBuf = apply { + var value = value + + ensureWritable(digits) + + repeat(digits) { index -> + setByte(digits - index - 1, value % 10 + DIGIT_0) + value /= 10 + } + + writerIndex(writerIndex() + digits) +} + +fun ByteBuf.readTag(): Int { + val offset = readerIndex() + var tag = 0 + + while (isReadable) { + val byte = readByte() + + if (byte in DIGIT_0..DIGIT_9) { + tag = tag * 10 + byte - DIGIT_0 + if (tag >= 0) continue + } + + return if (byte == SEP_BYTE && tag != 0) tag else break + } + + error("No valid tag at offset: $offset") +} + +fun ByteBuf.writeTag(tag: Int): ByteBuf { + require(tag > 0) { "Tag cannot be negative" } + return printInt(tag).writeByte(SEP_BYTE.toInt()) +} + +fun ByteBuf.readValue(charset: Charset): String { + val offset = readerIndex() + val length = bytesBefore(SOH_BYTE) + check(length > 0) { "No valid value at offset: $offset" } + readerIndex(offset + length + 1) + return toString(offset, length, charset) +} + +fun ByteBuf.writeValue(value: String, charset: Charset): ByteBuf = apply { + writeCharSequence(value, charset) + writeByte(SOH_BYTE.toInt()) +} + +inline fun ByteBuf.forEachField( + charset: Charset, + action: (tag: Int, value: String) -> Boolean, +) { + while (isReadable) { + val offset = readerIndex() + if (action(readTag(), readValue(charset))) continue + readerIndex(offset) + } +} + +inline fun ByteBuf.readField(tag: Int, charset: Charset, message: (Int) -> String): String = readTag().let { + check(it == tag) { message(it) } + readValue(charset) +} + +fun ByteBuf.writeField(tag: Int, value: String, charset: Charset): ByteBuf = writeTag(tag).writeValue(value, charset) + +fun ByteBuf.writeField(tag: Int, value: Any?, charset: Charset): ByteBuf = writeField(tag, value.toString(), charset) + +fun ByteBuf.writeChecksum() { + val index = readerIndex() + var checksum = 0 + while (isReadable) checksum += readByte() + readerIndex(index) + writeTag(10).printInt(checksum % 256, 3).writeByte(SOH_BYTE.toInt()) +} diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt new file mode 100644 index 0000000..450fff0 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -0,0 +1,272 @@ +/* + * Copyright 2023 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.codec.fixng + +import com.exactpro.sf.common.messages.structures.IDictionaryStructure +import com.exactpro.sf.common.messages.structures.IFieldStructure +import com.exactpro.sf.common.messages.structures.IMessageStructure +import com.exactpro.sf.common.messages.structures.StructureUtils +import com.exactpro.sf.extensions.messageType +import com.exactpro.th2.codec.api.IPipelineCodec +import com.exactpro.th2.codec.fixng.FixNgCodecFactory.Companion.PROTOCOL +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.RawMessage +import io.netty.buffer.ByteBuf +import io.netty.buffer.Unpooled +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.Message as CommonMessage + +class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipelineCodec { + private val beginString = settings.beginString + private val charset = settings.charset + + private val messagesByType = messages.associateBy(Message::type) + private val messagesByName = messages.associateBy(Message::name) + + private val headerDef = messagesByName[HEADER] ?: error("Header is not defined in dictionary") + private val trailerDef = messagesByName[TRAILER] ?: error("Trailer is not defined in dictionary") + + override fun encode(messageGroup: MessageGroup): MessageGroup { + val messages = mutableListOf>() + + for (message in messageGroup.messages) { + if (message !is ParsedMessage || message.protocol.run { isNotEmpty() && this != PROTOCOL }) { + messages += message + continue + } + + val messageDef = messagesByName[message.type] ?: error("Unknown message name: ${message.type}") + + val messageFields = message.body + val headerFields = messageFields.remove(HEADER) as? Map<*, *> ?: mapOf() + val trailerFields = messageFields.remove(TRAILER) as? Map<*, *> ?: mapOf() + + val body = Unpooled.buffer(1024) + val prefix = Unpooled.buffer(32) + val buffer = Unpooled.wrappedBuffer(prefix, body) + + prefix.writeField(8, beginString, charset) + body.writeField(35, messageDef.type, charset) + + headerDef.encode(headerFields, body) + messageDef.encode(messageFields, body) + trailerDef.encode(trailerFields, body) + + prefix.writeField(9, body.readableBytes(), charset) + buffer.writeChecksum() + + messages += RawMessage( + id = message.id, + eventId = message.eventId, + metadata = message.metadata, + protocol = PROTOCOL, + body = buffer + ) + } + + return MessageGroup(messages) + } + + override fun decode(messageGroup: MessageGroup): MessageGroup { + val messages = mutableListOf>() + + for (message in messageGroup.messages) { + if (message !is RawMessage || message.protocol.run { isNotEmpty() && this != PROTOCOL }) { + messages += message + continue + } + + val buffer = message.body + + val beginString = buffer.readField(8, charset) { "Message starts with $it tag instead of BeginString (8)" } + val bodyLength = buffer.readField(9, charset) { "BeginString (8) is followed by $it tag instead of BodyLength (9)" } + val msgType = buffer.readField(35, charset) { "BodyLength (9) is followed by $it tag instead of MsgType (35)" } + + val messageDef = messagesByType[msgType] ?: error("Unknown message type: $msgType") + + val header = headerDef.decode(buffer) + val body = messageDef.decode(buffer) + val trailer = trailerDef.decode(buffer) + + if (buffer.isReadable) error("Tag appears out of order: ${buffer.readTag()}") + + header["BeginString"] = beginString + header["BodyLength"] = bodyLength + header["MsgType"] = msgType + + body[HEADER] = header + body[TRAILER] = trailer + + messages += ParsedMessage( + id = message.id, + eventId = message.eventId, + metadata = message.metadata, + protocol = PROTOCOL, + type = msgType, + body = body, + ) + } + + return MessageGroup(messages) + } + + private fun Field.decode(source: ByteBuf, target: MutableMap, value: String, tag: Int) { + val previous = when (this) { + is Primitive -> target.put(name, value) + is Group -> target.put(name, decode(source, value.toIntOrNull() ?: error("Invalid $name group counter ($tag) value: $value"))) + else -> error("Unsupported field type: $this") + } + + check(previous == null) { "Duplicate $name field ($tag) with value: $value (previous: $previous)" } + } + + private fun Message.decode(source: ByteBuf): MutableMap = mutableMapOf().also { map -> + source.forEachField(charset) { tag, value -> + val field = get(tag) ?: return@forEachField false + field.decode(source, map, value, tag) + return@forEachField true + } + } + + private fun Group.decode(source: ByteBuf, count: Int): List> = ArrayList>().also { list -> + var map: MutableMap? = null + + source.forEachField(charset) { tag, value -> + val field = get(tag) ?: return@forEachField false + if (tag == delimiter) map = mutableMapOf().also(list::add) + val group = checkNotNull(map) { "Field ${field.name} ($tag) appears before delimiter ($delimiter)" } + field.decode(source, group, value, tag) + return@forEachField true + } + + check(list.size == count) { "Unexpected group $name count: ${list.size} (expected: $count)" } + } + + private fun FieldMap.encode(source: Map<*, *>, target: ByteBuf) = fields.forEach { (name, field) -> + val value = source[name] ?: when { + field.isRequired -> error("Missing required field: $name") + else -> return@forEach + } + + when { + field is Primitive -> if (field.tag != 8 && field.tag != 9 && field.tag != 10 && field.tag != 35) target.writeField(field.tag, value, charset) + field is Group && value is List<*> -> field.encode(value, target) + else -> error("Unsupported value in ${field.name} field: $value") + } + } + + private fun Group.encode(source: List<*>, target: ByteBuf) { + target.writeField(counter, source.size, charset) + + source.forEach { group -> + check(group is Map<*, *>) { "Unsupported value in $name group: $group" } + encode(group, target) + } + } + + interface Field { + val isRequired: Boolean + val name: String + } + + data class Primitive( + override val isRequired: Boolean, + override val name: String, + val tag: Int, + ) : Field + + abstract class FieldMap { + abstract val name: String + abstract val fields: Map + + private val tags: Map by lazy { + fields.values.associateBy { field -> + when (field) { + is Primitive -> field.tag + is Group -> field.counter + else -> error("Field map $name contains unsupported field: $field") + } + } + } + + operator fun get(tag: Int): Field? = tags[tag] + operator fun get(field: String): Field? = fields[field] + } + + data class Message( + override val isRequired: Boolean, + override val name: String, + val type: String, + override val fields: Map, + ) : Field, FieldMap() + + data class Group( + override val isRequired: Boolean, + override val name: String, + val counter: Int, + val delimiter: Int, + override val fields: Map, + ) : Field, FieldMap() + + companion object { + private const val HEADER = "header" + private const val TRAILER = "trailer" + + private val IMessageStructure.entityType: String + get() = StructureUtils.getAttributeValue(this, "entity_type") + + private val IMessageStructure.isGroup: Boolean + get() = entityType == "Group" + + private val IMessageStructure.isComponent: Boolean + get() = entityType == "Component" + + private val IFieldStructure.tag: Int + get() = StructureUtils.getAttributeValue(this, "tag") + + private fun IFieldStructure.toPrimitive(): Primitive = Primitive(isRequired, name, tag) + + private fun IMessageStructure.toFields(): Map = linkedMapOf().apply { + fields.forEach { (name, field) -> + when { + field !is IMessageStructure -> this[name] = field.toPrimitive() + field.isGroup -> this[name] = field.toGroup() + field.isComponent -> this += field.toFields() + } + } + } + + private fun IMessageStructure.toMessage(): Message = Message( + name = name, + type = messageType ?: name, + fields = toFields(), + isRequired = isRequired + ) + + private fun IMessageStructure.toGroup(): Group = Group( + name = name, + counter = tag, + delimiter = fields.values.first().tag, + fields = toFields(), + isRequired = isRequired, + ) + + fun IDictionaryStructure.toMessages(): List = messages.values + .filterNot { it.isGroup || it.isComponent } + .map { it.toMessage() } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt new file mode 100644 index 0000000..3e92795 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt @@ -0,0 +1,47 @@ +/* + * Copyright 2023 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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.th2.codec.api.IPipelineCodec +import com.exactpro.th2.codec.api.IPipelineCodecFactory +import com.exactpro.th2.codec.api.IPipelineCodecSettings +import com.exactpro.th2.codec.fixng.FixNgCodec.Companion.toMessages +import com.google.auto.service.AutoService +import mu.KotlinLogging +import java.io.InputStream + +@AutoService(IPipelineCodecFactory::class) +class FixNgCodecFactory : IPipelineCodecFactory { + @Deprecated("Please migrate to the protocols property") override val protocol: String = PROTOCOL + override val settingsClass: Class = FixNgCodecSettings::class.java + private lateinit var dictionary: IDictionaryStructure + + override fun init(dictionary: InputStream) { + this.dictionary = dictionary.use(XmlDictionaryStructureLoader()::load) + } + + override fun create(settings: IPipelineCodecSettings?): IPipelineCodec = FixNgCodec(dictionary.toMessages(), requireNotNull(settings as? FixNgCodecSettings) { + "settings is not an instance of ${FixNgCodecSettings::class.java}: $settings" + }) + + companion object { + const val PROTOCOL = "fix" + private val LOGGER = KotlinLogging.logger {} + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt new file mode 100644 index 0000000..ed7ee08 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2023 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.codec.fixng + +import com.exactpro.th2.codec.api.IPipelineCodecSettings +import java.nio.charset.Charset + +data class FixNgCodecSettings( + val beginString: String = "FIXT1.1", + val charset: Charset = Charsets.US_ASCII, +) : IPipelineCodecSettings From 4828490f23ddf18aee5628c962f34b9d124fd033 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 18 Apr 2023 18:56:52 +0400 Subject: [PATCH 02/15] Migrated to transport from demo messages --- build.gradle | 21 +++++++-------- gradlew | 0 .../exactpro/th2/codec/fixng/FixNgCodec.kt | 4 +-- .../th2/codec/fixng/FixNgCodecFactory.kt | 27 ++++++++++++------- .../th2/codec/fixng/FixNgCodecSettings.kt | 1 + 5 files changed, 29 insertions(+), 24 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index 0d74521..a6d4c9c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,7 @@ apply plugin: 'application' apply plugin: 'com.palantir.docker' ext { - sharedDir = file("${project.rootDir}/shared") - sailfishVersion = '3.3.54' + sailfishVersion = '3.3.77' commonVersion = '5.2.0-separate-executor-+' } @@ -34,11 +33,6 @@ ext.excludeSailfish = { rcd -> } repositories { - maven { - name 'MavenLocal' - url sharedDir - } - maven { name 'Sonatype_snapshots' url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' @@ -82,7 +76,7 @@ repositories { mavenCentral() mavenLocal() - configurations.all { + configurations.configureEach { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' } @@ -106,13 +100,16 @@ dependencies { api platform('com.exactpro.th2:bom:4.2.0') implementation "com.exactpro.th2:common:${commonVersion}" - implementation 'com.exactpro.th2:codec:5.2.0-new-proto-+' - implementation 'com.exactpro.th2:sailfish-utils:3.14.0' - implementation "com.exactpro.sf:service-http:${sailfishVersion}" + implementation ("com.exactpro.sf:sailfish-common:${sailfishVersion}") { + exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml' // because of the vulnerability + exclude group: 'com.exactpro.mina', module: 'apache-mina-core' // because of the vulnerability + } + + + implementation 'io.netty:netty-buffer' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}" implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" implementation 'io.github.microutils:kotlin-logging' diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index 450fff0..e8d4b9c 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -16,11 +16,11 @@ package com.exactpro.th2.codec.fixng +import com.exactpro.sf.common.messages.structures.DictionaryConstants.FIELD_MESSAGE_TYPE import com.exactpro.sf.common.messages.structures.IDictionaryStructure import com.exactpro.sf.common.messages.structures.IFieldStructure import com.exactpro.sf.common.messages.structures.IMessageStructure import com.exactpro.sf.common.messages.structures.StructureUtils -import com.exactpro.sf.extensions.messageType import com.exactpro.th2.codec.api.IPipelineCodec import com.exactpro.th2.codec.fixng.FixNgCodecFactory.Companion.PROTOCOL import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup @@ -252,7 +252,7 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel private fun IMessageStructure.toMessage(): Message = Message( name = name, - type = messageType ?: name, + type = StructureUtils.getAttributeValue(this, FIELD_MESSAGE_TYPE) ?: name, fields = toFields(), isRequired = isRequired ) diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt index 3e92795..5dc29b4 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt @@ -16,32 +16,39 @@ 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.th2.codec.api.IPipelineCodec +import com.exactpro.th2.codec.api.IPipelineCodecContext import com.exactpro.th2.codec.api.IPipelineCodecFactory import com.exactpro.th2.codec.api.IPipelineCodecSettings import com.exactpro.th2.codec.fixng.FixNgCodec.Companion.toMessages import com.google.auto.service.AutoService -import mu.KotlinLogging -import java.io.InputStream @AutoService(IPipelineCodecFactory::class) class FixNgCodecFactory : IPipelineCodecFactory { + private lateinit var context: IPipelineCodecContext + @Deprecated("Please migrate to the protocols property") override val protocol: String = PROTOCOL override val settingsClass: Class = FixNgCodecSettings::class.java - private lateinit var dictionary: IDictionaryStructure - override fun init(dictionary: InputStream) { - this.dictionary = dictionary.use(XmlDictionaryStructureLoader()::load) + override fun init(pipelineCodecContext: IPipelineCodecContext) { + this.context = pipelineCodecContext } - override fun create(settings: IPipelineCodecSettings?): IPipelineCodec = FixNgCodec(dictionary.toMessages(), requireNotNull(settings as? FixNgCodecSettings) { - "settings is not an instance of ${FixNgCodecSettings::class.java}: $settings" - }) + override fun create(settings: IPipelineCodecSettings?): IPipelineCodec { + check(::context.isInitialized) { "'codecContext' was not loaded" } + val codecSettings = requireNotNull(settings as? FixNgCodecSettings) { + "settings is not an instance of ${FixNgCodecSettings::class.java}: ${settings?.let { it::class.java }}" + } + return FixNgCodec( + context[codecSettings.dictionary].use(XmlDictionaryStructureLoader()::load).toMessages(), + requireNotNull(codecSettings as? FixNgCodecSettings) { + "settings is not an instance of ${FixNgCodecSettings::class.java}: $codecSettings" + } + ) + } companion object { const val PROTOCOL = "fix" - private val LOGGER = KotlinLogging.logger {} } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt index ed7ee08..da96b98 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt @@ -21,5 +21,6 @@ import java.nio.charset.Charset data class FixNgCodecSettings( val beginString: String = "FIXT1.1", + val dictionary: String, val charset: Charset = Charsets.US_ASCII, ) : IPipelineCodecSettings From 5ba4992ba430133fb28b43e922309b54397f3100 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 20 Apr 2023 17:15:12 +0400 Subject: [PATCH 03/15] Added FixNgCodecTest --- build.gradle | 7 + .../exactpro/th2/codec/fixng/ByteBufUtil.kt | 5 +- .../exactpro/th2/codec/fixng/FixNgCodec.kt | 2 +- .../th2/codec/fixng/FixNgCodecTest.kt | 67 + src/test/resources/dictionary.xml | 7472 +++++++++++++++++ 5 files changed, 7550 insertions(+), 3 deletions(-) create mode 100644 src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt create mode 100644 src/test/resources/dictionary.xml diff --git a/build.gradle b/build.gradle index a6d4c9c..db67e23 100644 --- a/build.gradle +++ b/build.gradle @@ -116,6 +116,13 @@ dependencies { compileOnly 'com.google.auto.service:auto-service:1.0.1' annotationProcessor 'com.google.auto.service:auto-service:1.0.1' kapt 'com.google.auto.service:auto-service:1.0.1' + + testImplementation "org.junit.jupiter:junit-jupiter:5.9.2" + testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5:1.6.21' +} + +test { + useJUnitPlatform() } application { diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt index 3ac98df..207a4d7 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt @@ -37,8 +37,8 @@ private fun Int.getDigitCount(): Int = when { else -> 10 } -private fun ByteBuf.printInt(value: Int, digits: Int = value.getDigitCount()): ByteBuf = apply { - var value = value +private fun ByteBuf.printInt(sourceValue: Int, digits: Int = sourceValue.getDigitCount()): ByteBuf = apply { + var value = sourceValue ensureWritable(digits) @@ -94,6 +94,7 @@ inline fun ByteBuf.forEachField( val offset = readerIndex() if (action(readTag(), readValue(charset))) continue readerIndex(offset) + break } } diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index e8d4b9c..fc7a878 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -116,7 +116,7 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel eventId = message.eventId, metadata = message.metadata, protocol = PROTOCOL, - type = msgType, + type = messageDef.name, body = body, ) } diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt new file mode 100644 index 0000000..b600de9 --- /dev/null +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt @@ -0,0 +1,67 @@ +/* + * Copyright 2023 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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.th2.codec.fixng.FixNgCodec.Companion.toMessages +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.RawMessage +import io.netty.buffer.Unpooled +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows +import kotlin.test.assertEquals +import kotlin.test.assertTrue + + +class FixNgCodecTest { + + private val dictionary: IDictionaryStructure = + FixNgCodecTest::class.java.classLoader.getResourceAsStream("dictionary.xml") + .use(XmlDictionaryStructureLoader()::load) + private val codec = FixNgCodec(dictionary.toMessages(), FixNgCodecSettings(dictionary = "")) + @Test + fun `simple test decode encode`() { + listOf( + RawMessage(body = Unpooled.wrappedBuffer("8=FIXT.1.1\u00019=156\u000135=8\u000134=10947\u000149=SENDER\u000152=20230419-10:36:07.415088\u000156=RECEIVER\u00011=test\u000111=zSuNbrBIZyVljs\u000138=500\u000139=0\u000140=A\u000141=zSuNbrBIZyVljs\u000144=1000\u000147=500\u000154=B\u000155=ABC\u000159=M\u000110=012\u0001".toByteArray())), + RawMessage(body = Unpooled.wrappedBuffer("8=FIXT.1.1\u00019=133\u000135=D\u000134=11005\u000149=SENDER\u000152=20230419-10:36:07.415088\u000156=RECEIVER\u00011=test\u000111=UsVpSVQIcuqjQe\u000138=500\u000140=A\u000144=1000\u000147=500\u000154=B\u000155=ABC\u000159=M\u000110=000\u0001".toByteArray())), + ).forEach { source -> + codec.decode(MessageGroup(mutableListOf(source))).also { group -> + assertEquals(1, group.messages.size) + }.messages.first().also { decoded -> + assertTrue(decoded is ParsedMessage) +// TODO: uncomment when encode will be done +// codec.encode(MessageGroup(mutableListOf(decoded))).also { group -> +// assertEquals(1, group.messages.size) +// }.messages.first().also { encoded -> +// assertTrue(encoded is RawMessage) +// assertEquals(source, encoded) +// } + } + } + } + + @Test + fun `tag appears out of order`() { + val tag = 999 + assertThrows { + codec.decode(MessageGroup(mutableListOf(RawMessage(body = Unpooled.wrappedBuffer("8=FIXT.1.1\u00019=156\u000135=8\u000134=10947\u000149=SENDER\u000152=20230419-10:36:07.415088\u000156=RECEIVER\u0001$tag=500\u000110=012\u0001".toByteArray()))))) + }.also { ex -> + assertEquals("Tag appears out of order: $tag", ex.message) + } + } +} \ No newline at end of file diff --git a/src/test/resources/dictionary.xml b/src/test/resources/dictionary.xml new file mode 100644 index 0000000..a04f185 --- /dev/null +++ b/src/test/resources/dictionary.xml @@ -0,0 +1,7472 @@ + + + + + + + 1409 + INT + 0 + 2 + 3 + 4 + 6 + 7 + 8 + 100 + 101 + 102 + + + 1 + STRING + + + 2 + STRING + + + 3 + STRING + + + 4 + CHAR + B + S + X + T + + + 5 + STRING + N + C + R + + + 6 + PRICE + + + 7 + SEQNUM + + + 8 + STRING + + + 9 + LENGTH + + + 10 + STRING + + + 11 + STRING + + + 12 + AMT + + + 13 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + + + 14 + QTY + + + 15 + CURRENCY + + + 16 + SEQNUM + + + 17 + STRING + + + 18 + MULTIPLECHARVALUE + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z + a + b + c + d + e + f + g + h + i + j + k + + + 19 + STRING + + + 20 + CHAR + 0 + 1 + 2 + 3 + + + 21 + CHAR + 1 + 2 + 3 + + + 22 + STRING + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + + + 23 + STRING + + + 25 + CHAR + L + M + H + + + 26 + STRING + + + 27 + STRING + 0 + S + M + L + U + + + 28 + CHAR + N + C + R + + + 29 + CHAR + 1 + 2 + 3 + 4 + + + 30 + EXCHANGE + + + 31 + PRICE + + + 32 + QTY + + + 33 + NUMINGROUP + + + 34 + SEQNUM + + + 35 + STRING + 0 + 1 + 2 + 3 + 4 + 5 + 8 + 9 + A + D + E + F + G + S + Z + b + e + f + j + k + q + r + s + u + AD + AE + AF + AI + AQ + AR + BW + BX + + + 36 + SEQNUM + + + 37 + STRING + + + 38 + QTY + + + 39 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + + + 40 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + M + P + Q + + + 41 + STRING + + + 42 + UTCTIMESTAMP + + + 43 + BOOLEAN + + + 44 + PRICE + + + 45 + SEQNUM + + + 47 + STRING + + + 48 + STRING + + + 49 + STRING + + + 50 + STRING + + + 52 + UTCTIMESTAMP + + + 53 + QTY + + + 54 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + + + 55 + STRING + + + 56 + STRING + + + 57 + STRING + + + 58 + STRING + + + 59 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + C + + + 60 + UTCTIMESTAMP + + + 61 + CHAR + 0 + 1 + 2 + + + 62 + UTCTIMESTAMP + + + 63 + STRING + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + C + B + + + 64 + LOCALMKTDATE + + + 65 + STRING + WI + CD + + + 66 + STRING + + + 67 + INT + + + 68 + INT + + + 69 + STRING + + + 70 + STRING + + + 71 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 72 + STRING + + + 73 + NUMINGROUP + + + 74 + INT + + + 75 + LOCALMKTDATE + + + 76 + STRING + + + 77 + CHAR + O + C + R + F + + + 78 + NUMINGROUP + + + 79 + STRING + + + 80 + QTY + + + 81 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 82 + INT + + + 83 + INT + + + 84 + QTY + + + 85 + NUMINGROUP + + + 86 + STRING + + + 87 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 88 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 89 + DATA + + + 90 + LENGTH + + + 91 + DATA + + + 92 + STRING + + + 93 + LENGTH + + + 94 + CHAR + 0 + 1 + 2 + + + 95 + LENGTH + + + 96 + DATA + + + 97 + BOOLEAN + + + 98 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 99 + PRICE + + + 100 + EXCHANGE + + + 102 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 18 + 99 + 113100 + 113101 + + + 103 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 18 + 99 + 10000 + 10001 + 10003 + 10004 + 10005 + 10006 + + + 104 + CHAR + A + B + C + D + I + L + M + O + P + Q + R + S + T + V + W + X + Y + Z + + + 105 + STRING + + + 106 + STRING + + + 107 + STRING + + + 108 + INT + + + 109 + STRING + + + 110 + QTY + + + 111 + QTY + + + 112 + STRING + + + 113 + BOOLEAN + + + 114 + BOOLEAN + + + 115 + STRING + + + 116 + STRING + + + 117 + STRING + + + 118 + AMT + + + 119 + AMT + + + 120 + CURRENCY + + + 121 + BOOLEAN + + + 122 + UTCTIMESTAMP + + + 123 + BOOLEAN + + + 124 + NUMINGROUP + + + 125 + CHAR + P + F + + + 126 + UTCTIMESTAMP + + + 127 + CHAR + A + B + C + D + E + F + Z + + + 128 + STRING + + + 129 + STRING + + + 130 + BOOLEAN + + + 131 + STRING + + + 132 + PRICE + + + 133 + PRICE + + + 134 + QTY + + + 135 + QTY + + + 136 + NUMINGROUP + + + 137 + AMT + + + 138 + CURRENCY + + + 139 + STRING + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 140 + PRICE + + + 141 + BOOLEAN + + + 142 + STRING + + + 143 + STRING + + + 144 + STRING + + + 145 + STRING + + + 146 + NUMINGROUP + + + 147 + STRING + + + 148 + STRING + + + 149 + STRING + + + 150 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + + + 151 + QTY + + + 152 + QTY + + + 153 + PRICE + + + 154 + AMT + + + 155 + FLOAT + + + 156 + CHAR + M + D + + + 157 + INT + + + 158 + PERCENTAGE + + + 159 + AMT + + + 160 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + + + 161 + STRING + + + 162 + STRING + + + 163 + CHAR + N + C + R + T + + + 164 + STRING + + + 165 + CHAR + 1 + 2 + 3 + + + 166 + STRING + CED + DTC + EUR + FED + ISO + PNY + PTC + + + 167 + STRING + ? + ABS + AMENDED + AN + BA + BN + BOX + BRADY + BRIDGE + BUYSELL + CB + CD + CL + CMBS + CMO + COFO + COFP + CORP + CP + CPP + CS + DEFLTED + DINP + DN + DUAL + EUCD + EUCORP + EUCP + EUSOV + EUSUPRA + FAC + FADN + FOR + FORWARD + FUT + GO + IET + LOFC + LQN + MATURED + MBS + MF + MIO + MLEG + MPO + MPP + MPT + MT + MTN + NONE + ONITE + OPT + PEF + PFAND + PN + PS + PZFJ + RAN + REPLACD + REPO + RETIRED + REV + RVLV + RVLVTRM + SECLOAN + SECPLEDGE + SPCLA + SPCLO + SPCLT + STN + STRUCT + SUPRA + SWING + TAN + TAXA + TBA + TBILL + TBOND + TCAL + TD + TECP + TERM + TINT + TIPS + TNOTE + TPRN + TRAN + UST + USTB + VRDN + WAR + WITHDRN + WLD + XCN + XLINKD + YANK + YCD + OOP + OOF + CASH + + + 168 + UTCTIMESTAMP + + + 169 + INT + 0 + 1 + 2 + 3 + 4 + + + 170 + STRING + + + 171 + STRING + + + 172 + INT + 0 + 1 + 2 + 3 + + + 173 + STRING + + + 174 + STRING + + + 175 + STRING + + + 176 + STRING + + + 177 + STRING + + + 178 + STRING + + + 179 + STRING + + + 180 + STRING + + + 181 + STRING + + + 182 + STRING + + + 183 + STRING + + + 184 + STRING + + + 185 + STRING + + + 186 + STRING + + + 187 + STRING + + + 188 + PRICE + + + 189 + PRICEOFFSET + + + 190 + PRICE + + + 191 + PRICEOFFSET + + + 192 + QTY + + + 193 + LOCALMKTDATE + + + 194 + PRICE + + + 195 + PRICEOFFSET + + + 196 + STRING + + + 197 + INT + 0 + 1 + + + 198 + STRING + + + 199 + NUMINGROUP + + + 200 + MONTH-YEAR + + + 201 + INT + 0 + 1 + + + 202 + PRICE + + + 203 + INT + 0 + 1 + + + 204 + INT + 0 + 1 + + + 205 + DAY-OF-MONTH + + + 206 + CHAR + + + 207 + EXCHANGE + + + 208 + BOOLEAN + + + 209 + INT + 1 + 2 + 3 + + + 210 + QTY + + + 211 + FLOAT + + + 212 + LENGTH + + + 213 + DATA + + + 214 + STRING + + + 215 + NUMINGROUP + + + 216 + INT + 1 + 2 + 3 + 4 + + + 217 + STRING + + + 218 + PRICEOFFSET + + + 219 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + 220 + CURRENCY + + + 221 + STRING + EONIA + EUREPO + Euribor + FutureSWAP + LIBID + LIBOR + MuniAAA + OTHER + Pfandbriefe + SONIA + SWAP + Treasury + + + 222 + STRING + + + 223 + PERCENTAGE + + + 224 + LOCALMKTDATE + + + 225 + LOCALMKTDATE + + + 226 + INT + + + 227 + PERCENTAGE + + + 228 + FLOAT + + + 229 + LOCALMKTDATE + + + 230 + LOCALMKTDATE + + + 231 + FLOAT + + + 232 + NUMINGROUP + + + 233 + STRING + ABS + AMT + AUTOREINV + BANKQUAL + BGNCON + COUPON + CPP + CPR + CPY + CURRENCY + CUSTOMDATE + GEOG + HAIRCUT + HEP + INSURED + ISSUE + ISSUER + ISSUESIZE + LOOKBACK + LOT + LOTVAR + MAT + MATURITY + MAXSUBS + MHP + MINDNOM + MININCR + MINQTY + MPR + PAYFREQ + PIECES + PMAX + PPC + PPL + PPM + PPT + PRICE + PRICEFREQ + PROD + PROTECT + PSA + PURPOSE + PXSOURCE + RATING + REDEMPTION + RESTRICTED + SECTOR + SECTYPE + SMM + STRUCT + SUBSFREQ + SUBSLEFT + TEXT + TRDVAR + WAC + WAL + WALA + WAM + WHOLE + YIELD + + + 234 + STRING + CD + XD + CC + XC + CB + XB + CR + XR + CP + XP + CS + SP + TR + GD + + + 235 + STRING + AFTERTAX + ANNUAL + ATISSUE + AVGMATURITY + BOOK + CALL + CHANGE + CLOSE + COMPOUND + CURRENT + GOVTEQUIV + GROSS + INFLATION + INVERSEFLOATER + LASTCLOSE + LASTMONTH + LASTQUARTER + LASTYEAR + LONGAVGLIFE + MARK + MATURITY + NEXTREFUND + OPENAVG + PREVCLOSE + PROCEEDS + PUT + SEMIANNUAL + SHORTAVGLIFE + SIMPLE + TAXEQUIV + TENDER + TRUE + VALUE1_32 + WORST + + + 236 + PERCENTAGE + + + 237 + AMT + + + 238 + AMT + + + 239 + STRING + + + 240 + LOCALMKTDATE + + + 241 + LOCALMKTDATE + + + 242 + LOCALMKTDATE + + + 243 + STRING + + + 244 + INT + + + 245 + PERCENTAGE + + + 246 + FLOAT + + + 247 + LOCALMKTDATE + + + 248 + LOCALMKTDATE + + + 249 + LOCALMKTDATE + + + 250 + STRING + + + 251 + INT + + + 252 + PERCENTAGE + + + 253 + FLOAT + + + 254 + LOCALMKTDATE + + + 255 + STRING + + + 256 + STRING + + + 257 + STRING + + + 258 + BOOLEAN + + + 259 + LOCALMKTDATE + + + 260 + PRICE + + + 262 + STRING + + + 263 + CHAR + 0 + 1 + 2 + + + 264 + INT + + + 265 + INT + 0 + 1 + + + 266 + BOOLEAN + + + 267 + NUMINGROUP + + + 268 + NUMINGROUP + + + 269 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + J + K + L + M + N + O + P + Q + + + 270 + PRICE + + + 271 + QTY + + + 272 + UTCDATEONLY + + + 273 + UTCTIMEONLY + + + 274 + CHAR + 0 + 1 + 2 + 3 + + + 275 + EXCHANGE + + + 276 + MULTIPLESTRINGVALUE + A + B + C + D + E + F + G + H + I + L + J + K + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z + a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p + q + r + s + t + u + v + w + x + y + z + 0 + 1 + 2 + 1000 + 1001 + 1002 + 1003 + + + 277 + MULTIPLESTRINGVALUE + A + B + C + D + E + F + G + H + I + J + K + L + M + N + P + Q + R + Y + Z + S + T + U + V + W + X + 0 + a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p + q + r + s + t + u + v + w + x + y + z + AA + AB + AC + AD + AE + AF + AG + AH + AI + AJ + AK + AL + AM + AN + AO + AP + AQ + AR + AS + AT + 1000 + 1001 + 1002 + + + 278 + STRING + + + 279 + CHAR + 0 + 1 + 2 + 3 + 4 + + + 280 + STRING + + + 281 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + + + 282 + STRING + + + 283 + STRING + + + 284 + STRING + + + 285 + CHAR + 0 + 1 + + + 286 + MULTIPLECHARVALUE + 0 + 1 + 2 + 3 + 4 + 5 + + + 287 + INT + + + 288 + STRING + + + 289 + STRING + + + 290 + INT + + + 291 + MULTIPLECHARVALUE + 1 + 2 + 3 + + + 292 + MULTIPLECHARVALUE + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + + + 293 + QTY + + + 294 + QTY + + + 295 + NUMINGROUP + + + 296 + NUMINGROUP + + + 297 + INT + 0 + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 17 + + + 298 + INT + 1 + 2 + 3 + 4 + 5 + + + 299 + STRING + + + 300 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + + + 301 + INT + 0 + 1 + 2 + + + 302 + STRING + + + 303 + INT + 1 + 2 + + + 304 + INT + + + 305 + STRING + + + 306 + STRING + + + 307 + STRING + + + 308 + EXCHANGE + + + 309 + STRING + + + 310 + STRING + + + 311 + STRING + + + 312 + STRING + + + 313 + MONTH-YEAR + + + 314 + DAY-OF-MONTH + + + 315 + INT + + + 316 + PRICE + + + 317 + CHAR + + + 318 + CURRENCY + + + 319 + QTY + + + 320 + STRING + + + 321 + INT + 0 + 1 + 2 + 3 + + + 322 + STRING + + + 323 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 324 + STRING + + + 325 + BOOLEAN + + + 326 + INT + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 2 + 20 + 21 + 22 + 23 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + 327 + CHAR + D + E + I + M + P + X + + + 328 + BOOLEAN + + + 329 + BOOLEAN + + + 330 + QTY + + + 331 + QTY + + + 332 + PRICE + + + 333 + PRICE + + + 334 + INT + 1 + 2 + 3 + + + 335 + STRING + + + 336 + STRING + + + 337 + STRING + + + 338 + INT + 1 + 2 + 3 + + + 339 + INT + 1 + 2 + 3 + + + 340 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 341 + UTCTIMESTAMP + + + 342 + UTCTIMESTAMP + + + 343 + UTCTIMESTAMP + + + 344 + UTCTIMESTAMP + + + 345 + UTCTIMESTAMP + + + 346 + INT + + + 347 + STRING + ISO-2022-JP + EUC-JP + SHIFT_JIS + UTF-8 + + + 348 + LENGTH + + + 349 + DATA + + + 350 + LENGTH + + + 351 + DATA + + + 352 + LENGTH + + + 353 + DATA + + + 354 + LENGTH + + + 355 + DATA + + + 356 + LENGTH + + + 357 + DATA + + + 358 + LENGTH + + + 359 + DATA + + + 360 + LENGTH + + + 361 + DATA + + + 362 + LENGTH + + + 363 + DATA + + + 364 + LENGTH + + + 365 + DATA + + + 366 + PRICE + + + 367 + UTCTIMESTAMP + + + 368 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + + + 369 + SEQNUM + + + 370 + UTCTIMESTAMP + + + 371 + INT + + + 372 + STRING + + + 373 + INT + 0 + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + 18 + + + 374 + CHAR + C + N + + + 375 + STRING + + + 376 + STRING + + + 377 + BOOLEAN + + + 378 + INT + 0 + 1 + 10 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + 11 + 51 + 100 + + + 379 + STRING + + + 380 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 18 + + + 381 + AMT + + + 382 + NUMINGROUP + + + 383 + LENGTH + + + 384 + NUMINGROUP + + + 385 + CHAR + R + S + + + 386 + NUMINGROUP + + + 387 + QTY + + + 388 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 389 + FLOAT + + + 390 + STRING + + + 391 + STRING + + + 392 + STRING + + + 393 + INT + + + 394 + INT + 1 + 2 + 3 + + + 395 + INT + + + 396 + AMT + + + 397 + AMT + + + 398 + NUMINGROUP + + + 399 + INT + 1 + 2 + 3 + + + 400 + STRING + + + 401 + INT + 1 + 2 + + + 402 + PERCENTAGE + + + 403 + PERCENTAGE + + + 404 + AMT + + + 405 + PERCENTAGE + + + 406 + AMT + + + 407 + PERCENTAGE + + + 408 + AMT + + + 409 + INT + 1 + 2 + 3 + 4 + + + 410 + PERCENTAGE + + + 411 + BOOLEAN + + + 412 + AMT + + + 413 + PERCENTAGE + + + 414 + INT + 1 + 2 + 3 + + + 415 + INT + + + 416 + INT + 1 + 2 + + + 417 + INT + + + 418 + CHAR + A + G + J + R + + + 419 + CHAR + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + Z + + + 420 + NUMINGROUP + + + 421 + COUNTRY + + + 422 + INT + + + 423 + INT + 1 + 10 + 11 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + + + 424 + QTY + + + 425 + QTY + + + 426 + PRICE + + + 427 + INT + 0 + 1 + 2 + + + 428 + NUMINGROUP + + + 429 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 430 + INT + 1 + 2 + + + 431 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 432 + LOCALMKTDATE + + + 433 + CHAR + 1 + 2 + 3 + 4 + 5 + + + 434 + CHAR + 1 + 2 + + + 435 + PERCENTAGE + + + 436 + FLOAT + + + 437 + QTY + + + 438 + UTCTIMESTAMP + + + 439 + STRING + + + 440 + STRING + + + 441 + INT + + + 442 + CHAR + 1 + 2 + 3 + + + 443 + UTCTIMESTAMP + + + 444 + STRING + + + 445 + LENGTH + + + 446 + DATA + + + 447 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + P + C + D + E + F + G + H + I + + + 448 + STRING + + + 449 + UTCDATEONLY + + + 450 + UTCTIMEONLY + + + 451 + PRICEOFFSET + + + 452 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 37 + 38 + 39 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + 55 + 56 + 57 + 58 + 59 + 60 + 61 + 62 + 63 + 64 + 65 + 66 + 67 + 68 + 69 + 70 + 71 + 72 + 73 + 74 + 75 + 76 + 77 + 78 + 122 + + + 453 + NUMINGROUP + + + 454 + NUMINGROUP + + + 455 + STRING + + + 456 + STRING + + + 457 + NUMINGROUP + + + 458 + STRING + + + 459 + STRING + + + 460 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 461 + STRING + + + 462 + INT + + + 463 + STRING + + + 464 + BOOLEAN + + + 465 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 466 + STRING + + + 467 + STRING + + + 468 + CHAR + 0 + 1 + 2 + + + 469 + FLOAT + + + 470 + COUNTRY + + + 471 + STRING + + + 472 + STRING + + + 473 + NUMINGROUP + + + 474 + STRING + + + 475 + COUNTRY + + + 476 + STRING + + + 477 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + + + 478 + CURRENCY + + + 479 + CURRENCY + + + 480 + CHAR + N + M + O + Y + + + 481 + CHAR + Y + N + 1 + 2 + 3 + + + 482 + STRING + + + 483 + UTCTIMESTAMP + + + 484 + CHAR + B + C + D + E + O + P + Q + S + + + 485 + FLOAT + + + 486 + LOCALMKTDATE + + + 487 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 488 + STRING + + + 489 + STRING + + + 490 + LOCALMKTDATE + + + 491 + STRING + + + 492 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 493 + STRING + + + 494 + STRING + + + 495 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 999 + + + 496 + STRING + + + 497 + CHAR + N + Y + + + 498 + STRING + + + 499 + STRING + + + 500 + STRING + + + 501 + STRING + + + 502 + STRING + + + 503 + LOCALMKTDATE + + + 504 + LOCALMKTDATE + + + 505 + STRING + + + 506 + CHAR + A + R + H + N + + + 507 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 99 + + + 508 + STRING + + + 509 + STRING + + + 510 + NUMINGROUP + + + 511 + STRING + + + 512 + PERCENTAGE + + + 513 + STRING + + + 514 + CHAR + 0 + 1 + 2 + + + 515 + UTCTIMESTAMP + + + 516 + PERCENTAGE + + + 517 + CHAR + J + T + 2 + + + 518 + NUMINGROUP + + + 519 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 520 + FLOAT + + + 521 + CURRENCY + + + 522 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 523 + STRING + + + 524 + STRING + + + 525 + CHAR + + + 526 + STRING + + + 527 + STRING + + + 528 + CHAR + A + G + I + P + R + W + C + + + 529 + MULTIPLECHARVALUE + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + + + 530 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 9 + + + 531 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 9 + + + 532 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 99 + 100 + 101 + + + 533 + INT + + + 534 + INT + + + 535 + STRING + + + 536 + STRING + + + 537 + INT + 0 + 1 + 2 + 3 + + + 538 + INT + + + 539 + NUMINGROUP + + + 540 + AMT + + + 541 + LOCALMKTDATE + + + 542 + LOCALMKTDATE + + + 543 + STRING + + + 544 + CHAR + 1 + 2 + 3 + + + 545 + STRING + + + 546 + MULTIPLECHARVALUE + 1 + 2 + 3 + + + 547 + BOOLEAN + + + 548 + STRING + + + 549 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 550 + INT + 0 + 1 + 2 + + + 551 + STRING + + + 552 + NUMINGROUP + 1 + 2 + + + 553 + STRING + + + 554 + STRING + + + 555 + NUMINGROUP + + + 556 + CURRENCY + + + 557 + INT + + + 558 + NUMINGROUP + + + 559 + INT + 0 + 1 + 2 + 3 + 4 + + + 560 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 561 + QTY + + + 562 + QTY + + + 563 + INT + 0 + 1 + 2 + + + 564 + CHAR + + + 565 + INT + + + 566 + PRICE + + + 567 + INT + 1 + 99 + + + 568 + STRING + + + 569 + INT + 0 + 1 + 2 + 3 + 4 + + + 570 + BOOLEAN + + + 571 + STRING + + + 572 + STRING + + + 573 + CHAR + 0 + 1 + 2 + + + 574 + STRING + 1 + 2 + 3 + 4 + 5 + 6 + 7 + A1 + A2 + A3 + A4 + A5 + M3 + M4 + M5 + M6 + AQ + M1 + M2 + MT + S1 + S2 + S3 + S4 + S5 + 60 + 61 + 62 + 63 + 64 + 65 + + + 575 + BOOLEAN + + + 576 + NUMINGROUP + + + 577 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 578 + STRING + + + 579 + STRING + + + 580 + INT + + + 581 + INT + 1 + 2 + 3 + 4 + 6 + 7 + 8 + + + 582 + INT + 1 + 2 + 3 + 4 + + + 583 + STRING + + + 584 + STRING + + + 585 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 586 + UTCTIMESTAMP + + + 587 + CHAR + + + 588 + LOCALMKTDATE + + + 589 + CHAR + 0 + 1 + 2 + + + 590 + CHAR + 0 + 1 + 2 + + + 591 + CHAR + 0 + 1 + + + 592 + COUNTRY + + + 593 + STRING + + + 594 + STRING + + + 595 + STRING + + + 596 + COUNTRY + + + 597 + STRING + + + 598 + STRING + + + 599 + STRING + + + 600 + STRING + + + 601 + STRING + + + 602 + STRING + + + 603 + STRING + + + 604 + STRING + + + 605 + STRING + + + 606 + STRING + + + 607 + INT + + + 608 + STRING + + + 609 + STRING + + + 610 + MONTH-YEAR + + + 611 + LOCALMKTDATE + + + 612 + PRICE + + + 613 + CHAR + + + 614 + FLOAT + + + 615 + PERCENTAGE + + + 616 + EXCHANGE + + + 617 + STRING + + + 618 + LENGTH + + + 619 + DATA + + + 620 + STRING + + + 621 + LENGTH + + + 622 + DATA + + + 623 + FLOAT + + + 624 + CHAR + + + 625 + STRING + + + 626 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 627 + NUMINGROUP + + + 628 + STRING + + + 629 + UTCTIMESTAMP + + + 630 + SEQNUM + + + 631 + PRICE + + + 632 + PERCENTAGE + + + 633 + PERCENTAGE + + + 634 + PERCENTAGE + + + 635 + STRING + B + C + E + F + H + I + L + M + 1 + 2 + 3 + 4 + 5 + 9 + + + 636 + BOOLEAN + + + 637 + PRICE + + + 638 + INT + 0 + 1 + + + 639 + PRICEOFFSET + + + 640 + PRICE + + + 641 + PRICEOFFSET + + + 642 + PRICEOFFSET + + + 643 + PRICEOFFSET + + + 644 + STRING + + + 645 + PRICE + + + 646 + PRICE + + + 647 + QTY + + + 648 + QTY + + + 649 + STRING + + + 650 + BOOLEAN + + + 651 + PRICE + + + 652 + QTY + + + 653 + INT + 0 + 1 + 2 + 3 + 4 + + + 654 + STRING + + + 655 + STRING + + + 656 + FLOAT + + + 657 + FLOAT + + + 658 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 99 + + + 659 + STRING + + + 660 + INT + 1 + 2 + 3 + 4 + 5 + 99 + + + 661 + INT + + + 662 + PRICE + + + 663 + INT + + + 664 + STRING + + + 665 + INT + 1 + 2 + 3 + 4 + 5 + + + 666 + INT + 0 + 1 + 2 + + + 667 + MONTH-YEAR + + + 668 + INT + 1 + 2 + + + 669 + PRICE + + + 670 + NUMINGROUP + + + 671 + STRING + + + 672 + STRING + + + 673 + QTY + + + 674 + STRING + + + 675 + CURRENCY + + + 676 + CURRENCY + + + 677 + STRING + + + 678 + STRING + + + 679 + PRICE + + + 680 + INT + + + 681 + PRICE + + + 682 + STRING + + + 683 + NUMINGROUP + + + 684 + PRICE + + + 685 + QTY + + + 686 + INT + + + 687 + QTY + + + 688 + STRING + + + 689 + STRING + + + 690 + INT + 1 + 2 + 4 + 5 + + + 691 + STRING + + + 692 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + 693 + STRING + + + 694 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 695 + CHAR + + + 696 + LOCALMKTDATE + + + 697 + PRICE + + + 698 + INT + + + 699 + STRING + + + 700 + BOOLEAN + + + 701 + LOCALMKTDATE + + + 702 + NUMINGROUP + + + 703 + STRING + TQ + IAS + IES + FIN + SOD + EX + AS + TX + TA + PIT + TRF + ETR + ALC + PA + ASF + DLV + TOT + XM + SPL + RCV + CAA + DN + EP + + + 704 + QTY + + + 705 + QTY + + + 706 + INT + 0 + 1 + 2 + + + 707 + STRING + FMTM + IMTM + TVAR + SMTM + PREM + CRES + CASH + VADJ + SETL + + + 708 + AMT + + + 709 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 710 + STRING + + + 711 + NUMINGROUP + + + 712 + INT + 1 + 2 + 3 + 4 + + + 713 + STRING + + + 714 + STRING + + + 715 + LOCALMKTDATE + + + 716 + STRING + ITD + RTH + ETH + EOD + + + 717 + STRING + + + 718 + INT + 0 + 1 + 2 + 3 + + + 719 + BOOLEAN + + + 720 + BOOLEAN + + + 721 + STRING + + + 722 + INT + 0 + 1 + 2 + 3 + 4 + + + 723 + INT + 0 + 1 + 99 + + + 724 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 725 + INT + 0 + 1 + + + 726 + STRING + + + 727 + INT + + + 728 + INT + 0 + 1 + 2 + 3 + 4 + 99 + + + 729 + INT + 0 + 1 + 2 + + + 730 + PRICE + + + 731 + INT + 1 + 2 + + + 732 + PRICE + + + 733 + INT + + + 734 + PRICE + + + 735 + NUMINGROUP + + + 736 + CURRENCY + + + 737 + AMT + + + 738 + AMT + + + 739 + LOCALMKTDATE + + + 740 + STRING + + + 741 + AMT + + + 742 + AMT + + + 743 + LOCALMKTDATE + + + 744 + CHAR + R + P + + + 745 + QTY + + + 746 + AMT + + + 747 + CHAR + A + M + + + 748 + INT + + + 749 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 8 + 9 + 99 + 100 + 200 + + + 750 + INT + 0 + 1 + 2 + + + 751 + INT + 0 + 1 + 2 + 3 + 4 + 99 + + + 752 + INT + 1 + 2 + 3 + + + 753 + NUMINGROUP + + + 754 + BOOLEAN + + + 755 + STRING + + + 756 + NUMINGROUP + + + 757 + STRING + + + 758 + CHAR + + + 759 + INT + + + 760 + STRING + + + 761 + STRING + + + 762 + STRING + + + 763 + STRING + + + 764 + STRING + + + 765 + PERCENTAGE + + + 766 + AMT + + + 767 + CURRENCY + + + 768 + NUMINGROUP + + + 769 + UTCTIMESTAMP + + + 770 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 771 + STRING + + + 772 + STRING + + + 773 + INT + 1 + 2 + 3 + + + 774 + INT + 1 + 2 + 99 + + + 775 + INT + 0 + 1 + 2 + + + 776 + INT + + + 777 + STRING + + + 778 + NUMINGROUP + + + 779 + UTCTIMESTAMP + + + 780 + INT + 0 + 1 + 2 + 3 + 4 + + + 781 + NUMINGROUP + + + 782 + STRING + + + 783 + CHAR + + + 784 + INT + + + 785 + STRING + + + 786 + INT + + + 787 + CHAR + S + C + + + 788 + INT + 1 + 2 + 3 + 4 + + + 789 + SEQNUM + + + 790 + STRING + + + 791 + STRING + + + 792 + INT + 0 + 1 + 2 + 99 + + + 793 + STRING + + + 794 + INT + 3 + 4 + 5 + 8 + 2 + 9 + 10 + 11 + 12 + 14 + + + 795 + STRING + + + 796 + INT + 1 + 2 + 99 + + + 797 + BOOLEAN + + + 798 + INT + 1 + 2 + 3 + 4 + 6 + 7 + 8 + + + 799 + PRICE + + + 800 + QTY + + + 801 + NUMINGROUP + + + 802 + NUMINGROUP + + + 803 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + + + 804 + NUMINGROUP + + + 805 + INT + + + 806 + NUMINGROUP + + + 807 + INT + + + 808 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 810 + PRICE + + + 811 + FLOAT + + + 812 + INT + + + 813 + INT + + + 814 + INT + 0 + 1 + 2 + 3 + + + 815 + INT + 0 + 1 + 2 + 3 + + + 816 + NUMINGROUP + + + 817 + STRING + + + 818 + STRING + + + 819 + INT + 0 + 1 + 2 + + + 820 + STRING + + + 821 + STRING + + + 822 + STRING + + + 823 + STRING + + + 824 + STRING + + + 825 + STRING + + + 826 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 827 + INT + 0 + 1 + + + 828 + INT + 0 + 1 + 10 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 37 + 38 + 39 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 54 + + + 829 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 1000 + 1004 + 1005 + 1006 + 1007 + 1008 + 1009 + 1010 + 1011 + 1012 + 1013 + 2001 + 3001 + 1018 + 1019 + 1020 + 1021 + 1022 + 1023 + 1024 + 1025 + 1026 + 1027 + 1028 + 1029 + 2002 + 1031 + 1032 + 1033 + + + 830 + STRING + + + 831 + STRING + + + 832 + INT + + + 833 + STRING + + + 834 + PRICEOFFSET + + + 835 + INT + 0 + 1 + + + 836 + INT + 0 + 1 + 2 + 3 + + + 837 + INT + 0 + 1 + 2 + + + 838 + INT + 1 + 2 + + + 839 + PRICE + + + 840 + INT + 1 + 2 + 3 + 4 + + + 841 + INT + 0 + 1 + + + 842 + INT + 0 + 1 + 2 + 3 + + + 843 + INT + 0 + 1 + 2 + + + 844 + INT + 1 + 2 + + + 845 + PRICE + + + 846 + INT + 1 + 2 + 3 + 4 + + + 847 + INT + 1 + 2 + 3 + + + 848 + STRING + + + 849 + PERCENTAGE + + + 850 + FLOAT + + + 851 + INT + 1 + 2 + 3 + + + 852 + BOOLEAN + + + 853 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 854 + INT + 0 + 1 + 2 + + + 855 + INT + + + 856 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 857 + INT + 0 + 1 + + + 858 + AMT + + + 859 + STRING + + + 860 + PRICE + + + 861 + PRICE + + + 862 + NUMINGROUP + + + 863 + QTY + + + 864 + NUMINGROUP + + + 865 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 99 + + + 866 + LOCALMKTDATE + + + 867 + PRICE + + + 868 + STRING + + + 869 + PERCENTAGE + + + 870 + NUMINGROUP + + + 871 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 99 + + + 872 + STRING + + + 873 + LOCALMKTDATE + + + 874 + LOCALMKTDATE + + + 875 + INT + 1 + 2 + 99 + + + 876 + STRING + + + 877 + STRING + + + 878 + STRING + + + 879 + QTY + + + 880 + STRING + + + 881 + STRING + + + 882 + PRICE + + + 883 + PRICE + + + 884 + AMT + + + 885 + AMT + + + 886 + AMT + + + 887 + NUMINGROUP + + + 888 + STRING + + + 889 + STRING + + + 890 + AMT + + + 891 + INT + 0 + 1 + 2 + + + 892 + INT + + + 893 + BOOLEAN + + + 894 + STRING + + + 895 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 896 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 897 + NUMINGROUP + + + 898 + PERCENTAGE + + + 899 + AMT + + + 900 + AMT + + + 901 + AMT + + + 902 + STRING + + + 903 + INT + 0 + 1 + 2 + 3 + 4 + + + 904 + STRING + + + 905 + INT + 0 + 1 + 2 + 3 + + + 906 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 99 + + + 907 + STRING + + + 908 + STRING + + + 909 + STRING + + + 910 + INT + 0 + 1 + 2 + 3 + 4 + + + 911 + INT + + + 912 + BOOLEAN + + + 913 + STRING + + + 914 + STRING + + + 915 + LOCALMKTDATE + + + 916 + LOCALMKTDATE + + + 917 + LOCALMKTDATE + + + 918 + CURRENCY + + + 919 + INT + 0 + 1 + 2 + 3 + + + 920 + AMT + + + 921 + AMT + + + 922 + AMT + + + 923 + STRING + + + 924 + INT + 1 + 2 + 3 + 4 + + + 925 + STRING + + + 926 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 927 + STRING + + + 928 + INT + 1 + 2 + 3 + 4 + + + 929 + STRING + + + 930 + STRING + + + 931 + STRING + + + 932 + STRING + + + 933 + STRING + + + 934 + STRING + + + 935 + INT + 1 + 2 + 4 + 8 + + + 936 + NUMINGROUP + + + 937 + INT + 1 + 2 + + + 938 + NUMINGROUP + + + 939 + INT + 0 + 1 + 3 + + + 940 + INT + 1 + 2 + 3 + + + 941 + CURRENCY + + + 942 + CURRENCY + + + 943 + STRING + + + 944 + INT + 0 + 1 + 2 + + + 945 + INT + 0 + 1 + 2 + 3 + 4 + + + 946 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + + + 947 + CURRENCY + + + 948 + NUMINGROUP + + + 949 + STRING + + + 950 + CHAR + + + 951 + INT + + + 952 + NUMINGROUP + + + 953 + STRING + + + 954 + INT + + + 955 + MONTH-YEAR + + + 956 + LOCALMKTDATE + + + 957 + NUMINGROUP + + + 958 + STRING + + + 959 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + + + 960 + STRING + + + 961 + STRING + + + 962 + UTCTIMESTAMP + + + 963 + INT + + + 964 + INT + + + 965 + STRING + 1 + 2 + + + 966 + STRING + + + 967 + FLOAT + + + 968 + FLOAT + + + 969 + FLOAT + + + 970 + INT + + + 971 + INT + + + 972 + PERCENTAGE + + + 973 + AMT + + + 974 + STRING + FIXED + DIFF + + + 975 + INT + 2 + 4 + 5 + + + 976 + LOCALMKTDATE + + + 977 + STRING + + + 978 + BOOLEAN + + + 979 + STRING + + + 980 + CHAR + A + D + M + + + 981 + NUMINGROUP + + + 982 + INT + 1 + 2 + 3 + 4 + 5 + + + 983 + QTY + + + 984 + NUMINGROUP + + + 985 + AMT + + + 986 + AMT + + + 987 + LOCALMKTDATE + + + 988 + STRING + + + 989 + STRING + + + 990 + STRING + + + 991 + PRICE + + + 992 + INT + 1 + 2 + + + 993 + STRING + + + 994 + STRING + + + 996 + STRING + MWh + MMBtu + Bbl + Gal + t + tn + MMbbl + lbs + oz_tr + USD + Bcf + Bu + + + 997 + STRING + S + Min + H + D + Wk + Mo + Yr + + + 998 + STRING + + + 999 + STRING + + + 1000 + STRING + + + 1001 + STRING + + + 1002 + INT + 1 + 2 + 3 + + + 1003 + STRING + + + 1005 + STRING + + + 1006 + STRING + + + 1007 + STRING + + + 1008 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + 1009 + INT + + + 1011 + STRING + + + 1012 + UTCTIMESTAMP + + + 1013 + INT + + + 1014 + STRING + + + 1015 + CHAR + 0 + 1 + + + 1016 + NUMINGROUP + + + 1017 + FLOAT + + + 1018 + NUMINGROUP + + + 1019 + STRING + + + 1020 + QTY + + + 1021 + INT + 1 + 2 + 3 + + + 1022 + STRING + + + 1023 + INT + + + 1024 + INT + 0 + 1 + 2 + + + 1025 + PRICE + + + 1026 + FLOAT + + + 1027 + PRICEOFFSET + + + 1028 + BOOLEAN + + + 1029 + BOOLEAN + + + 1030 + STRING + + + 1031 + MULTIPLESTRINGVALUE + ADD + AON + CNH + DIR + E.W + FOK + IO + IOC + LOO + LOC + MAO + MAC + MOO + MOC + MQT + NH + OVD + PEG + RSV + S.W + SCL + TMO + TS + WRK + + + 1032 + INT + 1 + + + 1033 + STRING + A + AR + D + IN + IS + O + PF + PR + PT + S + T + + + 1034 + INT + 1 + + + 1035 + MULTIPLESTRINGVALUE + ADD + AON + CNH + DIR + E.W + FOK + IO + IOC + LOO + LOC + MAO + MAC + MOO + MOC + MQT + NH + OVD + PEG + RSV + S.W + SCL + TMO + TS + WRK + + + 1036 + CHAR + 0 + 1 + 2 + + + 1037 + AMT + + + 1038 + AMT + + + 1039 + STRING + + + 1040 + STRING + + + 1041 + STRING + + + 1042 + STRING + + + 1043 + INT + 0 + 1 + + + 1044 + QTY + + + 1045 + FLOAT + + + 1046 + CHAR + M + D + + + 1047 + CHAR + O + C + R + F + + + 1048 + PRICEOFFSET + + + 1049 + CHAR + + + 1050 + CHAR + + + 1051 + INT + + + 1052 + NUMINGROUP + + + 1053 + STRING + + + 1054 + INT + + + 1055 + STRING + + + 1056 + QTY + + + 1057 + BOOLEAN + + + 1058 + NUMINGROUP + + + 1059 + STRING + + + 1060 + CHAR + + + 1061 + INT + + + 1062 + NUMINGROUP + + + 1063 + STRING + + + 1064 + INT + + + 1065 + PRICEOFFSET + + + 1066 + PRICEOFFSET + + + 1067 + PRICEOFFSET + + + 1068 + PRICEOFFSET + + + 1069 + PRICEOFFSET + + + 1070 + INT + 0 + 1 + 2 + 3 + 4 + + + 1071 + PRICEOFFSET + + + 1072 + AMT + + + 1073 + PRICEOFFSET + + + 1074 + QTY + + + 1075 + AMT + + + 1079 + TZTIMEONLY + + + 1080 + STRING + + + 1081 + CHAR + 0 + 1 + 2 + 3 + + + 1082 + QTY + + + 1083 + CHAR + 1 + 2 + + + 1084 + CHAR + 1 + 2 + 3 + 4 + + + 1085 + QTY + + + 1086 + QTY + + + 1087 + QTY + + + 1088 + QTY + + + 1089 + QTY + + + 1090 + INT + + + 1091 + BOOLEAN + + + 1092 + CHAR + 0 + 1 + 2 + 3 + + + 1093 + CHAR + 1 + 2 + 3 + + + 1094 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + 1095 + PRICE + + + 1096 + STRING + + + 1097 + STRING + + + 1098 + STRING + + + 1099 + STRING + + + 1100 + CHAR + 1 + 2 + 3 + 4 + + + 1101 + CHAR + 1 + 2 + 3 + + + 1102 + PRICE + + + 1103 + STRING + + + 1104 + STRING + + + 1105 + STRING + + + 1106 + STRING + + + 1107 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + + + 1108 + CHAR + 0 + 1 + 2 + 3 + + + 1109 + CHAR + U + D + + + 1110 + PRICE + + + 1111 + CHAR + 1 + 2 + + + 1112 + QTY + + + 1113 + STRING + + + 1114 + STRING + + + 1115 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 1116 + NUMINGROUP + + + 1117 + STRING + + + 1118 + CHAR + + + 1119 + INT + + + 1120 + NUMINGROUP + + + 1121 + STRING + + + 1122 + INT + + + 1123 + CHAR + 0 + 1 + 2 + 3 + 4 + + + 1124 + CHAR + + + 1125 + LOCALMKTDATE + + + 1126 + STRING + + + 1127 + STRING + + + 1128 + STRING + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 1129 + STRING + + + 1130 + STRING + + + 1131 + STRING + + + 1132 + TZTIMESTAMP + + + 1133 + CHAR + B + C + D + E + G + + + 1134 + BOOLEAN + + + 1135 + STRING + + + 1136 + STRING + + + 1137 + STRING + 9 + + + 1138 + QTY + + + 1139 + STRING + + + 5450 + INT + 1 + 2 + 11 + 12 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + + + 8000 + UTCTIMESTAMP + + + 9000 + INT + + + 9001 + STRING + + + 9002 + STRING + + + 9995 + LOCALMKTDATE + + + 1167 + CHAR + 5 + + + 1166 + STRING + + + 1180 + STRING + + + 1181 + SEQNUM + + + 1182 + SEQNUM + + + 1183 + SEQNUM + + + 1300 + STRING + + + 1301 + STRING + + + 1328 + STRING + + + 1346 + STRING + + + 1347 + STRING + + + 1350 + SEQNUM + + + 1351 + NUMINGROUP + + + 1352 + BOOLEAN + + + 1353 + STRING + + + 1354 + INT + 0 + 1 + 2 + + + 1355 + STRING + + + 1357 + SEQNUM + + + 1369 + STRING + + + 1427 + STRING + + + 1444 + INT + 1 + 2 + 4 + + + 1461 + NUMINGROUP + + + 1462 + STRING + + + 1463 + CHAR + D + + + 1464 + INT + 1 + 76 + + + 9730 + CHAR + A + R + C + + + 20000 + CHAR + 0 + 1 + 2 + + + 20100 + PRICE + + + 20110 + INT + 0 + 1 + + + 20111 + INT + 0 + 1 + + + 27010 + INT + 0 + 99 + 100 + 1 + 2 + 3 + + + + + Group + 1461 + NUMINGROUP + + + + + + Group + 552 + NUMINGROUP + + + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 552 + NUMINGROUP + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 1461 + NUMINGROUP + + + + + + Group + 295 + NUMINGROUP + + + + + Group + 296 + NUMINGROUP + + + + + Group + 295 + NUMINGROUP + + + + + + + + Group + 454 + NUMINGROUP + + + + + Group + 552 + NUMINGROUP + + + + + + + + + + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 454 + NUMINGROUP + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 1351 + NUMINGROUP + + + + + + Group + 1351 + NUMINGROUP + + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 386 + NUMINGROUP + + + + Group + 73 + NUMINGROUP + + + + + + Group + 398 + NUMINGROUP + + + + Message + false + D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Message + false + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component + + + + Component + + + + Component + + + + Component + + + + Header + + + + + + + + + + + + + + + + Trailer + + + + Message + true + A + + + + + + + + + + + + + Message + true + 5 + + + + + + + Message + true + 0 + + + + + + Message + true + 1 + + + + + + Message + true + 2 + + + + + + + Message + true + 3 + + + + + + + + + + Message + true + 4 + + + + + + + From 2419e2d7ff7235e50e559a42feb0ecd076f991bf Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Fri, 9 Aug 2024 21:43:33 +0400 Subject: [PATCH 04/15] [TH2-5219] dirty mode (#1) --- .github/workflows/build-dev-release.yml | 15 + .../{docker-publish.yml => build-release.yml} | 17 +- ...-docker-publish.yml => build-sanpshot.yml} | 3 +- .github/workflows/ci-unwelcome-words.yml | 30 +- Dockerfile | 2 +- build.gradle | 109 +---- gradle.properties | 5 +- gradle/wrapper/gradle-wrapper.properties | 5 +- settings.gradle | 2 +- .../exactpro/th2/codec/fixng/ByteBufUtil.kt | 17 +- .../exactpro/th2/codec/fixng/FixNgCodec.kt | 417 +++++++++++++--- .../th2/codec/fixng/FixNgCodecFactory.kt | 9 +- .../th2/codec/fixng/FixNgCodecSettings.kt | 5 +- .../th2/codec/fixng/FixNgCodecTest.kt | 444 ++++++++++++++++-- suppressions.xml | 10 + 15 files changed, 858 insertions(+), 232 deletions(-) create mode 100644 .github/workflows/build-dev-release.yml rename .github/workflows/{docker-publish.yml => build-release.yml} (53%) rename .github/workflows/{dev-docker-publish.yml => build-sanpshot.yml} (75%) create mode 100644 suppressions.xml diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml new file mode 100644 index 0000000..b438d11 --- /dev/null +++ b/.github/workflows/build-dev-release.yml @@ -0,0 +1,15 @@ +name: Build and publish dev release Docker image to Github Container Registry ghcr.io + +on: workflow_dispatch + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + devRelease: true + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/build-release.yml similarity index 53% rename from .github/workflows/docker-publish.yml rename to .github/workflows/build-release.yml index cec50a6..dcf70be 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/build-release.yml @@ -1,20 +1,15 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io +name: Build and publish release Docker image to Github Container Registry ghcr.io -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties -# - package_info.json +on: workflow_dispatch jobs: - build-job: + build: uses: th2-net/.github/.github/workflows/compound-java.yml@main with: build-target: 'Docker' + devRelease: false + createTag: true docker-username: ${{ github.actor }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} - \ No newline at end of file + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/build-sanpshot.yml similarity index 75% rename from .github/workflows/dev-docker-publish.yml rename to .github/workflows/build-sanpshot.yml index 6f77755..9366a44 100644 --- a/.github/workflows/dev-docker-publish.yml +++ b/.github/workflows/build-sanpshot.yml @@ -1,4 +1,4 @@ -name: Dev build and publish Docker distributions to Github Container Registry ghcr.io +name: Build and publish Docker image to Github Container Registry ghcr.io on: push: @@ -17,3 +17,4 @@ jobs: docker-username: ${{ github.actor }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index cd7adcf..39d4010 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.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 }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 3ee4f84..432f34f 100644 --- a/Dockerfile +++ b/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 --no-daemon clean build dockerPrepare -Prelease_version=${release_version} diff --git a/build.gradle b/build.gradle index db67e23..83a209b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,30 +1,18 @@ plugins { - id 'com.palantir.docker' version '0.25.0' apply false - id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}" - id "org.owasp.dependencycheck" version "8.2.1" - id 'org.jetbrains.kotlin.kapt' version "${kotlin_version}" + id "application" + id "com.exactpro.th2.gradle.component" version "0.1.1" + id "org.jetbrains.kotlin.jvm" version "$kotlin_version" + id "org.jetbrains.kotlin.kapt" version "$kotlin_version" } -dependencyCheck { - format='HTML' - failBuildOnCVSS=5 -} - -apply plugin: 'kotlin' -apply plugin: 'application' -apply plugin: 'com.palantir.docker' - ext { - sailfishVersion = '3.3.77' - commonVersion = '5.2.0-separate-executor-+' + sailfishVersion = '3.3.241' + commonVersion = '5.14.0-dev' } group = 'com.exactpro.th2' version = release_version -sourceCompatibility = 11 -targetCompatibility = 11 - ext.excludeSailfish = { rcd -> rcd.excludeModule("com.exactpro.sf", "sailfish-core") rcd.excludeModule("com.exactpro.sf", "sailfish-common") @@ -82,75 +70,30 @@ repositories { } } -jar { - manifest { - attributes( - 'Created-By': "${System.getProperty('java.version')} (${System.getProperty('java.vendor')})", - 'Specification-Title': '', - 'Specification-Vendor': 'Exactpro Systems LLC', - 'Implementation-Title': project.archivesBaseName, - 'Implementation-Vendor': 'Exactpro Systems LLC', - 'Implementation-Vendor-Id': 'com.exactpro', - 'Implementation-Version': project.version - ) - } -} - dependencies { - api platform('com.exactpro.th2:bom:4.2.0') - - implementation "com.exactpro.th2:common:${commonVersion}" - implementation 'com.exactpro.th2:codec:5.2.0-new-proto-+' - - implementation ("com.exactpro.sf:sailfish-common:${sailfishVersion}") { - exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml' // because of the vulnerability - exclude group: 'com.exactpro.mina', module: 'apache-mina-core' // because of the vulnerability + implementation "com.exactpro.th2:common:$commonVersion" + implementation "com.exactpro.th2:codec:5.5.0-dev" + + implementation ("com.exactpro.sf:sailfish-common:$sailfishVersion") { + exclude group: "commons-configuration", module: "commons-configuration" // because of the vulnerability + exclude group: "com.fasterxml.jackson.dataformat", module: "jackson-dataformat-yaml" // because of the vulnerability + exclude group: "com.exactpro.mina", module: "apache-mina-core" // because of the vulnerability + exclude group: "javax.activation", module: "javax.activation-api" // because of the license } + implementation "io.netty:netty-buffer" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "io.github.oshai:kotlin-logging:5.1.4" - implementation 'io.netty:netty-buffer' - - implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" - implementation 'io.github.microutils:kotlin-logging' - - compileOnly 'com.google.auto.service:auto-service:1.0.1' - annotationProcessor 'com.google.auto.service:auto-service:1.0.1' - kapt 'com.google.auto.service:auto-service:1.0.1' + compileOnly "com.google.auto.service:auto-service:1.1.1" + annotationProcessor "com.google.auto.service:auto-service:1.1.1" + kapt "com.google.auto.service:auto-service:1.1.1" - testImplementation "org.junit.jupiter:junit-jupiter:5.9.2" - testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5:1.6.21' + testImplementation "org.junit.jupiter:junit-jupiter" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" + testImplementation "org.assertj:assertj-core:3.26.3" } -test { - useJUnitPlatform() -} - -application { - mainClassName 'com.exactpro.th2.codec.MainKt' -} - -applicationName = 'service' - -distTar { - archiveName "${applicationName}.tar" -} - -dockerPrepare { - dependsOn distTar -} - -docker { - copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) -} - -compileKotlin { - kotlinOptions { - jvmTarget = "11" - } -} - -compileTestKotlin { - kotlinOptions { - jvmTarget = "11" - } -} +test.useJUnitPlatform() +application.mainClass = "com.exactpro.th2.codec.MainKt" +dependencyCheck.suppressionFile = file('suppressions.xml') \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f2f1988..541b1e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ kotlin.code.style=official - -kotlin_version=1.6.21 -release_version=0.0.1 +kotlin_version=1.8.22 +release_version=0.1.0 vcs_url=https://github.com/th2-net/th2-codec-fix-ng \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 10c66bb..093df1d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon May 25 11:22:24 MSK 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME +zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 80709cd..a989c94 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'codec-fix-ng' +rootProject.name = 'codec-fix-ng' \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt index 207a4d7..8ecfe7f 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/ByteBufUtil.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. @@ -43,7 +43,7 @@ private fun ByteBuf.printInt(sourceValue: Int, digits: Int = sourceValue.getDigi ensureWritable(digits) repeat(digits) { index -> - setByte(digits - index - 1, value % 10 + DIGIT_0) + setByte(digits - index - 1 + writerIndex(), value % 10 + DIGIT_0) value /= 10 } @@ -73,10 +73,10 @@ fun ByteBuf.writeTag(tag: Int): ByteBuf { return printInt(tag).writeByte(SEP_BYTE.toInt()) } -fun ByteBuf.readValue(charset: Charset): String { +fun ByteBuf.readValue(charset: Charset, isDirty: Boolean): String { val offset = readerIndex() val length = bytesBefore(SOH_BYTE) - check(length > 0) { "No valid value at offset: $offset" } + check(isDirty || length > 0) { "No valid value at offset: $offset" } readerIndex(offset + length + 1) return toString(offset, length, charset) } @@ -88,19 +88,20 @@ fun ByteBuf.writeValue(value: String, charset: Charset): ByteBuf = apply { inline fun ByteBuf.forEachField( charset: Charset, + isDirty: Boolean, action: (tag: Int, value: String) -> Boolean, ) { while (isReadable) { val offset = readerIndex() - if (action(readTag(), readValue(charset))) continue + if (action(readTag(), readValue(charset, isDirty))) continue readerIndex(offset) break } } -inline fun ByteBuf.readField(tag: Int, charset: Charset, message: (Int) -> String): String = readTag().let { +inline fun ByteBuf.readField(tag: Int, charset: Charset, isDirty: Boolean, message: (Int) -> String): String = readTag().let { check(it == tag) { message(it) } - readValue(charset) + readValue(charset, isDirty) } fun ByteBuf.writeField(tag: Int, value: String, charset: Charset): ByteBuf = writeTag(tag).writeValue(value, charset) @@ -113,4 +114,4 @@ fun ByteBuf.writeChecksum() { while (isReadable) checksum += readByte() readerIndex(index) writeTag(10).printInt(checksum % 256, 3).writeByte(SOH_BYTE.toInt()) -} +} \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index fc7a878..846bbc0 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.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. @@ -16,31 +16,57 @@ package com.exactpro.th2.codec.fixng +import com.exactpro.sf.common.impl.messages.xml.configuration.JavaType import com.exactpro.sf.common.messages.structures.DictionaryConstants.FIELD_MESSAGE_TYPE +import com.exactpro.sf.common.messages.structures.IAttributeStructure import com.exactpro.sf.common.messages.structures.IDictionaryStructure import com.exactpro.sf.common.messages.structures.IFieldStructure import com.exactpro.sf.common.messages.structures.IMessageStructure import com.exactpro.sf.common.messages.structures.StructureUtils import com.exactpro.th2.codec.api.IPipelineCodec +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.MessageGroup import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.RawMessage import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled +import java.math.BigDecimal +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.format.DateTimeFormatter +import java.time.format.DateTimeFormatterBuilder +import java.time.format.DateTimeParseException +import java.time.temporal.ChronoField +import java.util.EnumMap import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.Message as CommonMessage -class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipelineCodec { +class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) : IPipelineCodec { private val beginString = settings.beginString private val charset = settings.charset + private val isDirtyMode = settings.dirtyMode - private val messagesByType = messages.associateBy(Message::type) - private val messagesByName = messages.associateBy(Message::name) + private val fieldsEncode = convertToFieldsByName(dictionary.fields, true) + private val fieldsDecode = convertToFieldsByTag(dictionary.fields) + private val messagesByTypeForDecode: Map + private val messagesByNameForEncode: Map - private val headerDef = messagesByName[HEADER] ?: error("Header is not defined in dictionary") - private val trailerDef = messagesByName[TRAILER] ?: error("Trailer is not defined in dictionary") + private val headerDef: Message + private val trailerDef: Message - override fun encode(messageGroup: MessageGroup): MessageGroup { + init { + val messagesForEncode = dictionary.toMessages(isForEncode = true) + val messagesForDecode = dictionary.toMessages(isForEncode = false) + messagesByNameForEncode = messagesForEncode.associateBy(Message::name) + messagesByTypeForDecode = messagesForDecode.associateBy(Message::type) + + val messagesByNameForDecode = messagesForDecode.associateBy(Message::name) + headerDef = messagesByNameForDecode[HEADER] ?: error("Header is not defined in dictionary") + trailerDef = messagesByNameForDecode[TRAILER] ?: error("Trailer is not defined in dictionary") + } + + override fun encode(messageGroup: MessageGroup, context: IReportingContext): MessageGroup { val messages = mutableListOf>() for (message in messageGroup.messages) { @@ -49,24 +75,27 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel continue } - val messageDef = messagesByName[message.type] ?: error("Unknown message name: ${message.type}") + val isDirty = isDirtyMode || (message.metadata[ENCODE_MODE_PROPERTY_NAME] == DIRTY_ENCODE_MODE) + val messageDef = messagesByNameForEncode[message.type] ?: error("Unknown message name: ${message.type}") val messageFields = message.body - val headerFields = messageFields.remove(HEADER) as? Map<*, *> ?: mapOf() - val trailerFields = messageFields.remove(TRAILER) as? Map<*, *> ?: mapOf() + @Suppress("UNCHECKED_CAST") + val headerFields = messageFields[HEADER] as? Map ?: mapOf() + @Suppress("UNCHECKED_CAST") + val trailerFields = messageFields[TRAILER] as? Map ?: mapOf() val body = Unpooled.buffer(1024) val prefix = Unpooled.buffer(32) - val buffer = Unpooled.wrappedBuffer(prefix, body) - prefix.writeField(8, beginString, charset) - body.writeField(35, messageDef.type, charset) + prefix.writeField(TAG_BEGIN_STRING, beginString, charset) + body.writeField(TAG_MSG_TYPE, messageDef.type, charset) - headerDef.encode(headerFields, body) - messageDef.encode(messageFields, body) - trailerDef.encode(trailerFields, body) + headerDef.encode(headerFields, body, isDirty, fieldsEncode, context) + messageDef.encode(messageFields, body, isDirty, fieldsEncode, context, FIELDS_NOT_IN_BODY) + trailerDef.encode(trailerFields, body, isDirty, fieldsEncode, context) - prefix.writeField(9, body.readableBytes(), charset) + prefix.writeField(TAG_BODY_LENGTH, body.readableBytes(), charset) + val buffer = Unpooled.wrappedBuffer(prefix, body) buffer.writeChecksum() messages += RawMessage( @@ -81,7 +110,7 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel return MessageGroup(messages) } - override fun decode(messageGroup: MessageGroup): MessageGroup { + override fun decode(messageGroup: MessageGroup, context: IReportingContext): MessageGroup { val messages = mutableListOf>() for (message in messageGroup.messages) { @@ -90,19 +119,24 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel continue } + val isDirty = isDirtyMode || (message.metadata[ENCODE_MODE_PROPERTY_NAME] == DIRTY_ENCODE_MODE) val buffer = message.body - val beginString = buffer.readField(8, charset) { "Message starts with $it tag instead of BeginString (8)" } - val bodyLength = buffer.readField(9, charset) { "BeginString (8) is followed by $it tag instead of BodyLength (9)" } - val msgType = buffer.readField(35, charset) { "BodyLength (9) is followed by $it tag instead of MsgType (35)" } + val beginString = buffer.readField(TAG_BEGIN_STRING, charset, isDirty) { "Message starts with $it tag instead of BeginString ($TAG_BEGIN_STRING)" } + val bodyLengthString = buffer.readField(TAG_BODY_LENGTH, charset, isDirty) { "BeginString ($TAG_BEGIN_STRING) is followed by $it tag instead of BodyLength ($TAG_BODY_LENGTH)" } + val bodyLength = bodyLengthString.toIntOrNull() ?: handleError(isDirty, context, "Wrong number value in integer field 'BodyLength'. Value: $bodyLengthString.", bodyLengthString) + val msgType = buffer.readField(TAG_MSG_TYPE, charset, isDirty) { "BodyLength ($TAG_BODY_LENGTH) is followed by $it tag instead of MsgType ($TAG_MSG_TYPE)" } + val messageDef = messagesByTypeForDecode[msgType] ?: error("Unknown message type: $msgType") - val messageDef = messagesByType[msgType] ?: error("Unknown message type: $msgType") + val header = headerDef.decode(buffer, messageDef, isDirty, fieldsDecode, context) + val body = messageDef.decode(buffer, messageDef, isDirty, fieldsDecode, context) + val trailer = trailerDef.decode(buffer, messageDef, isDirty, fieldsDecode, context) - val header = headerDef.decode(buffer) - val body = messageDef.decode(buffer) - val trailer = trailerDef.decode(buffer) - - if (buffer.isReadable) error("Tag appears out of order: ${buffer.readTag()}") + if (buffer.isReadable) { + // this should never happen in dirty mode + val errorMessage = if (isDirty) "Field was not processed in dirty mode. Tag: ${buffer.readTag()}" else "Tag appears out of order: ${buffer.readTag()}" + error(errorMessage) + } header["BeginString"] = beginString header["BodyLength"] = bodyLength @@ -124,57 +158,245 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel return MessageGroup(messages) } - private fun Field.decode(source: ByteBuf, target: MutableMap, value: String, tag: Int) { - val previous = when (this) { - is Primitive -> target.put(name, value) - is Group -> target.put(name, decode(source, value.toIntOrNull() ?: error("Invalid $name group counter ($tag) value: $value"))) - else -> error("Unsupported field type: $this") + private fun handleError(isDirty: Boolean, context: IReportingContext, errorMessageText: String, value: Any = Unit) = if (isDirty) { + context.warning(DIRTY_MODE_WARNING_PREFIX + errorMessageText) + value + } else { + error(errorMessageText) + } + + private fun Field.decode( + source: ByteBuf, + target: MutableMap, + value: String, + tag: Int, + isDirty: Boolean, + context: IReportingContext + ) { + val decodedValue: Any = when { + value.isEmpty() -> handleError(isDirty, context, "Empty value in the field '$name'.", value) + containsNonPrintableChars(value) -> handleError(isDirty, context, "Non printable characters in the field '$name'. Value: $value", value) + else -> when (this) { + is Primitive -> decode(value, isDirty, context) + is Group -> decode( + source, + value.toIntOrNull() ?: error("Invalid $name group counter ($tag) value: $value"), + isDirty, + context + ) + + else -> error("Unsupported field type: $this") + } + } + + // in dirty mode we'll use tag as field name if we have field duplication + val fieldName = if (isDirty && target.contains(name)) { + tag.toString() + } else { + name } + val previous = target.put(fieldName, decodedValue) + + // but even in dirty mode we can't write field if it's duplicated more than once + // because we use Map and it cant contain duplicates check(previous == null) { "Duplicate $name field ($tag) with value: $value (previous: $previous)" } } - private fun Message.decode(source: ByteBuf): MutableMap = mutableMapOf().also { map -> - source.forEachField(charset) { tag, value -> - val field = get(tag) ?: return@forEachField false - field.decode(source, map, value, tag) + private val prereadHeaderFields = arrayOf("BeginString", "BodyLength", "MsgType") + + private fun Message.decode(source: ByteBuf, bodyDef: Message, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext): MutableMap = mutableMapOf().also { map -> + source.forEachField(charset, isDirty) { tag, value -> + val field = get(tag) ?: if (isDirty) { + when (this) { + headerDef -> bodyDef[tag] ?: trailerDef[tag] + trailerDef -> null + else -> trailerDef[tag] + }?.let { return@forEachField false } // we reached next part of the message + + val dictField = dictionaryFields[tag] + if (dictField != null) { + context.warning(DIRTY_MODE_WARNING_PREFIX + "Unexpected field in message. Field name: ${dictField.name}. Field value: $value.") + dictField + } else { + context.warning(DIRTY_MODE_WARNING_PREFIX + "Field does not exist in dictionary. Field tag: $tag. Field value: $value.") + Primitive(false, tag.toString(), String::class.java, emptySet(), tag) + } + } else { + // we reached next part of the message + return@forEachField false + } + + field.decode(source, map, value, tag, isDirty, context) return@forEachField true } + + for (field in fields.values) { + if (field.isRequired && !map.contains(field.name) && field.name !in prereadHeaderFields) { + handleError(isDirty, context, "Required field missing. Field name: ${field.name}.") + } + } + } + + private fun Primitive.decode(value: String, isDirty: Boolean, context: IReportingContext): Any { + if (values.isNotEmpty() && !values.contains(value)) { + handleError(isDirty, context, "Invalid value in enum field $name. Actual: $value. Valid values $values.") + } + + return try { + when (primitiveType) { + java.lang.String::class.java -> value + java.lang.Character::class.java -> { + if (value.length != 1) { + handleError(isDirty, context, "Wrong value in character field '$name'. Value: $value", value) + } else { + value[0] + } + } + + java.lang.Integer::class.java -> value.toInt() + java.math.BigDecimal::class.java -> value.toBigDecimal() + java.lang.Long::class.java -> value.toLong() + java.lang.Short::class.java -> value.toShort() + java.lang.Byte::class.java -> value.toByte() + java.lang.Float::class.java -> value.toFloat() + java.lang.Double::class.java -> value.toDouble() + + java.time.LocalDateTime::class.java -> LocalDateTime.parse(value, dateTimeFormatter) + java.time.LocalDate::class.java -> LocalDate.parse(value, dateFormatter) + java.time.LocalTime::class.java -> LocalTime.parse(value, timeFormatter) + + java.lang.Boolean::class.java -> when (value) { + "Y" -> true + "N" -> false + else -> handleError(isDirty, context, "Wrong value in boolean field '$name'. Value: $value.", value) + } + + else -> error("Unsupported type: $primitiveType.") + } + } catch (e: NumberFormatException) { + handleError(isDirty, context, "Wrong number value in ${primitiveType.name} field '$name'. Value: $value.", value) + } catch (e: DateTimeParseException) { + handleError(isDirty, context, "Wrong date/time value in ${primitiveType.name} field '$name'. Value: $value.", value) + } } - private fun Group.decode(source: ByteBuf, count: Int): List> = ArrayList>().also { list -> + private fun Group.decode(source: ByteBuf, count: Int, isDirty: Boolean, context: IReportingContext): List> = ArrayList>().also { list -> var map: MutableMap? = null + val tags: MutableSet = hashSetOf() - source.forEachField(charset) { tag, value -> + source.forEachField(charset, isDirty) { tag, value -> val field = get(tag) ?: return@forEachField false - if (tag == delimiter) map = mutableMapOf().also(list::add) - val group = checkNotNull(map) { "Field ${field.name} ($tag) appears before delimiter ($delimiter)" } - field.decode(source, group, value, tag) + + val group = if (tag == delimiter || !tags.add(tag) || map == null) { + if (tag != delimiter) { + handleError(isDirty, context, "Field ${field.name} ($tag) appears before delimiter ($delimiter)") + } + + tags.clear() + mutableMapOf().also { + list.add(it) + map = it + } + } else { + map ?: error("Group entry map can't be null.") + } + + field.decode(source, group, value, tag, isDirty, context) return@forEachField true } - check(list.size == count) { "Unexpected group $name count: ${list.size} (expected: $count)" } - } - - private fun FieldMap.encode(source: Map<*, *>, target: ByteBuf) = fields.forEach { (name, field) -> - val value = source[name] ?: when { - field.isRequired -> error("Missing required field: $name") - else -> return@forEach + if (list.size != count) { + val errorText = "Unexpected group $name count: ${list.size} (expected: $count)" + handleError(isDirty, context, errorText) } + } + private fun encodeField(field: Field, value: Any, target: ByteBuf, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext) { when { - field is Primitive -> if (field.tag != 8 && field.tag != 9 && field.tag != 10 && field.tag != 35) target.writeField(field.tag, value, charset) - field is Group && value is List<*> -> field.encode(value, target) + field is Primitive -> { + if (!isCompatibleType(value.javaClass, field.primitiveType)) { + if (value is String) { + field.decode(value, isDirty, context) // validate if String value could be parsed to required type + target.writeField(field.tag, value, charset) + return + } else { + handleError(isDirty, context, "Wrong type value in field ${field.name}. Actual: ${value.javaClass} (value: $value). Expected ${field.primitiveType}") + } + } + + val stringValue = when (value) { + is java.lang.Boolean -> if (value.booleanValue()) "Y" else "N" + is LocalDateTime -> value.format(dateTimeFormatter) + is LocalDate -> value.format(dateFormatter) + is LocalTime -> value.format(timeFormatter) + else -> value.toString() + } + + when { + stringValue.isEmpty() -> handleError(isDirty, context, "Empty value in the field '${field.name}'.") + containsNonPrintableChars(stringValue) -> handleError(isDirty, context, "Non-printable characters in the field '${field.name}'. Value: $value") + field.values.isNotEmpty() && !field.values.contains(stringValue) -> handleError(isDirty, context, "Invalid value in enum field ${field.name}. Actual: $value. Valid values ${field.values}.") + } + + target.writeField(field.tag, stringValue, charset) + } + + field is Group && value is List<*> -> field.encode(value, target, isDirty, dictionaryFields, context) + field is Message && value is Map<*,*> -> { + @Suppress("UNCHECKED_CAST") + val messageValue = value as Map + field.encode(messageValue, target, isDirty, dictionaryFields, context) + } else -> error("Unsupported value in ${field.name} field: $value") } } - private fun Group.encode(source: List<*>, target: ByteBuf) { + private fun FieldMap.encode(source: Map, target: ByteBuf, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext, fieldsToSkip: Set = emptySet()) { + fields.forEach { (name, field) -> + if (field is Primitive && field.tag in calculatedFields) return@forEach + val value = source[name] + if (value != null) { + encodeField(field, value, target, isDirty, dictionaryFields, context) + } else if (field.isRequired && this !== headerDef) { + handleError(isDirty, context, "Required field missing. Field name: $name.") + } + } + + source.filter { fields[it.key] == null && it.key !in fieldsToSkip}.forEach { (fieldName, value) -> + if (!isDirty) { + error("Unexpected field in message. Field name: $fieldName. Field value: $value. Message body: $source") + } + + val field = dictionaryFields[fieldName] + + if (field != null) { + context.warning(DIRTY_MODE_WARNING_PREFIX + "Unexpected field in message. Field name: $fieldName. Field value: $value. Message body: $source") + encodeField(field, value ?: "", target, true, dictionaryFields, context) + } else { + val tag = fieldName.toIntOrNull() + if(tag != null && tag > 0) { + if (value is List<*>) { // TODO: do we need this check? + error("List value with unspecified name. tag = $tag") + } else { + context.warning(DIRTY_MODE_WARNING_PREFIX + "Tag instead of field name. Field name: $fieldName. Field value: $value. Message body: $source") + target.writeField(tag, value, charset) + } + } else { + error("Field does not exist in dictionary. Field name: $fieldName. Field value: $value. Message body: $source") + } + } + } + } + + private fun Group.encode(source: List<*>, target: ByteBuf, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext) { target.writeField(counter, source.size, charset) source.forEach { group -> check(group is Map<*, *>) { "Unsupported value in $name group: $group" } - encode(group, target) + @Suppress("UNCHECKED_CAST") + val groupMap = group as Map + encode(groupMap, target, isDirty, dictionaryFields, context) } } @@ -186,7 +408,9 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel data class Primitive( override val isRequired: Boolean, override val name: String, - val tag: Int, + val primitiveType: Class<*>, + val values: Set, + val tag: Int ) : Field abstract class FieldMap { @@ -225,6 +449,51 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel companion object { private const val HEADER = "header" private const val TRAILER = "trailer" + private val FIELDS_NOT_IN_BODY = setOf(HEADER, TRAILER) + private const val ENCODE_MODE_PROPERTY_NAME = "encode-mode" + private const val DIRTY_ENCODE_MODE = "dirty" + private const val TAG_BEGIN_STRING = 8 + private const val TAG_BODY_LENGTH = 9 + private const val TAG_CHECKSUM = 10 + private const val TAG_MSG_TYPE = 35 + private const val DIRTY_MODE_WARNING_PREFIX = "Dirty mode WARNING: " + + private fun containsNonPrintableChars(stringValue: String) = stringValue.any { it !in ' ' .. '~' } + private val calculatedFields = intArrayOf(TAG_BEGIN_STRING, TAG_BODY_LENGTH, TAG_MSG_TYPE, TAG_CHECKSUM) + + private val dateTimeFormatter = DateTimeFormatterBuilder() + .appendPattern("yyyyMMdd-HH:mm:ss") + .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true) + .toFormatter() + + private val dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd") + + private val timeFormatter = DateTimeFormatterBuilder() + .appendPattern("HH:mm:ss") + .appendFraction(ChronoField.MILLI_OF_SECOND, 0, 9, true) + .toFormatter() + + private val javaTypeToClass = EnumMap>(JavaType::class.java).apply { + for (type in JavaType.values()) { + put(type, Class.forName(type.value())) + } + withDefault { error("Unsupported java type: $it") } + } + + private val typeSizes = mapOf( + java.lang.Byte::class.java to 1, + 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 + ) + + private fun isCompatibleType(from: Class<*>, to: Class<*>): Boolean { + if (from == to) return true + val fromSize = typeSizes[from] ?: return false + val toSize = typeSizes[to] ?: return false + return fromSize < toSize + } private val IMessageStructure.entityType: String get() = StructureUtils.getAttributeValue(this, "entity_type") @@ -238,35 +507,55 @@ class FixNgCodec(messages: List, settings: FixNgCodecSettings) : IPipel private val IFieldStructure.tag: Int get() = StructureUtils.getAttributeValue(this, "tag") - private fun IFieldStructure.toPrimitive(): Primitive = Primitive(isRequired, name, tag) + private fun IFieldStructure.toPrimitive(): Primitive = Primitive( + isRequired, + name, + javaTypeToClass.getValue(javaType), + values.values.map { it.getCastValue().toString() }.toSet(), + tag + ) - private fun IMessageStructure.toFields(): Map = linkedMapOf().apply { + private fun convertToFieldsByName(fields: Map, isForEncode: Boolean): Map = linkedMapOf().apply { fields.forEach { (name, field) -> when { field !is IMessageStructure -> this[name] = field.toPrimitive() - field.isGroup -> this[name] = field.toGroup() - field.isComponent -> this += field.toFields() + field.isGroup -> this[name] = field.toGroup(isForEncode) + field.isComponent -> if (isForEncode) { + this[name] = field.toMessage(true) + } else { + this += convertToFieldsByName(field.fields, false) + } } } } - private fun IMessageStructure.toMessage(): Message = Message( + private fun convertToFieldsByTag(fields: Map): Map = linkedMapOf().apply { + fields.values.forEach { field -> + when { + field !is IMessageStructure -> this[field.tag] = field.toPrimitive() + field.isGroup -> this[field.tag] = field.toGroup(false) + field.isComponent -> this += convertToFieldsByTag(field.fields) + } + } + } + + private fun IMessageStructure.toMessage(isForEncode: Boolean): Message = Message( name = name, type = StructureUtils.getAttributeValue(this, FIELD_MESSAGE_TYPE) ?: name, - fields = toFields(), + fields = convertToFieldsByName(this.fields, isForEncode), isRequired = isRequired ) - private fun IMessageStructure.toGroup(): Group = Group( + private fun IMessageStructure.toGroup(isForEncode: Boolean): Group = Group( name = name, counter = tag, delimiter = fields.values.first().tag, - fields = toFields(), - isRequired = isRequired, + fields = convertToFieldsByName(this.fields, isForEncode), + isRequired = isRequired ) - fun IDictionaryStructure.toMessages(): List = messages.values + fun IDictionaryStructure.toMessages(isForEncode: Boolean): List = messages.values .filterNot { it.isGroup || it.isComponent } - .map { it.toMessage() } + .map { it.toMessage(isForEncode) } } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt index 5dc29b4..c1a5c76 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecFactory.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,14 +21,14 @@ import com.exactpro.th2.codec.api.IPipelineCodec import com.exactpro.th2.codec.api.IPipelineCodecContext import com.exactpro.th2.codec.api.IPipelineCodecFactory import com.exactpro.th2.codec.api.IPipelineCodecSettings -import com.exactpro.th2.codec.fixng.FixNgCodec.Companion.toMessages import com.google.auto.service.AutoService @AutoService(IPipelineCodecFactory::class) class FixNgCodecFactory : IPipelineCodecFactory { private lateinit var context: IPipelineCodecContext + override val protocols: Set + get() = PROTOCOLS - @Deprecated("Please migrate to the protocols property") override val protocol: String = PROTOCOL override val settingsClass: Class = FixNgCodecSettings::class.java override fun init(pipelineCodecContext: IPipelineCodecContext) { @@ -41,7 +41,7 @@ class FixNgCodecFactory : IPipelineCodecFactory { "settings is not an instance of ${FixNgCodecSettings::class.java}: ${settings?.let { it::class.java }}" } return FixNgCodec( - context[codecSettings.dictionary].use(XmlDictionaryStructureLoader()::load).toMessages(), + context[codecSettings.dictionary].use(XmlDictionaryStructureLoader()::load), requireNotNull(codecSettings as? FixNgCodecSettings) { "settings is not an instance of ${FixNgCodecSettings::class.java}: $codecSettings" } @@ -50,5 +50,6 @@ class FixNgCodecFactory : IPipelineCodecFactory { companion object { const val PROTOCOL = "fix" + private val PROTOCOLS = setOf(PROTOCOL) } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt index da96b98..40f3138 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.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. @@ -20,7 +20,8 @@ import com.exactpro.th2.codec.api.IPipelineCodecSettings import java.nio.charset.Charset data class FixNgCodecSettings( - val beginString: String = "FIXT1.1", + val beginString: String = "FIXT.1.1", val dictionary: String, val charset: Charset = Charsets.US_ASCII, + val dirtyMode: Boolean = false ) : IPipelineCodecSettings diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt index b600de9..19e2f41 100644 --- a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.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. @@ -13,55 +13,427 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + 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.th2.codec.fixng.FixNgCodec.Companion.toMessages -import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup -import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage +import com.exactpro.th2.codec.api.IReportingContext import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.RawMessage +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageId +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.EventId +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.Direction +import com.exactpro.th2.codec.fixng.FixNgCodecFactory.Companion.PROTOCOL +import io.netty.buffer.CompositeByteBuf import io.netty.buffer.Unpooled +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows -import kotlin.test.assertEquals -import kotlin.test.assertTrue - +import java.math.BigDecimal +import java.nio.charset.StandardCharsets +import java.time.Instant +import java.time.LocalDateTime class FixNgCodecTest { + private val dictionary: IDictionaryStructure = FixNgCodecTest::class.java.classLoader + .getResourceAsStream("dictionary.xml") + .use(XmlDictionaryStructureLoader()::load) - private val dictionary: IDictionaryStructure = - FixNgCodecTest::class.java.classLoader.getResourceAsStream("dictionary.xml") - .use(XmlDictionaryStructureLoader()::load) - private val codec = FixNgCodec(dictionary.toMessages(), FixNgCodecSettings(dictionary = "")) - @Test - fun `simple test decode encode`() { - listOf( - RawMessage(body = Unpooled.wrappedBuffer("8=FIXT.1.1\u00019=156\u000135=8\u000134=10947\u000149=SENDER\u000152=20230419-10:36:07.415088\u000156=RECEIVER\u00011=test\u000111=zSuNbrBIZyVljs\u000138=500\u000139=0\u000140=A\u000141=zSuNbrBIZyVljs\u000144=1000\u000147=500\u000154=B\u000155=ABC\u000159=M\u000110=012\u0001".toByteArray())), - RawMessage(body = Unpooled.wrappedBuffer("8=FIXT.1.1\u00019=133\u000135=D\u000134=11005\u000149=SENDER\u000152=20230419-10:36:07.415088\u000156=RECEIVER\u00011=test\u000111=UsVpSVQIcuqjQe\u000138=500\u000140=A\u000144=1000\u000147=500\u000154=B\u000155=ABC\u000159=M\u000110=000\u0001".toByteArray())), - ).forEach { source -> - codec.decode(MessageGroup(mutableListOf(source))).also { group -> - assertEquals(1, group.messages.size) - }.messages.first().also { decoded -> - assertTrue(decoded is ParsedMessage) -// TODO: uncomment when encode will be done -// codec.encode(MessageGroup(mutableListOf(decoded))).also { group -> -// assertEquals(1, group.messages.size) -// }.messages.first().also { encoded -> -// assertTrue(encoded is RawMessage) -// assertEquals(source, encoded) -// } - } + private val codec = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) + + private val reportingContext = object : IReportingContext { + private val _warnings: MutableList = ArrayList() + + val warnings: List + get() = _warnings + + override fun warning(message: String) { + _warnings.add(message) } + + override fun warnings(messages: Iterable) { + _warnings.addAll(messages) + } + } + + @Test + fun `simple encode`() = encodeTest(MSG_CORRECT) + + @Test + fun `simple decode`() = decodeTest(MSG_CORRECT) + + @Test + fun `simple decode with no body`() = decodeTest(MSG_CORRECT_WITHOUT_BODY, expectedMessage = expectedMessageWithoutBody) + + @Test + fun `encode with addition field that exists in dictionary`() { + parsedBody["CFICode"] = "12345" + encodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.") + } + + @Test + fun `decode with addition field that exists in dictionary`() { + expectedParsedBody["CFICode"] = "12345" + decodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.") + } + + @Test + fun `encode with addition field that does not exists in dictionary`() { + parsedBody["UNKNOWN_FIELD"] = "test_value" + assertThatThrownBy { codec.encode(MessageGroup(listOf(parsedMessage)), reportingContext) } + .isInstanceOf(IllegalStateException::class.java) + .message() + .startsWith("Field does not exist in dictionary. Field name: UNKNOWN_FIELD. Field value: test_value.") + } + + @Test + fun `decode with addition field that does not exists in dictionary`() { + expectedParsedBody["9999"] = "54321" + decodeTest(MSG_ADDITIONAL_FIELD_NO_DICT, "Field does not exist in dictionary. Field tag: 9999. Field value: 54321.") + } + + @Test + fun `encode with addition field that contain tag instead of name`() { + parsedBody["9999"] = "12345" // field doesn't exist in dictionary + encodeTest(MSG_ADDITIONAL_FIELD_TAG, "Tag instead of field name. Field name: 9999. Field value: 12345.") + } + + @Test + fun `encode with required field removed`() { + parsedBody.remove("ExecID") + encodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required field missing. Field name: ExecID.") + } + + @Test + fun `decode with required field removed`() { + expectedParsedBody.remove("ExecID") + decodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required field missing. Field name: ExecID.") + } + + @Test + fun `encode with required delimiter field in group removed in first entry`() { + @Suppress("UNCHECKED_CAST") + ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[0].remove("PartyID") + encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Required field missing. Field name: PartyID.") + } + + @Test + fun `decode with required delimiter field in group removed in first entry`() { + @Suppress("UNCHECKED_CAST") + (expectedParsedBody["NoPartyIDs"] as MutableList>)[0].remove("PartyID") + decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)") + } + + @Test + fun `encode with required delimiter field in group removed in second entry`() { + @Suppress("UNCHECKED_CAST") + ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[1].remove("PartyID") + encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Required field missing. Field name: PartyID.") + } + + @Test + fun `decode with required delimiter field in group removed in second entry`() { + @Suppress("UNCHECKED_CAST") + (expectedParsedBody["NoPartyIDs"] as MutableList>)[1].remove("PartyID") + decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)") + } + + @Test + fun `encode with wrong enum value`() { + parsedBody["ExecType"] = 'X' + encodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.") + } + + @Test + fun `decode with wrong enum value`() { + expectedParsedBody["ExecType"] = 'X' + decodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.") + } + + @Test + fun `encode with correct enum value as string`() { + parsedBody["ExecType"] = "0" + encodeTest(MSG_CORRECT) } @Test - fun `tag appears out of order`() { - val tag = 999 - assertThrows { - codec.decode(MessageGroup(mutableListOf(RawMessage(body = Unpooled.wrappedBuffer("8=FIXT.1.1\u00019=156\u000135=8\u000134=10947\u000149=SENDER\u000152=20230419-10:36:07.415088\u000156=RECEIVER\u0001$tag=500\u000110=012\u0001".toByteArray()))))) - }.also { ex -> - assertEquals("Tag appears out of order: $tag", ex.message) + fun `encode with wrong value type`() { + parsedBody["LeavesQty"] = "Five" // String instead of BigDecimal + encodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.") + } + + @Test + fun `encode with correct BigDecimal value in string`() { + parsedBody["LeavesQty"] = "500" // String instead of BigDecimal + encodeTest(MSG_CORRECT) + } + + @Test + fun `decode with wrong value type`() { + expectedParsedBody["LeavesQty"] = "Five" + decodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.") + } + + @Test + fun `encode with empty value`() { + parsedBody["Account"] = "" + encodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.") + } + + @Test + fun `decode with empty value`() { + expectedParsedBody["Account"] = "" + decodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.") + } + + @Test + fun `encode with non printable characters`() { + parsedBody["Account"] = "test\taccount" + encodeTest(MSG_NON_PRINTABLE, "Non-printable characters in the field 'Account'. Value: test\taccount") + } + + @Test + fun `decode with non printable characters`() { + expectedParsedBody["Account"] = "test\taccount" + decodeTest(MSG_NON_PRINTABLE, "Non printable characters in the field 'Account'.") + } + + @Test + fun `encode with calculated required fields removed`() { + @Suppress("UNCHECKED_CAST") + val header = parsedBody["header"] as MutableMap + header.remove("BeginString") + header.remove("BodyLength") + header.remove("MsgType") + @Suppress("UNCHECKED_CAST") + (parsedBody["trailer"] as MutableMap).remove("CheckSum") + encodeTest(MSG_CORRECT) + } + + @Test + fun `encode with calculated required header fields removed`() { + @Suppress("UNCHECKED_CAST") + val header = parsedBody["header"] as MutableMap + header.remove("SenderCompID") + header.remove("TargetCompID") + header.remove("MsgSeqNum") + header.remove("SendingTime") + encodeTest(MSG_REQUIRED_HEADER_REMOVED) + } + + @Test + fun `tag appears out of order`() = + decodeTest(MSG_TAG_OUT_OF_ORDER, "Tag appears out of order: 999", dirtyMode = false) + + private fun encodeTest( + expectedRawMessage: String, + expectedWarning: String? = null + ) { + val encoded = codec.encode(MessageGroup(listOf(parsedMessage)), reportingContext) + val body = encoded.messages.single().body as CompositeByteBuf + val fixMsg = body.toString(StandardCharsets.US_ASCII) + assertThat(fixMsg).isEqualTo(expectedRawMessage) + if (expectedWarning == null) { + assertThat(reportingContext.warnings).isEmpty() + } else { + assertThat(reportingContext.warnings.single()).startsWith(DIRTY_MODE_WARNING_PREFIX + expectedWarning) + } + } + + private fun decodeTest( + rawMessageString: String, + expectedErrorText: String? = null, + expectedMessage: ParsedMessage = expectedParsedMessage, + dirtyMode: Boolean = true + ) { + val expectedBody = expectedMessage.body + val rawMessage = RawMessage( + id = parsedMessage.id, + eventId = parsedMessage.eventId, + metadata = if (dirtyMode) mapOf("encode-mode" to "dirty") else emptyMap(), + body = Unpooled.wrappedBuffer(rawMessageString.toByteArray(Charsets.US_ASCII)) + ) + + val decodedGroup = try { + codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) + } catch (e: IllegalStateException) { + if (dirtyMode) { + throw e + } else { + assertThat(e.message).startsWith(expectedErrorText) + return + } } + + val parsedMessage = decodedGroup.messages.single() as ParsedMessage + + // we don't validate CheckSum and BodyLength for incorrect messages + val fieldsToIgnore = if (expectedErrorText == null) emptyArray() else arrayOf("trailer.CheckSum", "header.BodyLength") + + assertThat(parsedMessage.body) + .usingRecursiveComparison() + .ignoringFields(*fieldsToIgnore) + .isEqualTo(expectedBody) + + if (expectedErrorText == null) { + assertThat(reportingContext.warnings).isEmpty() + } else { + assertThat(reportingContext.warnings.single()).startsWith(DIRTY_MODE_WARNING_PREFIX + expectedErrorText) + } + } + + private val parsedMessage = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "ExecutionReport", + mutableMapOf("encode-mode" to "dirty"), + PROTOCOL, + mutableMapOf( + "header" to mutableMapOf( + "MsgSeqNum" to 10947, + "SenderCompID" to "SENDER", + "SendingTime" to LocalDateTime.parse("2023-04-19T10:36:07.415088"), + "TargetCompID" to "RECEIVER", + "BeginString" to "FIXT.1.1", + "BodyLength" to 295, + "MsgType" to "8" + ), + "ExecID" to "495504662", + "ClOrdID" to "zSuNbrBIZyVljs", + "OrigClOrdID" to "zSuNbrBIZyVljs", + "OrderID" to "49415882", + "ExecType" to '0', + "OrdStatus" to '0', + "LeavesQty" to 500, + "CumQty" to BigDecimal(500), + "SecurityID" to "NWDR", + "SecurityIDSource" to "8", + "TradingParty" to mutableMapOf( + "NoPartyIDs" to mutableListOf( + mutableMapOf( + "PartyID" to "NGALL1FX01", + "PartyIDSource" to 'D', + "PartyRole" to 76 + ), + mutableMapOf( + "PartyID" to "0", + "PartyIDSource" to 'P', + "PartyRole" to 3 + ) + ) + ), + "Account" to "test", + "OrdType" to 'A', + "TimeInForce" to '0', + "Side" to 'B', + "Symbol" to "ABC", + "OrderQty" to 500, + "Price" to 1000, + "Unknown" to "500", + "TransactTime" to LocalDateTime.parse("2018-02-05T10:38:08.000008"), + "trailer" to mutableMapOf( + "CheckSum" to "191" + ) + ) + ) + + private val parsedBody: MutableMap = parsedMessage.body as MutableMap + + private val expectedParsedMessage = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "ExecutionReport", + mutableMapOf("encode-mode" to "dirty"), + PROTOCOL, + mutableMapOf( + "header" to mapOf( + "MsgSeqNum" to 10947, + "SenderCompID" to "SENDER", + "SendingTime" to LocalDateTime.parse("2023-04-19T10:36:07.415088"), + "TargetCompID" to "RECEIVER", + "BeginString" to "FIXT.1.1", + "BodyLength" to 295, + "MsgType" to "8" + ), + "ExecID" to "495504662", + "ClOrdID" to "zSuNbrBIZyVljs", + "OrigClOrdID" to "zSuNbrBIZyVljs", + "OrderID" to "49415882", + "ExecType" to '0', + "OrdStatus" to '0', + "LeavesQty" to BigDecimal(500), + "CumQty" to BigDecimal(500), + "SecurityID" to "NWDR", + "SecurityIDSource" to "8", + "NoPartyIDs" to listOf( + mapOf( + "PartyID" to "NGALL1FX01", + "PartyIDSource" to 'D', + "PartyRole" to 76 + ), + mapOf( + "PartyID" to "0", + "PartyIDSource" to 'P', + "PartyRole" to 3 + ) + ), + "Account" to "test", + "OrdType" to 'A', + "TimeInForce" to '0', + "Side" to 'B', + "Symbol" to "ABC", + "OrderQty" to BigDecimal(500), + "Price" to BigDecimal(1000), + "Unknown" to "500", + "TransactTime" to LocalDateTime.parse("2018-02-05T10:38:08.000008"), + "trailer" to mapOf( + "CheckSum" to "191" + ) + ) + ) + + private val expectedParsedBody: MutableMap = expectedParsedMessage.body as MutableMap + + private val expectedMessageWithoutBody = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "ExecutionReport", + mutableMapOf("encode-mode" to "dirty"), + PROTOCOL, + mutableMapOf( + "header" to mapOf( + "MsgSeqNum" to 125, + "SenderCompID" to "MZHOT0", + "SendingTime" to LocalDateTime.parse("2024-08-01T08:03:01.229"), + "TargetCompID" to "INET", + "BeginString" to "FIX.4.2", + "BodyLength" to 55, + "MsgType" to "0" + ), + "trailer" to mapOf( + "CheckSum" to "039" + ) + ) + ) + + companion object { + private const val DIRTY_MODE_WARNING_PREFIX = "Dirty mode WARNING: " + + private const val MSG_CORRECT = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=191\u0001" + private const val MSG_CORRECT_WITHOUT_BODY = "8=FIX.4.2\u00019=55\u000135=0\u000134=125\u000149=MZHOT0\u000152=20240801-08:03:01.229\u000156=INET\u000110=039\u0001" + private const val MSG_ADDITIONAL_FIELD_DICT = "8=FIXT.1.1\u00019=305\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u0001461=12345\u000110=143\u0001" + private const val MSG_ADDITIONAL_FIELD_NO_DICT = "8=FIXT.1.1\u00019=305\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u00019999=54321\u000110=097\u0001" + private const val MSG_ADDITIONAL_FIELD_TAG = "8=FIXT.1.1\u00019=306\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u00019999=12345\u000110=217\u0001" + private const val MSG_REQUIRED_FIELD_REMOVED = "8=FIXT.1.1\u00019=282\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=060\u0001" + private const val MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY = "8=FIXT.1.1\u00019=280\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=061\u0001" + private const val MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY = "8=FIXT.1.1\u00019=289\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=180\u0001" + private const val MSG_WRONG_ENUM = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=X\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=231\u0001" + private const val MSG_WRONG_TYPE = "8=FIXT.1.1\u00019=296\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=Five\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=181\u0001" + private const val MSG_EMPTY_VAL = "8=FIXT.1.1\u00019=291\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=251\u0001" + private const val MSG_NON_PRINTABLE = "8=FIXT.1.1\u00019=303\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\taccount\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=171\u0001" + private const val MSG_REQUIRED_HEADER_REMOVED = "8=FIXT.1.1\u00019=236\u000135=8\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=050\u0001" + private const val MSG_TAG_OUT_OF_ORDER = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=000\u0001999=500\u0001" } } \ No newline at end of file diff --git a/suppressions.xml b/suppressions.xml new file mode 100644 index 0000000..0c032ab --- /dev/null +++ b/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + ^pkg:maven/com\.exactpro\.th2/grpc-.*@.*$ + cpe:/a:grpc:grpc + + \ No newline at end of file From 38858825a91197c55fa64644ca3e07055d5ea13c Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:29:53 +0400 Subject: [PATCH 05/15] fixed nested reading nested structures in dictionary --- src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index 846bbc0..db57e31 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -546,10 +546,14 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) isRequired = isRequired ) + private fun getFirstTag(message: IMessageStructure): Int = message.fields.values.first().let { + if (it is IMessageStructure) getFirstTag(it) else it.tag + } + private fun IMessageStructure.toGroup(isForEncode: Boolean): Group = Group( name = name, counter = tag, - delimiter = fields.values.first().tag, + delimiter = getFirstTag(this), fields = convertToFieldsByName(this.fields, isForEncode), isRequired = isRequired ) From 0c18b2f19cfc93d509869ec634f1a98c005806db Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:56:59 +0400 Subject: [PATCH 06/15] [Th2-5227] `decodeValuesAsString` settings option (#3) --- .../exactpro/th2/codec/fixng/FixNgCodec.kt | 7 +++- .../th2/codec/fixng/FixNgCodecSettings.kt | 5 ++- .../th2/codec/fixng/FixNgCodecTest.kt | 41 +++++++++++++++++-- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index db57e31..9929dc5 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -46,6 +46,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) private val beginString = settings.beginString private val charset = settings.charset private val isDirtyMode = settings.dirtyMode + private val isDecodeToStrings = settings.decodeValuesToStrings private val fieldsEncode = convertToFieldsByName(dictionary.fields, true) private val fieldsDecode = convertToFieldsByTag(dictionary.fields) @@ -139,7 +140,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) } header["BeginString"] = beginString - header["BodyLength"] = bodyLength + header["BodyLength"] = if (isDecodeToStrings) bodyLengthString else bodyLength header["MsgType"] = msgType body[HEADER] = header @@ -243,7 +244,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) handleError(isDirty, context, "Invalid value in enum field $name. Actual: $value. Valid values $values.") } - return try { + val decodedValue = try { when (primitiveType) { java.lang.String::class.java -> value java.lang.Character::class.java -> { @@ -279,6 +280,8 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) } catch (e: DateTimeParseException) { handleError(isDirty, context, "Wrong date/time value in ${primitiveType.name} field '$name'. Value: $value.", value) } + + return if (isDecodeToStrings) value else decodedValue } private fun Group.decode(source: ByteBuf, count: Int, isDirty: Boolean, context: IReportingContext): List> = ArrayList>().also { list -> diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt index 40f3138..52f1825 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt @@ -23,5 +23,6 @@ data class FixNgCodecSettings( val beginString: String = "FIXT.1.1", val dictionary: String, val charset: Charset = Charsets.US_ASCII, - val dirtyMode: Boolean = false -) : IPipelineCodecSettings + val dirtyMode: Boolean = false, + val decodeValuesToStrings: Boolean = true, +) : IPipelineCodecSettings \ No newline at end of file diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt index 19e2f41..d69346c 100644 --- a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt @@ -34,14 +34,19 @@ import org.junit.jupiter.api.Test import java.math.BigDecimal import java.nio.charset.StandardCharsets import java.time.Instant +import java.time.LocalDate import java.time.LocalDateTime +import java.time.LocalTime +import java.time.format.DateTimeFormatter +import java.time.format.DateTimeFormatterBuilder +import java.time.temporal.ChronoField class FixNgCodecTest { private val dictionary: IDictionaryStructure = FixNgCodecTest::class.java.classLoader .getResourceAsStream("dictionary.xml") .use(XmlDictionaryStructureLoader()::load) - private val codec = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) + private val codec = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "", decodeValuesToStrings = false)) private val reportingContext = object : IReportingContext { private val _warnings: MutableList = ArrayList() @@ -64,6 +69,9 @@ class FixNgCodecTest { @Test fun `simple decode`() = decodeTest(MSG_CORRECT) + @Test + fun `simple decode to string values`() = decodeTest(MSG_CORRECT, stringValues = true) + @Test fun `simple decode with no body`() = decodeTest(MSG_CORRECT_WITHOUT_BODY, expectedMessage = expectedMessageWithoutBody) @@ -246,7 +254,8 @@ class FixNgCodecTest { rawMessageString: String, expectedErrorText: String? = null, expectedMessage: ParsedMessage = expectedParsedMessage, - dirtyMode: Boolean = true + dirtyMode: Boolean = true, + stringValues: Boolean = false ) { val expectedBody = expectedMessage.body val rawMessage = RawMessage( @@ -257,6 +266,7 @@ class FixNgCodecTest { ) val decodedGroup = try { + val codec = if (stringValues) FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) else this.codec codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) } catch (e: IllegalStateException) { if (dirtyMode) { @@ -269,13 +279,14 @@ class FixNgCodecTest { val parsedMessage = decodedGroup.messages.single() as ParsedMessage - // we don't validate CheckSum and BodyLength for incorrect messages + // we don't validate `CheckSum` and `BodyLength` in incorrect messages val fieldsToIgnore = if (expectedErrorText == null) emptyArray() else arrayOf("trailer.CheckSum", "header.BodyLength") + val expected = if (stringValues) convertValuesToString(expectedBody) else expectedBody assertThat(parsedMessage.body) .usingRecursiveComparison() .ignoringFields(*fieldsToIgnore) - .isEqualTo(expectedBody) + .isEqualTo(expected) if (expectedErrorText == null) { assertThat(reportingContext.warnings).isEmpty() @@ -284,6 +295,16 @@ class FixNgCodecTest { } } + private fun convertValuesToString(value: Any?): Any = when (value) { + is Map<*, *> -> value.mapValues { convertValuesToString(it.value) } + is List<*> -> value.map(::convertValuesToString) + is java.lang.Boolean -> if (value.booleanValue()) "Y" else "N" + is LocalDateTime -> value.format(dateTimeFormatter) + is LocalDate -> value.format(dateFormatter) + is LocalTime -> value.format(timeFormatter) + else -> value.toString() + } + private val parsedMessage = ParsedMessage( MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), EventId("test_id", "test_book", "test_scope", Instant.now()), @@ -435,5 +456,17 @@ class FixNgCodecTest { private const val MSG_NON_PRINTABLE = "8=FIXT.1.1\u00019=303\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\taccount\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=171\u0001" private const val MSG_REQUIRED_HEADER_REMOVED = "8=FIXT.1.1\u00019=236\u000135=8\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=050\u0001" private const val MSG_TAG_OUT_OF_ORDER = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=000\u0001999=500\u0001" + + private val dateTimeFormatter = DateTimeFormatterBuilder() + .appendPattern("yyyyMMdd-HH:mm:ss") + .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true) + .toFormatter() + + private val dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd") + + private val timeFormatter = DateTimeFormatterBuilder() + .appendPattern("HH:mm:ss") + .appendFraction(ChronoField.MILLI_OF_SECOND, 0, 9, true) + .toFormatter() } } \ No newline at end of file From bbcd8acf3316b3b840bbe350e9f56fb14b022f53 Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Thu, 15 Aug 2024 11:15:52 +0400 Subject: [PATCH 07/15] getFirstTag() method fixed --- src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index 9929dc5..6a16557 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -550,7 +550,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) ) private fun getFirstTag(message: IMessageStructure): Int = message.fields.values.first().let { - if (it is IMessageStructure) getFirstTag(it) else it.tag + if (it is IMessageStructure && it.isComponent) getFirstTag(it) else it.tag } private fun IMessageStructure.toGroup(isForEncode: Boolean): Group = Group( From 039e841af85c7a52223351696f8b40a8203f0e4f Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:04:47 +0400 Subject: [PATCH 08/15] Date/Time/Boolean values in parsed messages in "string mode" fixed --- .../exactpro/th2/codec/fixng/FixNgCodec.kt | 58 ++++++++++++++----- .../th2/codec/fixng/FixNgCodecTest.kt | 45 ++++++-------- 2 files changed, 59 insertions(+), 44 deletions(-) diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index 6a16557..581085a 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -81,9 +81,9 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) val messageFields = message.body @Suppress("UNCHECKED_CAST") - val headerFields = messageFields[HEADER] as? Map ?: mapOf() + val headerFields = messageFields[HEADER] as? Map ?: mapOf() @Suppress("UNCHECKED_CAST") - val trailerFields = messageFields[TRAILER] as? Map ?: mapOf() + val trailerFields = messageFields[TRAILER] as? Map ?: mapOf() val body = Unpooled.buffer(1024) val prefix = Unpooled.buffer(32) @@ -281,7 +281,15 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) handleError(isDirty, context, "Wrong date/time value in ${primitiveType.name} field '$name'. Value: $value.", value) } - return if (isDecodeToStrings) value else decodedValue + return if (isDecodeToStrings) { + if (primitiveType == java.time.LocalDateTime::class.java || primitiveType == java.time.LocalDate::class.java || primitiveType == java.time.LocalTime::class.java || primitiveType == java.lang.Boolean::class.java) { + decodedValue.toString() + } else { + value + } + } else { + decodedValue + } } private fun Group.decode(source: ByteBuf, count: Int, isDirty: Boolean, context: IReportingContext): List> = ArrayList>().also { list -> @@ -318,22 +326,40 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) private fun encodeField(field: Field, value: Any, target: ByteBuf, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext) { when { field is Primitive -> { - if (!isCompatibleType(value.javaClass, field.primitiveType)) { - if (value is String) { - field.decode(value, isDirty, context) // validate if String value could be parsed to required type - target.writeField(field.tag, value, charset) - return - } else { - handleError(isDirty, context, "Wrong type value in field ${field.name}. Actual: ${value.javaClass} (value: $value). Expected ${field.primitiveType}") + val valueToEncode = when { + isCompatibleType(value.javaClass, field.primitiveType) -> value + value is String -> { + try { + when (field.primitiveType) { + LocalDateTime::class.java -> LocalDateTime.parse(value) + LocalDate::class.java -> LocalDate.parse(value) + LocalTime::class.java -> LocalTime.parse(value) + java.lang.Boolean::class.java -> when { + value.equals("true", true) -> true + value.equals("false", true) -> false + 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 + field.decode(value, isDirty, context) // validate if String value could be parsed to required type + target.writeField(field.tag, value, charset) + return + } + } + } catch (e: DateTimeParseException) { + 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}") } - val stringValue = when (value) { - is java.lang.Boolean -> if (value.booleanValue()) "Y" else "N" - is LocalDateTime -> value.format(dateTimeFormatter) - is LocalDate -> value.format(dateFormatter) - is LocalTime -> value.format(timeFormatter) - else -> value.toString() + val stringValue = when (valueToEncode) { + is LocalDateTime -> valueToEncode.format(dateTimeFormatter) + is LocalDate -> valueToEncode.format(dateFormatter) + is LocalTime -> valueToEncode.format(timeFormatter) + is java.lang.Boolean -> if (valueToEncode.booleanValue()) "Y" else "N" + else -> valueToEncode.toString() } when { diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt index d69346c..382613a 100644 --- a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt @@ -34,12 +34,7 @@ import org.junit.jupiter.api.Test import java.math.BigDecimal import java.nio.charset.StandardCharsets import java.time.Instant -import java.time.LocalDate import java.time.LocalDateTime -import java.time.LocalTime -import java.time.format.DateTimeFormatter -import java.time.format.DateTimeFormatterBuilder -import java.time.temporal.ChronoField class FixNgCodecTest { private val dictionary: IDictionaryStructure = FixNgCodecTest::class.java.classLoader @@ -66,11 +61,14 @@ class FixNgCodecTest { @Test fun `simple encode`() = encodeTest(MSG_CORRECT) + @Test + fun `simple encode from string values`() = encodeTest(MSG_CORRECT, encodeFromStringValues = true) + @Test fun `simple decode`() = decodeTest(MSG_CORRECT) @Test - fun `simple decode to string values`() = decodeTest(MSG_CORRECT, stringValues = true) + fun `simple decode to string values`() = decodeTest(MSG_CORRECT, decodeToStringValues = true) @Test fun `simple decode with no body`() = decodeTest(MSG_CORRECT_WITHOUT_BODY, expectedMessage = expectedMessageWithoutBody) @@ -123,7 +121,7 @@ class FixNgCodecTest { @Test fun `encode with required delimiter field in group removed in first entry`() { @Suppress("UNCHECKED_CAST") - ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[0].remove("PartyID") + ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[0].remove("PartyID") encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Required field missing. Field name: PartyID.") } @@ -137,7 +135,7 @@ class FixNgCodecTest { @Test fun `encode with required delimiter field in group removed in second entry`() { @Suppress("UNCHECKED_CAST") - ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[1].remove("PartyID") + ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[1].remove("PartyID") encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Required field missing. Field name: PartyID.") } @@ -237,8 +235,15 @@ class FixNgCodecTest { private fun encodeTest( expectedRawMessage: String, - expectedWarning: String? = null + expectedWarning: String? = null, + encodeFromStringValues: Boolean = false ) { + if (encodeFromStringValues) { + @Suppress("UNCHECKED_CAST") + val stringBody = convertValuesToString(parsedBody) as Map + parsedBody.putAll(stringBody) + } + val encoded = codec.encode(MessageGroup(listOf(parsedMessage)), reportingContext) val body = encoded.messages.single().body as CompositeByteBuf val fixMsg = body.toString(StandardCharsets.US_ASCII) @@ -255,7 +260,7 @@ class FixNgCodecTest { expectedErrorText: String? = null, expectedMessage: ParsedMessage = expectedParsedMessage, dirtyMode: Boolean = true, - stringValues: Boolean = false + decodeToStringValues: Boolean = false ) { val expectedBody = expectedMessage.body val rawMessage = RawMessage( @@ -266,7 +271,7 @@ class FixNgCodecTest { ) val decodedGroup = try { - val codec = if (stringValues) FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) else this.codec + val codec = if (decodeToStringValues) FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) else this.codec codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) } catch (e: IllegalStateException) { if (dirtyMode) { @@ -281,7 +286,7 @@ class FixNgCodecTest { // we don't validate `CheckSum` and `BodyLength` in incorrect messages val fieldsToIgnore = if (expectedErrorText == null) emptyArray() else arrayOf("trailer.CheckSum", "header.BodyLength") - val expected = if (stringValues) convertValuesToString(expectedBody) else expectedBody + val expected = if (decodeToStringValues) convertValuesToString(expectedBody) else expectedBody assertThat(parsedMessage.body) .usingRecursiveComparison() @@ -298,10 +303,6 @@ class FixNgCodecTest { private fun convertValuesToString(value: Any?): Any = when (value) { is Map<*, *> -> value.mapValues { convertValuesToString(it.value) } is List<*> -> value.map(::convertValuesToString) - is java.lang.Boolean -> if (value.booleanValue()) "Y" else "N" - is LocalDateTime -> value.format(dateTimeFormatter) - is LocalDate -> value.format(dateFormatter) - is LocalTime -> value.format(timeFormatter) else -> value.toString() } @@ -456,17 +457,5 @@ class FixNgCodecTest { private const val MSG_NON_PRINTABLE = "8=FIXT.1.1\u00019=303\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\taccount\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=171\u0001" private const val MSG_REQUIRED_HEADER_REMOVED = "8=FIXT.1.1\u00019=236\u000135=8\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=050\u0001" private const val MSG_TAG_OUT_OF_ORDER = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=000\u0001999=500\u0001" - - private val dateTimeFormatter = DateTimeFormatterBuilder() - .appendPattern("yyyyMMdd-HH:mm:ss") - .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true) - .toFormatter() - - private val dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd") - - private val timeFormatter = DateTimeFormatterBuilder() - .appendPattern("HH:mm:ss") - .appendFraction(ChronoField.MILLI_OF_SECOND, 0, 9, true) - .toFormatter() } } \ No newline at end of file From baf8f2773edde77b080c902a03fe41fca75a57c9 Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:38:22 +0400 Subject: [PATCH 09/15] README.md --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bde2b31..c8e8c5c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,44 @@ -# th2-codec-fix-ng -Yet another FIX codec +# th2-codec-fix-ng 0.1.0 + +This codec can be used in dirty mode for decoding and encoding messages via the FIX protocol. + +## Configuration + +### Codec factory + +To use the FIX codec you will need to specify the following codec factory: +**com.exactpro.th2.codec.fixng.FixNgCodecFactory** + +### Configuration parameters +Configuration example. +```yaml +beginString: FIXT.1.1 +dictionary: fix_dictionary.xml +charset: US_ASCII +dirtyMode: false +decodeValuesToStrings: true +``` + +#### beginString +default value: `FIXT.1.1`. Value to put into the `BeginString` field (tag: 8) when encoding messages. + +#### dictionary +required value. XML file containing the FIX dictionary. + +#### charset +default value: `US_ASCII`. Charset for reading and writing FIX fields. + +#### dirtyMode +default value: `false`. If `true`, processes all messages in dirty mode (generates warnings on invalid messages and continues processing). If `false`, only messages that contain the `encode-mode: dirty` property will be processed in dirty mode. + +#### decodeValuesToStrings +default value: `true`. Decode all values to strings instead of typed values. + +## Release notes +### 0.1.0 + + Dirty mode added. + + `dirtyMode` setting option added. + + `decodeValuesToStrings` setting option added. + +### 0.0.1 + + Initial release \ No newline at end of file From 48d21922d80af5b675d3a15913d4a6c99133b96a Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:21:26 +0400 Subject: [PATCH 10/15] [TH2 5230] decodeComponentsToNestedMaps settings option (#5) --- README.md | 6 +- .../exactpro/th2/codec/fixng/FixNgCodec.kt | 85 ++++++++++++------- .../th2/codec/fixng/FixNgCodecSettings.kt | 1 + .../th2/codec/fixng/FixNgCodecTest.kt | 81 +++--------------- 4 files changed, 71 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index c8e8c5c..f2a6488 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ dictionary: fix_dictionary.xml charset: US_ASCII dirtyMode: false decodeValuesToStrings: true +decodeComponentsToNestedMaps: true ``` #### beginString @@ -32,7 +33,10 @@ default value: `US_ASCII`. Charset for reading and writing FIX fields. default value: `false`. If `true`, processes all messages in dirty mode (generates warnings on invalid messages and continues processing). If `false`, only messages that contain the `encode-mode: dirty` property will be processed in dirty mode. #### decodeValuesToStrings -default value: `true`. Decode all values to strings instead of typed values. +default value: `true`. If `true`, decodes all values to strings instead of typed values. + +#### decodeComponentsToNestedMaps +default value: `true`. If `true`, decodes `components` to nested maps instead of unwrap component's map to message's main map. ## Release notes ### 0.1.0 diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index 581085a..91ab6b3 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -47,9 +47,10 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) private val charset = settings.charset private val isDirtyMode = settings.dirtyMode private val isDecodeToStrings = settings.decodeValuesToStrings + private val isDecodeComponentsToNestedMaps = settings.decodeComponentsToNestedMaps - private val fieldsEncode = convertToFieldsByName(dictionary.fields, true) - private val fieldsDecode = convertToFieldsByTag(dictionary.fields) + private val fieldsEncode = convertToFieldsByName(dictionary.fields, true, emptyList(), true) + private val fieldsDecode = convertToFieldsByTag(dictionary.fields, emptyList()) private val messagesByTypeForDecode: Map private val messagesByNameForEncode: Map @@ -169,6 +170,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) private fun Field.decode( source: ByteBuf, target: MutableMap, + tagsSet: MutableSet, value: String, tag: Int, isDirty: Boolean, @@ -190,23 +192,25 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) } } - // in dirty mode we'll use tag as field name if we have field duplication - val fieldName = if (isDirty && target.contains(name)) { - tag.toString() - } else { - name + if (!tagsSet.add(tag)) { + // we always handle tag duplication as error (isDirty = false) + handleError(false, context, "Duplicate $name field ($tag) with value: $value", value) } - val previous = target.put(fieldName, decodedValue) + val targetMap = if (isDecodeComponentsToNestedMaps) { + @Suppress("UNCHECKED_CAST") + path.fold(target) { map, key -> map.computeIfAbsent(key) { mutableMapOf() } as MutableMap } + } else { + target + } - // but even in dirty mode we can't write field if it's duplicated more than once - // because we use Map and it cant contain duplicates - check(previous == null) { "Duplicate $name field ($tag) with value: $value (previous: $previous)" } + targetMap[name] = decodedValue } private val prereadHeaderFields = arrayOf("BeginString", "BodyLength", "MsgType") private fun Message.decode(source: ByteBuf, bodyDef: Message, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext): MutableMap = mutableMapOf().also { map -> + val tagsSet: MutableSet = hashSetOf() source.forEachField(charset, isDirty) { tag, value -> val field = get(tag) ?: if (isDirty) { when (this) { @@ -221,19 +225,27 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) dictField } else { context.warning(DIRTY_MODE_WARNING_PREFIX + "Field does not exist in dictionary. Field tag: $tag. Field value: $value.") - Primitive(false, tag.toString(), String::class.java, emptySet(), tag) + Primitive(false, tag.toString(), emptyList(), String::class.java, emptySet(), tag) } } else { // we reached next part of the message return@forEachField false } - field.decode(source, map, value, tag, isDirty, context) + field.decode(source, map, tagsSet, value, tag, isDirty, context) return@forEachField true } for (field in fields.values) { - if (field.isRequired && !map.contains(field.name) && field.name !in prereadHeaderFields) { + if (!field.isRequired) continue + + val tag = when (field) { + is Primitive -> field.tag + is Group -> field.counter + else -> error("Only `Primitive` and `Group` fields expected to be `required`") + } + + if (!tagsSet.contains(tag) && field.name !in prereadHeaderFields) { handleError(isDirty, context, "Required field missing. Field name: ${field.name}.") } } @@ -299,7 +311,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) source.forEachField(charset, isDirty) { tag, value -> val field = get(tag) ?: return@forEachField false - val group = if (tag == delimiter || !tags.add(tag) || map == null) { + val group = if (tag == delimiter || tags.contains(tag) || map == null) { if (tag != delimiter) { handleError(isDirty, context, "Field ${field.name} ($tag) appears before delimiter ($delimiter)") } @@ -313,7 +325,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) map ?: error("Group entry map can't be null.") } - field.decode(source, group, value, tag, isDirty, context) + field.decode(source, group, tags, value, tag, isDirty, context) return@forEachField true } @@ -432,11 +444,13 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) interface Field { val isRequired: Boolean val name: String + val path: List } data class Primitive( override val isRequired: Boolean, override val name: String, + override val path: List, val primitiveType: Class<*>, val values: Set, val tag: Int @@ -463,6 +477,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) data class Message( override val isRequired: Boolean, override val name: String, + override val path: List, val type: String, override val fields: Map, ) : Field, FieldMap() @@ -470,6 +485,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) data class Group( override val isRequired: Boolean, override val name: String, + override val path: List, val counter: Int, val delimiter: Int, override val fields: Map, @@ -536,42 +552,44 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) private val IFieldStructure.tag: Int get() = StructureUtils.getAttributeValue(this, "tag") - private fun IFieldStructure.toPrimitive(): Primitive = Primitive( - isRequired, + private fun IFieldStructure.toPrimitive(path: List, isRequiredParent: Boolean): Primitive = Primitive( + isRequiredParent && isRequired, name, + path, javaTypeToClass.getValue(javaType), values.values.map { it.getCastValue().toString() }.toSet(), tag ) - private fun convertToFieldsByName(fields: Map, isForEncode: Boolean): Map = linkedMapOf().apply { + private fun convertToFieldsByName(fields: Map, isForEncode: Boolean, path: List, isRequiredParent: Boolean): Map = linkedMapOf().apply { fields.forEach { (name, field) -> when { - field !is IMessageStructure -> this[name] = field.toPrimitive() - field.isGroup -> this[name] = field.toGroup(isForEncode) + field !is IMessageStructure -> this[name] = field.toPrimitive(path, isForEncode || isRequiredParent) + field.isGroup -> this[name] = field.toGroup(isForEncode, path, isForEncode || isRequiredParent) field.isComponent -> if (isForEncode) { - this[name] = field.toMessage(true) + this[name] = field.toMessage(true, path + name) } else { - this += convertToFieldsByName(field.fields, false) + this += convertToFieldsByName(field.fields, false, path + name, isRequiredParent && field.isRequired) } } } } - private fun convertToFieldsByTag(fields: Map): Map = linkedMapOf().apply { + private fun convertToFieldsByTag(fields: Map, path: List): Map = linkedMapOf().apply { fields.values.forEach { field -> when { - field !is IMessageStructure -> this[field.tag] = field.toPrimitive() - field.isGroup -> this[field.tag] = field.toGroup(false) - field.isComponent -> this += convertToFieldsByTag(field.fields) + field !is IMessageStructure -> this[field.tag] = field.toPrimitive(path, true) + field.isGroup -> this[field.tag] = field.toGroup(false, path, true) + field.isComponent -> this += convertToFieldsByTag(field.fields, path + field.name) } } } - private fun IMessageStructure.toMessage(isForEncode: Boolean): Message = Message( + private fun IMessageStructure.toMessage(isForEncode: Boolean, path: List): Message = Message( name = name, type = StructureUtils.getAttributeValue(this, FIELD_MESSAGE_TYPE) ?: name, - fields = convertToFieldsByName(this.fields, isForEncode), + fields = convertToFieldsByName(this.fields, isForEncode, path, !isComponent || isRequired), + path = path, isRequired = isRequired ) @@ -579,16 +597,17 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) if (it is IMessageStructure && it.isComponent) getFirstTag(it) else it.tag } - private fun IMessageStructure.toGroup(isForEncode: Boolean): Group = Group( + private fun IMessageStructure.toGroup(isForEncode: Boolean, path: List, isRequiredParent: Boolean): Group = Group( name = name, counter = tag, delimiter = getFirstTag(this), - fields = convertToFieldsByName(this.fields, isForEncode), - isRequired = isRequired + fields = convertToFieldsByName(this.fields, isForEncode, emptyList(), true), + path = path, + isRequired = isRequiredParent && isRequired ) fun IDictionaryStructure.toMessages(isForEncode: Boolean): List = messages.values .filterNot { it.isGroup || it.isComponent } - .map { it.toMessage(isForEncode) } + .map { it.toMessage(isForEncode, emptyList()) } } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt index 52f1825..3552807 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecSettings.kt @@ -25,4 +25,5 @@ data class FixNgCodecSettings( val charset: Charset = Charsets.US_ASCII, val dirtyMode: Boolean = false, val decodeValuesToStrings: Boolean = true, + val decodeComponentsToNestedMaps: Boolean = true ) : IPipelineCodecSettings \ No newline at end of file diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt index 382613a..68240e2 100644 --- a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt @@ -81,7 +81,7 @@ class FixNgCodecTest { @Test fun `decode with addition field that exists in dictionary`() { - expectedParsedBody["CFICode"] = "12345" + parsedBody["CFICode"] = "12345" decodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.") } @@ -96,7 +96,7 @@ class FixNgCodecTest { @Test fun `decode with addition field that does not exists in dictionary`() { - expectedParsedBody["9999"] = "54321" + parsedBody["9999"] = "54321" decodeTest(MSG_ADDITIONAL_FIELD_NO_DICT, "Field does not exist in dictionary. Field tag: 9999. Field value: 54321.") } @@ -114,7 +114,7 @@ class FixNgCodecTest { @Test fun `decode with required field removed`() { - expectedParsedBody.remove("ExecID") + parsedBody.remove("ExecID") decodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required field missing. Field name: ExecID.") } @@ -128,7 +128,7 @@ class FixNgCodecTest { @Test fun `decode with required delimiter field in group removed in first entry`() { @Suppress("UNCHECKED_CAST") - (expectedParsedBody["NoPartyIDs"] as MutableList>)[0].remove("PartyID") + ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[0].remove("PartyID") decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)") } @@ -142,7 +142,7 @@ class FixNgCodecTest { @Test fun `decode with required delimiter field in group removed in second entry`() { @Suppress("UNCHECKED_CAST") - (expectedParsedBody["NoPartyIDs"] as MutableList>)[1].remove("PartyID") + ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[1].remove("PartyID") decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)") } @@ -154,7 +154,7 @@ class FixNgCodecTest { @Test fun `decode with wrong enum value`() { - expectedParsedBody["ExecType"] = 'X' + parsedBody["ExecType"] = 'X' decodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.") } @@ -178,7 +178,7 @@ class FixNgCodecTest { @Test fun `decode with wrong value type`() { - expectedParsedBody["LeavesQty"] = "Five" + parsedBody["LeavesQty"] = "Five" decodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.") } @@ -190,7 +190,7 @@ class FixNgCodecTest { @Test fun `decode with empty value`() { - expectedParsedBody["Account"] = "" + parsedBody["Account"] = "" decodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.") } @@ -202,7 +202,7 @@ class FixNgCodecTest { @Test fun `decode with non printable characters`() { - expectedParsedBody["Account"] = "test\taccount" + parsedBody["Account"] = "test\taccount" decodeTest(MSG_NON_PRINTABLE, "Non printable characters in the field 'Account'.") } @@ -258,7 +258,7 @@ class FixNgCodecTest { private fun decodeTest( rawMessageString: String, expectedErrorText: String? = null, - expectedMessage: ParsedMessage = expectedParsedMessage, + expectedMessage: ParsedMessage = parsedMessage, dirtyMode: Boolean = true, decodeToStringValues: Boolean = false ) { @@ -328,7 +328,7 @@ class FixNgCodecTest { "OrderID" to "49415882", "ExecType" to '0', "OrdStatus" to '0', - "LeavesQty" to 500, + "LeavesQty" to BigDecimal(500), "CumQty" to BigDecimal(500), "SecurityID" to "NWDR", "SecurityIDSource" to "8", @@ -351,72 +351,17 @@ class FixNgCodecTest { "TimeInForce" to '0', "Side" to 'B', "Symbol" to "ABC", - "OrderQty" to 500, - "Price" to 1000, - "Unknown" to "500", - "TransactTime" to LocalDateTime.parse("2018-02-05T10:38:08.000008"), - "trailer" to mutableMapOf( - "CheckSum" to "191" - ) - ) - ) - - private val parsedBody: MutableMap = parsedMessage.body as MutableMap - - private val expectedParsedMessage = ParsedMessage( - MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), - EventId("test_id", "test_book", "test_scope", Instant.now()), - "ExecutionReport", - mutableMapOf("encode-mode" to "dirty"), - PROTOCOL, - mutableMapOf( - "header" to mapOf( - "MsgSeqNum" to 10947, - "SenderCompID" to "SENDER", - "SendingTime" to LocalDateTime.parse("2023-04-19T10:36:07.415088"), - "TargetCompID" to "RECEIVER", - "BeginString" to "FIXT.1.1", - "BodyLength" to 295, - "MsgType" to "8" - ), - "ExecID" to "495504662", - "ClOrdID" to "zSuNbrBIZyVljs", - "OrigClOrdID" to "zSuNbrBIZyVljs", - "OrderID" to "49415882", - "ExecType" to '0', - "OrdStatus" to '0', - "LeavesQty" to BigDecimal(500), - "CumQty" to BigDecimal(500), - "SecurityID" to "NWDR", - "SecurityIDSource" to "8", - "NoPartyIDs" to listOf( - mapOf( - "PartyID" to "NGALL1FX01", - "PartyIDSource" to 'D', - "PartyRole" to 76 - ), - mapOf( - "PartyID" to "0", - "PartyIDSource" to 'P', - "PartyRole" to 3 - ) - ), - "Account" to "test", - "OrdType" to 'A', - "TimeInForce" to '0', - "Side" to 'B', - "Symbol" to "ABC", "OrderQty" to BigDecimal(500), "Price" to BigDecimal(1000), "Unknown" to "500", "TransactTime" to LocalDateTime.parse("2018-02-05T10:38:08.000008"), - "trailer" to mapOf( + "trailer" to mutableMapOf( "CheckSum" to "191" ) ) ) - private val expectedParsedBody: MutableMap = expectedParsedMessage.body as MutableMap + private val parsedBody: MutableMap = parsedMessage.body as MutableMap private val expectedMessageWithoutBody = ParsedMessage( MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), From ee2202ce4de831277bb992da42b2bc1d6d2c94fb Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Wed, 21 Aug 2024 16:47:14 +0400 Subject: [PATCH 11/15] JMH tests (#4) --- build.gradle | 6 + .../th2/codec/fixng/FixNgCodecBenchmark.kt | 143 + src/jmh/resources/dictionary-benchmark.xml | 7472 +++++++++++++++++ 3 files changed, 7621 insertions(+) create mode 100644 src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt create mode 100644 src/jmh/resources/dictionary-benchmark.xml diff --git a/build.gradle b/build.gradle index 83a209b..bda24d6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,13 @@ plugins { id "com.exactpro.th2.gradle.component" version "0.1.1" id "org.jetbrains.kotlin.jvm" version "$kotlin_version" id "org.jetbrains.kotlin.kapt" version "$kotlin_version" + id "me.champeau.jmh" version "0.7.2" } ext { sailfishVersion = '3.3.241' commonVersion = '5.14.0-dev' + jmhVersion = '1.37' } group = 'com.exactpro.th2' @@ -89,6 +91,10 @@ dependencies { annotationProcessor "com.google.auto.service:auto-service:1.1.1" kapt "com.google.auto.service:auto-service:1.1.1" + jmh "org.openjdk.jmh:jmh-core:$jmhVersion" + jmh "org.openjdk.jmh:jmh-generator-annprocess:$jmhVersion" + jmh "org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion" + testImplementation "org.junit.jupiter:junit-jupiter" testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" testImplementation "org.assertj:assertj-core:3.26.3" diff --git a/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt b/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt new file mode 100644 index 0000000..f7c66f4 --- /dev/null +++ b/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt @@ -0,0 +1,143 @@ +/* + * Copyright 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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.th2.codec.api.IPipelineCodec +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 +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.EventId +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageGroup +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.MessageId +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.ParsedMessage +import com.exactpro.th2.common.schema.message.impl.rabbitmq.transport.RawMessage +import io.netty.buffer.ByteBuf +import io.netty.buffer.Unpooled +import org.openjdk.jmh.annotations.Benchmark +import org.openjdk.jmh.annotations.BenchmarkMode +import org.openjdk.jmh.annotations.Level +import org.openjdk.jmh.annotations.Mode +import org.openjdk.jmh.annotations.Scope +import org.openjdk.jmh.annotations.Setup +import org.openjdk.jmh.annotations.State +import java.time.Instant + +@State(Scope.Benchmark) +open class BenchmarkState { + lateinit var codec: IPipelineCodec + lateinit var rawBody: ByteBuf + lateinit var rawGroup: MessageGroup + lateinit var parsedGroup: MessageGroup + + @Setup(Level.Trial) + fun setup() { + val dictionary: IDictionaryStructure = FixNgCodecTest::class.java.classLoader + .getResourceAsStream("dictionary-benchmark.xml") + .use(XmlDictionaryStructureLoader()::load) + + codec = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "", decodeValuesToStrings = true)) + rawBody = Unpooled.wrappedBuffer(MSG_CORRECT.toByteArray(Charsets.US_ASCII)) + rawGroup = MessageGroup(listOf(RawMessage(id = parsedMessage.id, eventId = parsedMessage.eventId, body = rawBody))) + parsedGroup = MessageGroup(listOf(parsedMessage)) + } + + @Setup(Level.Invocation) + fun resetReader() { + rawBody.resetReaderIndex() + } + + companion object { + private const val MSG_CORRECT = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=191\u0001" + private val parsedMessage = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "ExecutionReport", + mapOf("encode-mode" to "dirty"), + PROTOCOL, + mapOf( + "header" to mapOf( + "MsgSeqNum" to "10947", + "SenderCompID" to "SENDER", + "SendingTime" to "2023-04-19T10:36:07.415088", + "TargetCompID" to "RECEIVER", + "BeginString" to "FIXT.1.1", + "BodyLength" to "295", + "MsgType" to "8" + ), + "ExecID" to "495504662", + "ClOrdID" to "zSuNbrBIZyVljs", + "OrigClOrdID" to "zSuNbrBIZyVljs", + "OrderID" to "49415882", + "ExecType" to '0', + "OrdStatus" to '0', + "LeavesQty" to "500", + "CumQty" to "500", + "SecurityID" to "NWDR", + "SecurityIDSource" to "8", + "TradingParty" to mapOf( + "NoPartyIDs" to listOf( + mapOf( + "PartyID" to "NGALL1FX01", + "PartyIDSource" to "D", + "PartyRole" to "76" + ), + mapOf( + "PartyID" to "0", + "PartyIDSource" to "P", + "PartyRole" to "3" + ) + ) + ), + "Account" to "test", + "OrdType" to "A", + "TimeInForce" to "0", + "Side" to "B", + "Symbol" to "ABC", + "OrderQty" to "500", + "Price" to "1000", + "Unknown" to "500", + "TransactTime" to "2018-02-05T10:38:08.000008", + "trailer" to mapOf( + "CheckSum" to "191" + ) + ) + ) + } +} + +open class FixNgCodecBenchmark { + @Benchmark + @BenchmarkMode(Mode.Throughput) + fun encodeFixMessage(state: BenchmarkState) { + state.codec.encode(state.parsedGroup, context) + } + + @Benchmark + @BenchmarkMode(Mode.Throughput) + fun parseFixMessage(state: BenchmarkState) { + state.codec.decode(state.rawGroup, context) + } + + companion object { + private val context = object : IReportingContext { + override fun warning(message: String) { } + override fun warnings(messages: Iterable) { } + } + } +} \ No newline at end of file diff --git a/src/jmh/resources/dictionary-benchmark.xml b/src/jmh/resources/dictionary-benchmark.xml new file mode 100644 index 0000000..a04f185 --- /dev/null +++ b/src/jmh/resources/dictionary-benchmark.xml @@ -0,0 +1,7472 @@ + + + + + + + 1409 + INT + 0 + 2 + 3 + 4 + 6 + 7 + 8 + 100 + 101 + 102 + + + 1 + STRING + + + 2 + STRING + + + 3 + STRING + + + 4 + CHAR + B + S + X + T + + + 5 + STRING + N + C + R + + + 6 + PRICE + + + 7 + SEQNUM + + + 8 + STRING + + + 9 + LENGTH + + + 10 + STRING + + + 11 + STRING + + + 12 + AMT + + + 13 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + + + 14 + QTY + + + 15 + CURRENCY + + + 16 + SEQNUM + + + 17 + STRING + + + 18 + MULTIPLECHARVALUE + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z + a + b + c + d + e + f + g + h + i + j + k + + + 19 + STRING + + + 20 + CHAR + 0 + 1 + 2 + 3 + + + 21 + CHAR + 1 + 2 + 3 + + + 22 + STRING + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + + + 23 + STRING + + + 25 + CHAR + L + M + H + + + 26 + STRING + + + 27 + STRING + 0 + S + M + L + U + + + 28 + CHAR + N + C + R + + + 29 + CHAR + 1 + 2 + 3 + 4 + + + 30 + EXCHANGE + + + 31 + PRICE + + + 32 + QTY + + + 33 + NUMINGROUP + + + 34 + SEQNUM + + + 35 + STRING + 0 + 1 + 2 + 3 + 4 + 5 + 8 + 9 + A + D + E + F + G + S + Z + b + e + f + j + k + q + r + s + u + AD + AE + AF + AI + AQ + AR + BW + BX + + + 36 + SEQNUM + + + 37 + STRING + + + 38 + QTY + + + 39 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + + + 40 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + M + P + Q + + + 41 + STRING + + + 42 + UTCTIMESTAMP + + + 43 + BOOLEAN + + + 44 + PRICE + + + 45 + SEQNUM + + + 47 + STRING + + + 48 + STRING + + + 49 + STRING + + + 50 + STRING + + + 52 + UTCTIMESTAMP + + + 53 + QTY + + + 54 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + + + 55 + STRING + + + 56 + STRING + + + 57 + STRING + + + 58 + STRING + + + 59 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + C + + + 60 + UTCTIMESTAMP + + + 61 + CHAR + 0 + 1 + 2 + + + 62 + UTCTIMESTAMP + + + 63 + STRING + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + C + B + + + 64 + LOCALMKTDATE + + + 65 + STRING + WI + CD + + + 66 + STRING + + + 67 + INT + + + 68 + INT + + + 69 + STRING + + + 70 + STRING + + + 71 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 72 + STRING + + + 73 + NUMINGROUP + + + 74 + INT + + + 75 + LOCALMKTDATE + + + 76 + STRING + + + 77 + CHAR + O + C + R + F + + + 78 + NUMINGROUP + + + 79 + STRING + + + 80 + QTY + + + 81 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 82 + INT + + + 83 + INT + + + 84 + QTY + + + 85 + NUMINGROUP + + + 86 + STRING + + + 87 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 88 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 89 + DATA + + + 90 + LENGTH + + + 91 + DATA + + + 92 + STRING + + + 93 + LENGTH + + + 94 + CHAR + 0 + 1 + 2 + + + 95 + LENGTH + + + 96 + DATA + + + 97 + BOOLEAN + + + 98 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 99 + PRICE + + + 100 + EXCHANGE + + + 102 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 18 + 99 + 113100 + 113101 + + + 103 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 18 + 99 + 10000 + 10001 + 10003 + 10004 + 10005 + 10006 + + + 104 + CHAR + A + B + C + D + I + L + M + O + P + Q + R + S + T + V + W + X + Y + Z + + + 105 + STRING + + + 106 + STRING + + + 107 + STRING + + + 108 + INT + + + 109 + STRING + + + 110 + QTY + + + 111 + QTY + + + 112 + STRING + + + 113 + BOOLEAN + + + 114 + BOOLEAN + + + 115 + STRING + + + 116 + STRING + + + 117 + STRING + + + 118 + AMT + + + 119 + AMT + + + 120 + CURRENCY + + + 121 + BOOLEAN + + + 122 + UTCTIMESTAMP + + + 123 + BOOLEAN + + + 124 + NUMINGROUP + + + 125 + CHAR + P + F + + + 126 + UTCTIMESTAMP + + + 127 + CHAR + A + B + C + D + E + F + Z + + + 128 + STRING + + + 129 + STRING + + + 130 + BOOLEAN + + + 131 + STRING + + + 132 + PRICE + + + 133 + PRICE + + + 134 + QTY + + + 135 + QTY + + + 136 + NUMINGROUP + + + 137 + AMT + + + 138 + CURRENCY + + + 139 + STRING + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 140 + PRICE + + + 141 + BOOLEAN + + + 142 + STRING + + + 143 + STRING + + + 144 + STRING + + + 145 + STRING + + + 146 + NUMINGROUP + + + 147 + STRING + + + 148 + STRING + + + 149 + STRING + + + 150 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + I + J + K + L + + + 151 + QTY + + + 152 + QTY + + + 153 + PRICE + + + 154 + AMT + + + 155 + FLOAT + + + 156 + CHAR + M + D + + + 157 + INT + + + 158 + PERCENTAGE + + + 159 + AMT + + + 160 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + + + 161 + STRING + + + 162 + STRING + + + 163 + CHAR + N + C + R + T + + + 164 + STRING + + + 165 + CHAR + 1 + 2 + 3 + + + 166 + STRING + CED + DTC + EUR + FED + ISO + PNY + PTC + + + 167 + STRING + ? + ABS + AMENDED + AN + BA + BN + BOX + BRADY + BRIDGE + BUYSELL + CB + CD + CL + CMBS + CMO + COFO + COFP + CORP + CP + CPP + CS + DEFLTED + DINP + DN + DUAL + EUCD + EUCORP + EUCP + EUSOV + EUSUPRA + FAC + FADN + FOR + FORWARD + FUT + GO + IET + LOFC + LQN + MATURED + MBS + MF + MIO + MLEG + MPO + MPP + MPT + MT + MTN + NONE + ONITE + OPT + PEF + PFAND + PN + PS + PZFJ + RAN + REPLACD + REPO + RETIRED + REV + RVLV + RVLVTRM + SECLOAN + SECPLEDGE + SPCLA + SPCLO + SPCLT + STN + STRUCT + SUPRA + SWING + TAN + TAXA + TBA + TBILL + TBOND + TCAL + TD + TECP + TERM + TINT + TIPS + TNOTE + TPRN + TRAN + UST + USTB + VRDN + WAR + WITHDRN + WLD + XCN + XLINKD + YANK + YCD + OOP + OOF + CASH + + + 168 + UTCTIMESTAMP + + + 169 + INT + 0 + 1 + 2 + 3 + 4 + + + 170 + STRING + + + 171 + STRING + + + 172 + INT + 0 + 1 + 2 + 3 + + + 173 + STRING + + + 174 + STRING + + + 175 + STRING + + + 176 + STRING + + + 177 + STRING + + + 178 + STRING + + + 179 + STRING + + + 180 + STRING + + + 181 + STRING + + + 182 + STRING + + + 183 + STRING + + + 184 + STRING + + + 185 + STRING + + + 186 + STRING + + + 187 + STRING + + + 188 + PRICE + + + 189 + PRICEOFFSET + + + 190 + PRICE + + + 191 + PRICEOFFSET + + + 192 + QTY + + + 193 + LOCALMKTDATE + + + 194 + PRICE + + + 195 + PRICEOFFSET + + + 196 + STRING + + + 197 + INT + 0 + 1 + + + 198 + STRING + + + 199 + NUMINGROUP + + + 200 + MONTH-YEAR + + + 201 + INT + 0 + 1 + + + 202 + PRICE + + + 203 + INT + 0 + 1 + + + 204 + INT + 0 + 1 + + + 205 + DAY-OF-MONTH + + + 206 + CHAR + + + 207 + EXCHANGE + + + 208 + BOOLEAN + + + 209 + INT + 1 + 2 + 3 + + + 210 + QTY + + + 211 + FLOAT + + + 212 + LENGTH + + + 213 + DATA + + + 214 + STRING + + + 215 + NUMINGROUP + + + 216 + INT + 1 + 2 + 3 + 4 + + + 217 + STRING + + + 218 + PRICEOFFSET + + + 219 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + 220 + CURRENCY + + + 221 + STRING + EONIA + EUREPO + Euribor + FutureSWAP + LIBID + LIBOR + MuniAAA + OTHER + Pfandbriefe + SONIA + SWAP + Treasury + + + 222 + STRING + + + 223 + PERCENTAGE + + + 224 + LOCALMKTDATE + + + 225 + LOCALMKTDATE + + + 226 + INT + + + 227 + PERCENTAGE + + + 228 + FLOAT + + + 229 + LOCALMKTDATE + + + 230 + LOCALMKTDATE + + + 231 + FLOAT + + + 232 + NUMINGROUP + + + 233 + STRING + ABS + AMT + AUTOREINV + BANKQUAL + BGNCON + COUPON + CPP + CPR + CPY + CURRENCY + CUSTOMDATE + GEOG + HAIRCUT + HEP + INSURED + ISSUE + ISSUER + ISSUESIZE + LOOKBACK + LOT + LOTVAR + MAT + MATURITY + MAXSUBS + MHP + MINDNOM + MININCR + MINQTY + MPR + PAYFREQ + PIECES + PMAX + PPC + PPL + PPM + PPT + PRICE + PRICEFREQ + PROD + PROTECT + PSA + PURPOSE + PXSOURCE + RATING + REDEMPTION + RESTRICTED + SECTOR + SECTYPE + SMM + STRUCT + SUBSFREQ + SUBSLEFT + TEXT + TRDVAR + WAC + WAL + WALA + WAM + WHOLE + YIELD + + + 234 + STRING + CD + XD + CC + XC + CB + XB + CR + XR + CP + XP + CS + SP + TR + GD + + + 235 + STRING + AFTERTAX + ANNUAL + ATISSUE + AVGMATURITY + BOOK + CALL + CHANGE + CLOSE + COMPOUND + CURRENT + GOVTEQUIV + GROSS + INFLATION + INVERSEFLOATER + LASTCLOSE + LASTMONTH + LASTQUARTER + LASTYEAR + LONGAVGLIFE + MARK + MATURITY + NEXTREFUND + OPENAVG + PREVCLOSE + PROCEEDS + PUT + SEMIANNUAL + SHORTAVGLIFE + SIMPLE + TAXEQUIV + TENDER + TRUE + VALUE1_32 + WORST + + + 236 + PERCENTAGE + + + 237 + AMT + + + 238 + AMT + + + 239 + STRING + + + 240 + LOCALMKTDATE + + + 241 + LOCALMKTDATE + + + 242 + LOCALMKTDATE + + + 243 + STRING + + + 244 + INT + + + 245 + PERCENTAGE + + + 246 + FLOAT + + + 247 + LOCALMKTDATE + + + 248 + LOCALMKTDATE + + + 249 + LOCALMKTDATE + + + 250 + STRING + + + 251 + INT + + + 252 + PERCENTAGE + + + 253 + FLOAT + + + 254 + LOCALMKTDATE + + + 255 + STRING + + + 256 + STRING + + + 257 + STRING + + + 258 + BOOLEAN + + + 259 + LOCALMKTDATE + + + 260 + PRICE + + + 262 + STRING + + + 263 + CHAR + 0 + 1 + 2 + + + 264 + INT + + + 265 + INT + 0 + 1 + + + 266 + BOOLEAN + + + 267 + NUMINGROUP + + + 268 + NUMINGROUP + + + 269 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + H + J + K + L + M + N + O + P + Q + + + 270 + PRICE + + + 271 + QTY + + + 272 + UTCDATEONLY + + + 273 + UTCTIMEONLY + + + 274 + CHAR + 0 + 1 + 2 + 3 + + + 275 + EXCHANGE + + + 276 + MULTIPLESTRINGVALUE + A + B + C + D + E + F + G + H + I + L + J + K + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z + a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p + q + r + s + t + u + v + w + x + y + z + 0 + 1 + 2 + 1000 + 1001 + 1002 + 1003 + + + 277 + MULTIPLESTRINGVALUE + A + B + C + D + E + F + G + H + I + J + K + L + M + N + P + Q + R + Y + Z + S + T + U + V + W + X + 0 + a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p + q + r + s + t + u + v + w + x + y + z + AA + AB + AC + AD + AE + AF + AG + AH + AI + AJ + AK + AL + AM + AN + AO + AP + AQ + AR + AS + AT + 1000 + 1001 + 1002 + + + 278 + STRING + + + 279 + CHAR + 0 + 1 + 2 + 3 + 4 + + + 280 + STRING + + + 281 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + + + 282 + STRING + + + 283 + STRING + + + 284 + STRING + + + 285 + CHAR + 0 + 1 + + + 286 + MULTIPLECHARVALUE + 0 + 1 + 2 + 3 + 4 + 5 + + + 287 + INT + + + 288 + STRING + + + 289 + STRING + + + 290 + INT + + + 291 + MULTIPLECHARVALUE + 1 + 2 + 3 + + + 292 + MULTIPLECHARVALUE + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + + + 293 + QTY + + + 294 + QTY + + + 295 + NUMINGROUP + + + 296 + NUMINGROUP + + + 297 + INT + 0 + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 17 + + + 298 + INT + 1 + 2 + 3 + 4 + 5 + + + 299 + STRING + + + 300 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + + + 301 + INT + 0 + 1 + 2 + + + 302 + STRING + + + 303 + INT + 1 + 2 + + + 304 + INT + + + 305 + STRING + + + 306 + STRING + + + 307 + STRING + + + 308 + EXCHANGE + + + 309 + STRING + + + 310 + STRING + + + 311 + STRING + + + 312 + STRING + + + 313 + MONTH-YEAR + + + 314 + DAY-OF-MONTH + + + 315 + INT + + + 316 + PRICE + + + 317 + CHAR + + + 318 + CURRENCY + + + 319 + QTY + + + 320 + STRING + + + 321 + INT + 0 + 1 + 2 + 3 + + + 322 + STRING + + + 323 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 324 + STRING + + + 325 + BOOLEAN + + + 326 + INT + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 2 + 20 + 21 + 22 + 23 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + 327 + CHAR + D + E + I + M + P + X + + + 328 + BOOLEAN + + + 329 + BOOLEAN + + + 330 + QTY + + + 331 + QTY + + + 332 + PRICE + + + 333 + PRICE + + + 334 + INT + 1 + 2 + 3 + + + 335 + STRING + + + 336 + STRING + + + 337 + STRING + + + 338 + INT + 1 + 2 + 3 + + + 339 + INT + 1 + 2 + 3 + + + 340 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + 341 + UTCTIMESTAMP + + + 342 + UTCTIMESTAMP + + + 343 + UTCTIMESTAMP + + + 344 + UTCTIMESTAMP + + + 345 + UTCTIMESTAMP + + + 346 + INT + + + 347 + STRING + ISO-2022-JP + EUC-JP + SHIFT_JIS + UTF-8 + + + 348 + LENGTH + + + 349 + DATA + + + 350 + LENGTH + + + 351 + DATA + + + 352 + LENGTH + + + 353 + DATA + + + 354 + LENGTH + + + 355 + DATA + + + 356 + LENGTH + + + 357 + DATA + + + 358 + LENGTH + + + 359 + DATA + + + 360 + LENGTH + + + 361 + DATA + + + 362 + LENGTH + + + 363 + DATA + + + 364 + LENGTH + + + 365 + DATA + + + 366 + PRICE + + + 367 + UTCTIMESTAMP + + + 368 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + + + 369 + SEQNUM + + + 370 + UTCTIMESTAMP + + + 371 + INT + + + 372 + STRING + + + 373 + INT + 0 + 1 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + 18 + + + 374 + CHAR + C + N + + + 375 + STRING + + + 376 + STRING + + + 377 + BOOLEAN + + + 378 + INT + 0 + 1 + 10 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + 11 + 51 + 100 + + + 379 + STRING + + + 380 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 18 + + + 381 + AMT + + + 382 + NUMINGROUP + + + 383 + LENGTH + + + 384 + NUMINGROUP + + + 385 + CHAR + R + S + + + 386 + NUMINGROUP + + + 387 + QTY + + + 388 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 389 + FLOAT + + + 390 + STRING + + + 391 + STRING + + + 392 + STRING + + + 393 + INT + + + 394 + INT + 1 + 2 + 3 + + + 395 + INT + + + 396 + AMT + + + 397 + AMT + + + 398 + NUMINGROUP + + + 399 + INT + 1 + 2 + 3 + + + 400 + STRING + + + 401 + INT + 1 + 2 + + + 402 + PERCENTAGE + + + 403 + PERCENTAGE + + + 404 + AMT + + + 405 + PERCENTAGE + + + 406 + AMT + + + 407 + PERCENTAGE + + + 408 + AMT + + + 409 + INT + 1 + 2 + 3 + 4 + + + 410 + PERCENTAGE + + + 411 + BOOLEAN + + + 412 + AMT + + + 413 + PERCENTAGE + + + 414 + INT + 1 + 2 + 3 + + + 415 + INT + + + 416 + INT + 1 + 2 + + + 417 + INT + + + 418 + CHAR + A + G + J + R + + + 419 + CHAR + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + Z + + + 420 + NUMINGROUP + + + 421 + COUNTRY + + + 422 + INT + + + 423 + INT + 1 + 10 + 11 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + + + 424 + QTY + + + 425 + QTY + + + 426 + PRICE + + + 427 + INT + 0 + 1 + 2 + + + 428 + NUMINGROUP + + + 429 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 430 + INT + 1 + 2 + + + 431 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 432 + LOCALMKTDATE + + + 433 + CHAR + 1 + 2 + 3 + 4 + 5 + + + 434 + CHAR + 1 + 2 + + + 435 + PERCENTAGE + + + 436 + FLOAT + + + 437 + QTY + + + 438 + UTCTIMESTAMP + + + 439 + STRING + + + 440 + STRING + + + 441 + INT + + + 442 + CHAR + 1 + 2 + 3 + + + 443 + UTCTIMESTAMP + + + 444 + STRING + + + 445 + LENGTH + + + 446 + DATA + + + 447 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + P + C + D + E + F + G + H + I + + + 448 + STRING + + + 449 + UTCDATEONLY + + + 450 + UTCTIMEONLY + + + 451 + PRICEOFFSET + + + 452 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 37 + 38 + 39 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + 55 + 56 + 57 + 58 + 59 + 60 + 61 + 62 + 63 + 64 + 65 + 66 + 67 + 68 + 69 + 70 + 71 + 72 + 73 + 74 + 75 + 76 + 77 + 78 + 122 + + + 453 + NUMINGROUP + + + 454 + NUMINGROUP + + + 455 + STRING + + + 456 + STRING + + + 457 + NUMINGROUP + + + 458 + STRING + + + 459 + STRING + + + 460 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 461 + STRING + + + 462 + INT + + + 463 + STRING + + + 464 + BOOLEAN + + + 465 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 466 + STRING + + + 467 + STRING + + + 468 + CHAR + 0 + 1 + 2 + + + 469 + FLOAT + + + 470 + COUNTRY + + + 471 + STRING + + + 472 + STRING + + + 473 + NUMINGROUP + + + 474 + STRING + + + 475 + COUNTRY + + + 476 + STRING + + + 477 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + + + 478 + CURRENCY + + + 479 + CURRENCY + + + 480 + CHAR + N + M + O + Y + + + 481 + CHAR + Y + N + 1 + 2 + 3 + + + 482 + STRING + + + 483 + UTCTIMESTAMP + + + 484 + CHAR + B + C + D + E + O + P + Q + S + + + 485 + FLOAT + + + 486 + LOCALMKTDATE + + + 487 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 488 + STRING + + + 489 + STRING + + + 490 + LOCALMKTDATE + + + 491 + STRING + + + 492 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 493 + STRING + + + 494 + STRING + + + 495 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 999 + + + 496 + STRING + + + 497 + CHAR + N + Y + + + 498 + STRING + + + 499 + STRING + + + 500 + STRING + + + 501 + STRING + + + 502 + STRING + + + 503 + LOCALMKTDATE + + + 504 + LOCALMKTDATE + + + 505 + STRING + + + 506 + CHAR + A + R + H + N + + + 507 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 99 + + + 508 + STRING + + + 509 + STRING + + + 510 + NUMINGROUP + + + 511 + STRING + + + 512 + PERCENTAGE + + + 513 + STRING + + + 514 + CHAR + 0 + 1 + 2 + + + 515 + UTCTIMESTAMP + + + 516 + PERCENTAGE + + + 517 + CHAR + J + T + 2 + + + 518 + NUMINGROUP + + + 519 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 520 + FLOAT + + + 521 + CURRENCY + + + 522 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 523 + STRING + + + 524 + STRING + + + 525 + CHAR + + + 526 + STRING + + + 527 + STRING + + + 528 + CHAR + A + G + I + P + R + W + C + + + 529 + MULTIPLECHARVALUE + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + + + 530 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 9 + + + 531 + CHAR + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 9 + + + 532 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 99 + 100 + 101 + + + 533 + INT + + + 534 + INT + + + 535 + STRING + + + 536 + STRING + + + 537 + INT + 0 + 1 + 2 + 3 + + + 538 + INT + + + 539 + NUMINGROUP + + + 540 + AMT + + + 541 + LOCALMKTDATE + + + 542 + LOCALMKTDATE + + + 543 + STRING + + + 544 + CHAR + 1 + 2 + 3 + + + 545 + STRING + + + 546 + MULTIPLECHARVALUE + 1 + 2 + 3 + + + 547 + BOOLEAN + + + 548 + STRING + + + 549 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 550 + INT + 0 + 1 + 2 + + + 551 + STRING + + + 552 + NUMINGROUP + 1 + 2 + + + 553 + STRING + + + 554 + STRING + + + 555 + NUMINGROUP + + + 556 + CURRENCY + + + 557 + INT + + + 558 + NUMINGROUP + + + 559 + INT + 0 + 1 + 2 + 3 + 4 + + + 560 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 561 + QTY + + + 562 + QTY + + + 563 + INT + 0 + 1 + 2 + + + 564 + CHAR + + + 565 + INT + + + 566 + PRICE + + + 567 + INT + 1 + 99 + + + 568 + STRING + + + 569 + INT + 0 + 1 + 2 + 3 + 4 + + + 570 + BOOLEAN + + + 571 + STRING + + + 572 + STRING + + + 573 + CHAR + 0 + 1 + 2 + + + 574 + STRING + 1 + 2 + 3 + 4 + 5 + 6 + 7 + A1 + A2 + A3 + A4 + A5 + M3 + M4 + M5 + M6 + AQ + M1 + M2 + MT + S1 + S2 + S3 + S4 + S5 + 60 + 61 + 62 + 63 + 64 + 65 + + + 575 + BOOLEAN + + + 576 + NUMINGROUP + + + 577 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 578 + STRING + + + 579 + STRING + + + 580 + INT + + + 581 + INT + 1 + 2 + 3 + 4 + 6 + 7 + 8 + + + 582 + INT + 1 + 2 + 3 + 4 + + + 583 + STRING + + + 584 + STRING + + + 585 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 586 + UTCTIMESTAMP + + + 587 + CHAR + + + 588 + LOCALMKTDATE + + + 589 + CHAR + 0 + 1 + 2 + + + 590 + CHAR + 0 + 1 + 2 + + + 591 + CHAR + 0 + 1 + + + 592 + COUNTRY + + + 593 + STRING + + + 594 + STRING + + + 595 + STRING + + + 596 + COUNTRY + + + 597 + STRING + + + 598 + STRING + + + 599 + STRING + + + 600 + STRING + + + 601 + STRING + + + 602 + STRING + + + 603 + STRING + + + 604 + STRING + + + 605 + STRING + + + 606 + STRING + + + 607 + INT + + + 608 + STRING + + + 609 + STRING + + + 610 + MONTH-YEAR + + + 611 + LOCALMKTDATE + + + 612 + PRICE + + + 613 + CHAR + + + 614 + FLOAT + + + 615 + PERCENTAGE + + + 616 + EXCHANGE + + + 617 + STRING + + + 618 + LENGTH + + + 619 + DATA + + + 620 + STRING + + + 621 + LENGTH + + + 622 + DATA + + + 623 + FLOAT + + + 624 + CHAR + + + 625 + STRING + + + 626 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 627 + NUMINGROUP + + + 628 + STRING + + + 629 + UTCTIMESTAMP + + + 630 + SEQNUM + + + 631 + PRICE + + + 632 + PERCENTAGE + + + 633 + PERCENTAGE + + + 634 + PERCENTAGE + + + 635 + STRING + B + C + E + F + H + I + L + M + 1 + 2 + 3 + 4 + 5 + 9 + + + 636 + BOOLEAN + + + 637 + PRICE + + + 638 + INT + 0 + 1 + + + 639 + PRICEOFFSET + + + 640 + PRICE + + + 641 + PRICEOFFSET + + + 642 + PRICEOFFSET + + + 643 + PRICEOFFSET + + + 644 + STRING + + + 645 + PRICE + + + 646 + PRICE + + + 647 + QTY + + + 648 + QTY + + + 649 + STRING + + + 650 + BOOLEAN + + + 651 + PRICE + + + 652 + QTY + + + 653 + INT + 0 + 1 + 2 + 3 + 4 + + + 654 + STRING + + + 655 + STRING + + + 656 + FLOAT + + + 657 + FLOAT + + + 658 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 99 + + + 659 + STRING + + + 660 + INT + 1 + 2 + 3 + 4 + 5 + 99 + + + 661 + INT + + + 662 + PRICE + + + 663 + INT + + + 664 + STRING + + + 665 + INT + 1 + 2 + 3 + 4 + 5 + + + 666 + INT + 0 + 1 + 2 + + + 667 + MONTH-YEAR + + + 668 + INT + 1 + 2 + + + 669 + PRICE + + + 670 + NUMINGROUP + + + 671 + STRING + + + 672 + STRING + + + 673 + QTY + + + 674 + STRING + + + 675 + CURRENCY + + + 676 + CURRENCY + + + 677 + STRING + + + 678 + STRING + + + 679 + PRICE + + + 680 + INT + + + 681 + PRICE + + + 682 + STRING + + + 683 + NUMINGROUP + + + 684 + PRICE + + + 685 + QTY + + + 686 + INT + + + 687 + QTY + + + 688 + STRING + + + 689 + STRING + + + 690 + INT + 1 + 2 + 4 + 5 + + + 691 + STRING + + + 692 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + 693 + STRING + + + 694 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 695 + CHAR + + + 696 + LOCALMKTDATE + + + 697 + PRICE + + + 698 + INT + + + 699 + STRING + + + 700 + BOOLEAN + + + 701 + LOCALMKTDATE + + + 702 + NUMINGROUP + + + 703 + STRING + TQ + IAS + IES + FIN + SOD + EX + AS + TX + TA + PIT + TRF + ETR + ALC + PA + ASF + DLV + TOT + XM + SPL + RCV + CAA + DN + EP + + + 704 + QTY + + + 705 + QTY + + + 706 + INT + 0 + 1 + 2 + + + 707 + STRING + FMTM + IMTM + TVAR + SMTM + PREM + CRES + CASH + VADJ + SETL + + + 708 + AMT + + + 709 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 710 + STRING + + + 711 + NUMINGROUP + + + 712 + INT + 1 + 2 + 3 + 4 + + + 713 + STRING + + + 714 + STRING + + + 715 + LOCALMKTDATE + + + 716 + STRING + ITD + RTH + ETH + EOD + + + 717 + STRING + + + 718 + INT + 0 + 1 + 2 + 3 + + + 719 + BOOLEAN + + + 720 + BOOLEAN + + + 721 + STRING + + + 722 + INT + 0 + 1 + 2 + 3 + 4 + + + 723 + INT + 0 + 1 + 99 + + + 724 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 725 + INT + 0 + 1 + + + 726 + STRING + + + 727 + INT + + + 728 + INT + 0 + 1 + 2 + 3 + 4 + 99 + + + 729 + INT + 0 + 1 + 2 + + + 730 + PRICE + + + 731 + INT + 1 + 2 + + + 732 + PRICE + + + 733 + INT + + + 734 + PRICE + + + 735 + NUMINGROUP + + + 736 + CURRENCY + + + 737 + AMT + + + 738 + AMT + + + 739 + LOCALMKTDATE + + + 740 + STRING + + + 741 + AMT + + + 742 + AMT + + + 743 + LOCALMKTDATE + + + 744 + CHAR + R + P + + + 745 + QTY + + + 746 + AMT + + + 747 + CHAR + A + M + + + 748 + INT + + + 749 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 8 + 9 + 99 + 100 + 200 + + + 750 + INT + 0 + 1 + 2 + + + 751 + INT + 0 + 1 + 2 + 3 + 4 + 99 + + + 752 + INT + 1 + 2 + 3 + + + 753 + NUMINGROUP + + + 754 + BOOLEAN + + + 755 + STRING + + + 756 + NUMINGROUP + + + 757 + STRING + + + 758 + CHAR + + + 759 + INT + + + 760 + STRING + + + 761 + STRING + + + 762 + STRING + + + 763 + STRING + + + 764 + STRING + + + 765 + PERCENTAGE + + + 766 + AMT + + + 767 + CURRENCY + + + 768 + NUMINGROUP + + + 769 + UTCTIMESTAMP + + + 770 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 771 + STRING + + + 772 + STRING + + + 773 + INT + 1 + 2 + 3 + + + 774 + INT + 1 + 2 + 99 + + + 775 + INT + 0 + 1 + 2 + + + 776 + INT + + + 777 + STRING + + + 778 + NUMINGROUP + + + 779 + UTCTIMESTAMP + + + 780 + INT + 0 + 1 + 2 + 3 + 4 + + + 781 + NUMINGROUP + + + 782 + STRING + + + 783 + CHAR + + + 784 + INT + + + 785 + STRING + + + 786 + INT + + + 787 + CHAR + S + C + + + 788 + INT + 1 + 2 + 3 + 4 + + + 789 + SEQNUM + + + 790 + STRING + + + 791 + STRING + + + 792 + INT + 0 + 1 + 2 + 99 + + + 793 + STRING + + + 794 + INT + 3 + 4 + 5 + 8 + 2 + 9 + 10 + 11 + 12 + 14 + + + 795 + STRING + + + 796 + INT + 1 + 2 + 99 + + + 797 + BOOLEAN + + + 798 + INT + 1 + 2 + 3 + 4 + 6 + 7 + 8 + + + 799 + PRICE + + + 800 + QTY + + + 801 + NUMINGROUP + + + 802 + NUMINGROUP + + + 803 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + + + 804 + NUMINGROUP + + + 805 + INT + + + 806 + NUMINGROUP + + + 807 + INT + + + 808 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 810 + PRICE + + + 811 + FLOAT + + + 812 + INT + + + 813 + INT + + + 814 + INT + 0 + 1 + 2 + 3 + + + 815 + INT + 0 + 1 + 2 + 3 + + + 816 + NUMINGROUP + + + 817 + STRING + + + 818 + STRING + + + 819 + INT + 0 + 1 + 2 + + + 820 + STRING + + + 821 + STRING + + + 822 + STRING + + + 823 + STRING + + + 824 + STRING + + + 825 + STRING + + + 826 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 827 + INT + 0 + 1 + + + 828 + INT + 0 + 1 + 10 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 33 + 34 + 35 + 36 + 37 + 38 + 39 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 54 + + + 829 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 + 29 + 30 + 31 + 32 + 1000 + 1004 + 1005 + 1006 + 1007 + 1008 + 1009 + 1010 + 1011 + 1012 + 1013 + 2001 + 3001 + 1018 + 1019 + 1020 + 1021 + 1022 + 1023 + 1024 + 1025 + 1026 + 1027 + 1028 + 1029 + 2002 + 1031 + 1032 + 1033 + + + 830 + STRING + + + 831 + STRING + + + 832 + INT + + + 833 + STRING + + + 834 + PRICEOFFSET + + + 835 + INT + 0 + 1 + + + 836 + INT + 0 + 1 + 2 + 3 + + + 837 + INT + 0 + 1 + 2 + + + 838 + INT + 1 + 2 + + + 839 + PRICE + + + 840 + INT + 1 + 2 + 3 + 4 + + + 841 + INT + 0 + 1 + + + 842 + INT + 0 + 1 + 2 + 3 + + + 843 + INT + 0 + 1 + 2 + + + 844 + INT + 1 + 2 + + + 845 + PRICE + + + 846 + INT + 1 + 2 + 3 + 4 + + + 847 + INT + 1 + 2 + 3 + + + 848 + STRING + + + 849 + PERCENTAGE + + + 850 + FLOAT + + + 851 + INT + 1 + 2 + 3 + + + 852 + BOOLEAN + + + 853 + INT + 0 + 1 + 2 + 3 + 4 + 5 + + + 854 + INT + 0 + 1 + 2 + + + 855 + INT + + + 856 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 857 + INT + 0 + 1 + + + 858 + AMT + + + 859 + STRING + + + 860 + PRICE + + + 861 + PRICE + + + 862 + NUMINGROUP + + + 863 + QTY + + + 864 + NUMINGROUP + + + 865 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 99 + + + 866 + LOCALMKTDATE + + + 867 + PRICE + + + 868 + STRING + + + 869 + PERCENTAGE + + + 870 + NUMINGROUP + + + 871 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 99 + + + 872 + STRING + + + 873 + LOCALMKTDATE + + + 874 + LOCALMKTDATE + + + 875 + INT + 1 + 2 + 99 + + + 876 + STRING + + + 877 + STRING + + + 878 + STRING + + + 879 + QTY + + + 880 + STRING + + + 881 + STRING + + + 882 + PRICE + + + 883 + PRICE + + + 884 + AMT + + + 885 + AMT + + + 886 + AMT + + + 887 + NUMINGROUP + + + 888 + STRING + + + 889 + STRING + + + 890 + AMT + + + 891 + INT + 0 + 1 + 2 + + + 892 + INT + + + 893 + BOOLEAN + + + 894 + STRING + + + 895 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 896 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 897 + NUMINGROUP + + + 898 + PERCENTAGE + + + 899 + AMT + + + 900 + AMT + + + 901 + AMT + + + 902 + STRING + + + 903 + INT + 0 + 1 + 2 + 3 + 4 + + + 904 + STRING + + + 905 + INT + 0 + 1 + 2 + 3 + + + 906 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 99 + + + 907 + STRING + + + 908 + STRING + + + 909 + STRING + + + 910 + INT + 0 + 1 + 2 + 3 + 4 + + + 911 + INT + + + 912 + BOOLEAN + + + 913 + STRING + + + 914 + STRING + + + 915 + LOCALMKTDATE + + + 916 + LOCALMKTDATE + + + 917 + LOCALMKTDATE + + + 918 + CURRENCY + + + 919 + INT + 0 + 1 + 2 + 3 + + + 920 + AMT + + + 921 + AMT + + + 922 + AMT + + + 923 + STRING + + + 924 + INT + 1 + 2 + 3 + 4 + + + 925 + STRING + + + 926 + INT + 1 + 2 + 3 + 4 + 5 + 6 + + + 927 + STRING + + + 928 + INT + 1 + 2 + 3 + 4 + + + 929 + STRING + + + 930 + STRING + + + 931 + STRING + + + 932 + STRING + + + 933 + STRING + + + 934 + STRING + + + 935 + INT + 1 + 2 + 4 + 8 + + + 936 + NUMINGROUP + + + 937 + INT + 1 + 2 + + + 938 + NUMINGROUP + + + 939 + INT + 0 + 1 + 3 + + + 940 + INT + 1 + 2 + 3 + + + 941 + CURRENCY + + + 942 + CURRENCY + + + 943 + STRING + + + 944 + INT + 0 + 1 + 2 + + + 945 + INT + 0 + 1 + 2 + 3 + 4 + + + 946 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 99 + + + 947 + CURRENCY + + + 948 + NUMINGROUP + + + 949 + STRING + + + 950 + CHAR + + + 951 + INT + + + 952 + NUMINGROUP + + + 953 + STRING + + + 954 + INT + + + 955 + MONTH-YEAR + + + 956 + LOCALMKTDATE + + + 957 + NUMINGROUP + + + 958 + STRING + + + 959 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + + + 960 + STRING + + + 961 + STRING + + + 962 + UTCTIMESTAMP + + + 963 + INT + + + 964 + INT + + + 965 + STRING + 1 + 2 + + + 966 + STRING + + + 967 + FLOAT + + + 968 + FLOAT + + + 969 + FLOAT + + + 970 + INT + + + 971 + INT + + + 972 + PERCENTAGE + + + 973 + AMT + + + 974 + STRING + FIXED + DIFF + + + 975 + INT + 2 + 4 + 5 + + + 976 + LOCALMKTDATE + + + 977 + STRING + + + 978 + BOOLEAN + + + 979 + STRING + + + 980 + CHAR + A + D + M + + + 981 + NUMINGROUP + + + 982 + INT + 1 + 2 + 3 + 4 + 5 + + + 983 + QTY + + + 984 + NUMINGROUP + + + 985 + AMT + + + 986 + AMT + + + 987 + LOCALMKTDATE + + + 988 + STRING + + + 989 + STRING + + + 990 + STRING + + + 991 + PRICE + + + 992 + INT + 1 + 2 + + + 993 + STRING + + + 994 + STRING + + + 996 + STRING + MWh + MMBtu + Bbl + Gal + t + tn + MMbbl + lbs + oz_tr + USD + Bcf + Bu + + + 997 + STRING + S + Min + H + D + Wk + Mo + Yr + + + 998 + STRING + + + 999 + STRING + + + 1000 + STRING + + + 1001 + STRING + + + 1002 + INT + 1 + 2 + 3 + + + 1003 + STRING + + + 1005 + STRING + + + 1006 + STRING + + + 1007 + STRING + + + 1008 + INT + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + 1009 + INT + + + 1011 + STRING + + + 1012 + UTCTIMESTAMP + + + 1013 + INT + + + 1014 + STRING + + + 1015 + CHAR + 0 + 1 + + + 1016 + NUMINGROUP + + + 1017 + FLOAT + + + 1018 + NUMINGROUP + + + 1019 + STRING + + + 1020 + QTY + + + 1021 + INT + 1 + 2 + 3 + + + 1022 + STRING + + + 1023 + INT + + + 1024 + INT + 0 + 1 + 2 + + + 1025 + PRICE + + + 1026 + FLOAT + + + 1027 + PRICEOFFSET + + + 1028 + BOOLEAN + + + 1029 + BOOLEAN + + + 1030 + STRING + + + 1031 + MULTIPLESTRINGVALUE + ADD + AON + CNH + DIR + E.W + FOK + IO + IOC + LOO + LOC + MAO + MAC + MOO + MOC + MQT + NH + OVD + PEG + RSV + S.W + SCL + TMO + TS + WRK + + + 1032 + INT + 1 + + + 1033 + STRING + A + AR + D + IN + IS + O + PF + PR + PT + S + T + + + 1034 + INT + 1 + + + 1035 + MULTIPLESTRINGVALUE + ADD + AON + CNH + DIR + E.W + FOK + IO + IOC + LOO + LOC + MAO + MAC + MOO + MOC + MQT + NH + OVD + PEG + RSV + S.W + SCL + TMO + TS + WRK + + + 1036 + CHAR + 0 + 1 + 2 + + + 1037 + AMT + + + 1038 + AMT + + + 1039 + STRING + + + 1040 + STRING + + + 1041 + STRING + + + 1042 + STRING + + + 1043 + INT + 0 + 1 + + + 1044 + QTY + + + 1045 + FLOAT + + + 1046 + CHAR + M + D + + + 1047 + CHAR + O + C + R + F + + + 1048 + PRICEOFFSET + + + 1049 + CHAR + + + 1050 + CHAR + + + 1051 + INT + + + 1052 + NUMINGROUP + + + 1053 + STRING + + + 1054 + INT + + + 1055 + STRING + + + 1056 + QTY + + + 1057 + BOOLEAN + + + 1058 + NUMINGROUP + + + 1059 + STRING + + + 1060 + CHAR + + + 1061 + INT + + + 1062 + NUMINGROUP + + + 1063 + STRING + + + 1064 + INT + + + 1065 + PRICEOFFSET + + + 1066 + PRICEOFFSET + + + 1067 + PRICEOFFSET + + + 1068 + PRICEOFFSET + + + 1069 + PRICEOFFSET + + + 1070 + INT + 0 + 1 + 2 + 3 + 4 + + + 1071 + PRICEOFFSET + + + 1072 + AMT + + + 1073 + PRICEOFFSET + + + 1074 + QTY + + + 1075 + AMT + + + 1079 + TZTIMEONLY + + + 1080 + STRING + + + 1081 + CHAR + 0 + 1 + 2 + 3 + + + 1082 + QTY + + + 1083 + CHAR + 1 + 2 + + + 1084 + CHAR + 1 + 2 + 3 + 4 + + + 1085 + QTY + + + 1086 + QTY + + + 1087 + QTY + + + 1088 + QTY + + + 1089 + QTY + + + 1090 + INT + + + 1091 + BOOLEAN + + + 1092 + CHAR + 0 + 1 + 2 + 3 + + + 1093 + CHAR + 1 + 2 + 3 + + + 1094 + INT + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + 1095 + PRICE + + + 1096 + STRING + + + 1097 + STRING + + + 1098 + STRING + + + 1099 + STRING + + + 1100 + CHAR + 1 + 2 + 3 + 4 + + + 1101 + CHAR + 1 + 2 + 3 + + + 1102 + PRICE + + + 1103 + STRING + + + 1104 + STRING + + + 1105 + STRING + + + 1106 + STRING + + + 1107 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + + + 1108 + CHAR + 0 + 1 + 2 + 3 + + + 1109 + CHAR + U + D + + + 1110 + PRICE + + + 1111 + CHAR + 1 + 2 + + + 1112 + QTY + + + 1113 + STRING + + + 1114 + STRING + + + 1115 + CHAR + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 1116 + NUMINGROUP + + + 1117 + STRING + + + 1118 + CHAR + + + 1119 + INT + + + 1120 + NUMINGROUP + + + 1121 + STRING + + + 1122 + INT + + + 1123 + CHAR + 0 + 1 + 2 + 3 + 4 + + + 1124 + CHAR + + + 1125 + LOCALMKTDATE + + + 1126 + STRING + + + 1127 + STRING + + + 1128 + STRING + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + + + 1129 + STRING + + + 1130 + STRING + + + 1131 + STRING + + + 1132 + TZTIMESTAMP + + + 1133 + CHAR + B + C + D + E + G + + + 1134 + BOOLEAN + + + 1135 + STRING + + + 1136 + STRING + + + 1137 + STRING + 9 + + + 1138 + QTY + + + 1139 + STRING + + + 5450 + INT + 1 + 2 + 11 + 12 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + + + 8000 + UTCTIMESTAMP + + + 9000 + INT + + + 9001 + STRING + + + 9002 + STRING + + + 9995 + LOCALMKTDATE + + + 1167 + CHAR + 5 + + + 1166 + STRING + + + 1180 + STRING + + + 1181 + SEQNUM + + + 1182 + SEQNUM + + + 1183 + SEQNUM + + + 1300 + STRING + + + 1301 + STRING + + + 1328 + STRING + + + 1346 + STRING + + + 1347 + STRING + + + 1350 + SEQNUM + + + 1351 + NUMINGROUP + + + 1352 + BOOLEAN + + + 1353 + STRING + + + 1354 + INT + 0 + 1 + 2 + + + 1355 + STRING + + + 1357 + SEQNUM + + + 1369 + STRING + + + 1427 + STRING + + + 1444 + INT + 1 + 2 + 4 + + + 1461 + NUMINGROUP + + + 1462 + STRING + + + 1463 + CHAR + D + + + 1464 + INT + 1 + 76 + + + 9730 + CHAR + A + R + C + + + 20000 + CHAR + 0 + 1 + 2 + + + 20100 + PRICE + + + 20110 + INT + 0 + 1 + + + 20111 + INT + 0 + 1 + + + 27010 + INT + 0 + 99 + 100 + 1 + 2 + 3 + + + + + Group + 1461 + NUMINGROUP + + + + + + Group + 552 + NUMINGROUP + + + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 552 + NUMINGROUP + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 1461 + NUMINGROUP + + + + + + Group + 295 + NUMINGROUP + + + + + Group + 296 + NUMINGROUP + + + + + Group + 295 + NUMINGROUP + + + + + + + + Group + 454 + NUMINGROUP + + + + + Group + 552 + NUMINGROUP + + + + + + + + + + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 454 + NUMINGROUP + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 1351 + NUMINGROUP + + + + + + Group + 1351 + NUMINGROUP + + + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 453 + NUMINGROUP + + + + + + Group + 386 + NUMINGROUP + + + + Group + 73 + NUMINGROUP + + + + + + Group + 398 + NUMINGROUP + + + + Message + false + D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Message + false + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component + + + + Component + + + + Component + + + + Component + + + + Header + + + + + + + + + + + + + + + + Trailer + + + + Message + true + A + + + + + + + + + + + + + Message + true + 5 + + + + + + + Message + true + 0 + + + + + + Message + true + 1 + + + + + + Message + true + 2 + + + + + + + Message + true + 3 + + + + + + + + + + Message + true + 4 + + + + + + + From b3f3b32c5794ed908030bfe9bed542600a721c5a Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:31:16 +0400 Subject: [PATCH 12/15] required tags validation in nested components (#6) --- .gitlab-ci.yml | 7 - .../exactpro/th2/codec/fixng/FixNgCodec.kt | 70 ++- .../th2/codec/fixng/FixNgCodecTest.kt | 442 ++++++++++++++---- src/test/resources/dictionary.xml | 22 + 4 files changed, 430 insertions(+), 111 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 08668be..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,7 +0,0 @@ -variables: - APP_NAME: th2-codec-fix-ng - -include: - - project: vivarium/th2/pipelines - ref: v2 - file: /.gitlab-ci-java.yml diff --git a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt index 91ab6b3..bb044be 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/fixng/FixNgCodec.kt @@ -207,10 +207,12 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) targetMap[name] = decodedValue } - private val prereadHeaderFields = arrayOf("BeginString", "BodyLength", "MsgType") + private val prereadHeaderTags = arrayOf(8 /* BeginString */, 9 /* BodyLength */, 35 /* MsgType */) private fun Message.decode(source: ByteBuf, bodyDef: Message, isDirty: Boolean, dictionaryFields: Map, context: IReportingContext): MutableMap = mutableMapOf().also { map -> - val tagsSet: MutableSet = hashSetOf() + val tagsSet: MutableSet = hashSetOf(*prereadHeaderTags) + val usedComponents = mutableSetOf() + source.forEachField(charset, isDirty) { tag, value -> val field = get(tag) ?: if (isDirty) { when (this) { @@ -232,21 +234,23 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) return@forEachField false } + usedComponents.addAll(field.path) + field.decode(source, map, tagsSet, value, tag, isDirty, context) return@forEachField true } - for (field in fields.values) { - if (!field.isRequired) continue - - val tag = when (field) { - is Primitive -> field.tag - is Group -> field.counter - else -> error("Only `Primitive` and `Group` fields expected to be `required`") - } + validateRequiredTags(requiredTags, tagsSet, isDirty, context) + for (componentName in usedComponents) { + val requiredTags = conditionallyRequiredTags[componentName] ?: continue + validateRequiredTags(requiredTags, tagsSet, isDirty, context) + } + } - if (!tagsSet.contains(tag) && field.name !in prereadHeaderFields) { - handleError(isDirty, context, "Required field missing. Field name: ${field.name}.") + private fun validateRequiredTags(requiredTags: Set, tagsSet: Set, isDirty: Boolean, context: IReportingContext) { + for (tag in requiredTags) { + if (!tagsSet.contains(tag)) { + handleError(isDirty, context, "Required tag missing. Tag: $tag.") } } } @@ -363,7 +367,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}") + else -> handleError(isDirty, context, "Wrong type value in field ${field.name}. Actual: ${value.javaClass} (value: $value). Expected ${field.primitiveType}", value) } val stringValue = when (valueToEncode) { @@ -480,6 +484,8 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) override val path: List, val type: String, override val fields: Map, + val requiredTags: Set, + val conditionallyRequiredTags: Map> ) : Field, FieldMap() data class Group( @@ -565,7 +571,7 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) fields.forEach { (name, field) -> when { field !is IMessageStructure -> this[name] = field.toPrimitive(path, isForEncode || isRequiredParent) - field.isGroup -> this[name] = field.toGroup(isForEncode, path, isForEncode || isRequiredParent) + field.isGroup -> this[name] = field.toGroup(isForEncode, path) field.isComponent -> if (isForEncode) { this[name] = field.toMessage(true, path + name) } else { @@ -579,31 +585,59 @@ class FixNgCodec(dictionary: IDictionaryStructure, settings: FixNgCodecSettings) fields.values.forEach { field -> when { field !is IMessageStructure -> this[field.tag] = field.toPrimitive(path, true) - field.isGroup -> this[field.tag] = field.toGroup(false, path, true) + field.isGroup -> this[field.tag] = field.toGroup(false, path) field.isComponent -> this += convertToFieldsByTag(field.fields, path + field.name) } } } + private fun collectRequiredTags(fields: Map, target: MutableSet): Set { + for (field in fields.values) { + when { + !field.isRequired -> continue + field !is IMessageStructure -> target.add(field.tag) + field.isGroup -> target.add(field.tag) + field.isComponent -> collectRequiredTags(field.fields, target) + } + } + return target + } + + private fun collectConditionallyRequiredTags(fields: Map, target: MutableMap>): Map> { + for (field in fields.values) { + if (field is IMessageStructure && field.isComponent) { + val isCurrentRequired = field.isRequired + // There is no point in adding tags from optional components that contain only one field + // (such a field is effectively optional even if it has a required flag). + if (!isCurrentRequired && field.fields.size > 1) { + target[field.name] = collectRequiredTags(field.fields, mutableSetOf()) + } + } + } + return target + } + private fun IMessageStructure.toMessage(isForEncode: Boolean, path: List): Message = Message( name = name, type = StructureUtils.getAttributeValue(this, FIELD_MESSAGE_TYPE) ?: name, fields = convertToFieldsByName(this.fields, isForEncode, path, !isComponent || isRequired), path = path, - isRequired = isRequired + isRequired = isRequired, + requiredTags = if (isForEncode) emptySet() else collectRequiredTags(fields, mutableSetOf()), + conditionallyRequiredTags = if (isForEncode) emptyMap() else collectConditionallyRequiredTags(fields, mutableMapOf()) ) private fun getFirstTag(message: IMessageStructure): Int = message.fields.values.first().let { if (it is IMessageStructure && it.isComponent) getFirstTag(it) else it.tag } - private fun IMessageStructure.toGroup(isForEncode: Boolean, path: List, isRequiredParent: Boolean): Group = Group( + private fun IMessageStructure.toGroup(isForEncode: Boolean, path: List): Group = Group( name = name, counter = tag, delimiter = getFirstTag(this), fields = convertToFieldsByName(this.fields, isForEncode, emptyList(), true), path = path, - isRequired = isRequiredParent && isRequired + isRequired = isRequired ) fun IDictionaryStructure.toMessages(isForEncode: Boolean): List = messages.values diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt index 68240e2..ae498bb 100644 --- a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt @@ -31,6 +31,8 @@ import io.netty.buffer.Unpooled import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.Test +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.ValueSource import java.math.BigDecimal import java.nio.charset.StandardCharsets import java.time.Instant @@ -58,31 +60,45 @@ class FixNgCodecTest { } } - @Test - fun `simple encode`() = encodeTest(MSG_CORRECT) + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `simple encode`(isDirty: Boolean) = encodeTest(MSG_CORRECT, dirtyMode = isDirty) - @Test - fun `simple encode from string values`() = encodeTest(MSG_CORRECT, encodeFromStringValues = true) + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `simple encode from string values`(isDirty: Boolean) = encodeTest(MSG_CORRECT, dirtyMode = isDirty, encodeFromStringValues = true) - @Test - fun `simple decode`() = decodeTest(MSG_CORRECT) + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `simple decode`(isDirty: Boolean) = decodeTest(MSG_CORRECT, dirtyMode = isDirty) - @Test - fun `simple decode to string values`() = decodeTest(MSG_CORRECT, decodeToStringValues = true) + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `simple decode to string values`(isDirty: Boolean) = decodeTest(MSG_CORRECT, decodeToStringValues = true, dirtyMode = isDirty) - @Test - fun `simple decode with no body`() = decodeTest(MSG_CORRECT_WITHOUT_BODY, expectedMessage = expectedMessageWithoutBody) + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `simple decode with no body`(isDirty: Boolean) = decodeTest(MSG_CORRECT_WITHOUT_BODY, expectedMessage = expectedMessageWithoutBody, dirtyMode = isDirty) + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with addition field that exists in dictionary`(isDirty: Boolean) { + parsedBody["CFICode"] = "12345" + encodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.", dirtyMode = isDirty) + } @Test - fun `encode with addition field that exists in dictionary`() { + fun `decode with addition field that exists in dictionary (dirty)`() { parsedBody["CFICode"] = "12345" - encodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.") + decodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.", dirtyMode = true) } @Test - fun `decode with addition field that exists in dictionary`() { + fun `decode with addition field that exists in dictionary (non dirty)`() { parsedBody["CFICode"] = "12345" - decodeTest(MSG_ADDITIONAL_FIELD_DICT, "Unexpected field in message. Field name: CFICode. Field value: 12345.") + // note: Unknown tag in the message causes the processing of messages to stop and moves on to the next part of + // the message. As a result, required tags remain unread, which leads to the following error. + decodeTest(MSG_ADDITIONAL_FIELD_DICT, "Required tag missing. Tag: 10.", dirtyMode = false) } @Test @@ -95,119 +111,155 @@ class FixNgCodecTest { } @Test - fun `decode with addition field that does not exists in dictionary`() { + fun `decode with addition field that does not exists in dictionary (dirty)`() { + parsedBody["9999"] = "54321" + decodeTest(MSG_ADDITIONAL_FIELD_NO_DICT, "Field does not exist in dictionary. Field tag: 9999. Field value: 54321.", dirtyMode = true) + } + + @Test + fun `decode with addition field that does not exists in dictionary (non dirty)`() { parsedBody["9999"] = "54321" - decodeTest(MSG_ADDITIONAL_FIELD_NO_DICT, "Field does not exist in dictionary. Field tag: 9999. Field value: 54321.") + // note: Unknown tag in the message causes the processing of messages to stop and moves on to the next part of + // the message. As a result, required tags remain unread, which leads to the following error. + decodeTest(MSG_ADDITIONAL_FIELD_NO_DICT, "Required tag missing. Tag: 10.", dirtyMode = false) } @Test - fun `encode with addition field that contain tag instead of name`() { + fun `encode with addition field that contain tag instead of name (dirty)`() { parsedBody["9999"] = "12345" // field doesn't exist in dictionary - encodeTest(MSG_ADDITIONAL_FIELD_TAG, "Tag instead of field name. Field name: 9999. Field value: 12345.") + encodeTest(MSG_ADDITIONAL_FIELD_TAG, "Tag instead of field name. Field name: 9999. Field value: 12345.", dirtyMode = true) } @Test - fun `encode with required field removed`() { + fun `encode with addition field that contain tag instead of name (non dirty)`() { + parsedBody["9999"] = "12345" // field doesn't exist in dictionary + encodeTest(MSG_ADDITIONAL_FIELD_TAG, "Unexpected field in message. Field name: 9999. Field value: 12345.", dirtyMode = false) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with required field removed`(isDirty: Boolean) { parsedBody.remove("ExecID") - encodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required field missing. Field name: ExecID.") + encodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required field missing. Field name: ExecID.", dirtyMode = isDirty) } - @Test - fun `decode with required field removed`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with required field removed`(isDirty: Boolean) { parsedBody.remove("ExecID") - decodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required field missing. Field name: ExecID.") + decodeTest(MSG_REQUIRED_FIELD_REMOVED, "Required tag missing. Tag: 17.", dirtyMode = isDirty) } - @Test - fun `encode with required delimiter field in group removed in first entry`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with required delimiter field in group removed in first entry`(isDirty: Boolean) { @Suppress("UNCHECKED_CAST") ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[0].remove("PartyID") - encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Required field missing. Field name: PartyID.") + encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Required field missing. Field name: PartyID.", dirtyMode = isDirty) } - @Test - fun `decode with required delimiter field in group removed in first entry`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with required delimiter field in group removed in first entry`(isDirty: Boolean) { @Suppress("UNCHECKED_CAST") ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[0].remove("PartyID") - decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)") + decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_FIRST_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)", dirtyMode = isDirty) } - @Test - fun `encode with required delimiter field in group removed in second entry`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with required delimiter field in group removed in second entry`(isDirty: Boolean) { @Suppress("UNCHECKED_CAST") ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[1].remove("PartyID") - encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Required field missing. Field name: PartyID.") + encodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Required field missing. Field name: PartyID.", dirtyMode = isDirty) } - @Test - fun `decode with required delimiter field in group removed in second entry`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with required delimiter field in group removed in second entry`(isDirty: Boolean) { @Suppress("UNCHECKED_CAST") ((parsedBody["TradingParty"] as Map)["NoPartyIDs"] as List>)[1].remove("PartyID") - decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)") + decodeTest(MSG_DELIMITER_FIELD_IN_GROUP_REMOVED_IN_SECOND_ENTRY, "Field PartyIDSource (447) appears before delimiter (448)", dirtyMode = isDirty) } - @Test - fun `encode with wrong enum value`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with wrong enum value`(isDirty: Boolean) { parsedBody["ExecType"] = 'X' - encodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.") + encodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.", dirtyMode = isDirty) } - @Test - fun `decode with wrong enum value`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with wrong enum value`(isDirty: Boolean) { parsedBody["ExecType"] = 'X' - decodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.") + decodeTest(MSG_WRONG_ENUM, "Invalid value in enum field ExecType. Actual: X.", dirtyMode = isDirty) } - @Test - fun `encode with correct enum value as string`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with correct enum value as string`(isDirty: Boolean) { parsedBody["ExecType"] = "0" - encodeTest(MSG_CORRECT) + encodeTest(MSG_CORRECT, dirtyMode = isDirty) } - @Test - fun `encode with wrong value type`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with wrong value type`(isDirty: Boolean) { parsedBody["LeavesQty"] = "Five" // String instead of BigDecimal - encodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.") + encodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.", dirtyMode = isDirty) } - @Test - fun `encode with correct BigDecimal value in string`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with correct BigDecimal value in string`(isDirty: Boolean) { parsedBody["LeavesQty"] = "500" // String instead of BigDecimal - encodeTest(MSG_CORRECT) + encodeTest(MSG_CORRECT, dirtyMode = isDirty) } - @Test - fun `decode with wrong value type`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with wrong value type`(isDirty: Boolean) { parsedBody["LeavesQty"] = "Five" - decodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.") + decodeTest(MSG_WRONG_TYPE, "Wrong number value in java.math.BigDecimal field 'LeavesQty'. Value: Five.", dirtyMode = isDirty) } - @Test - fun `encode with empty value`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with empty value`(isDirty: Boolean) { parsedBody["Account"] = "" - encodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.") + encodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.", dirtyMode = isDirty) } @Test - fun `decode with empty value`() { + fun `decode with empty value (dirty)`() { parsedBody["Account"] = "" - decodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.") + decodeTest(MSG_EMPTY_VAL, "Empty value in the field 'Account'.", dirtyMode = true) } @Test - fun `encode with non printable characters`() { + fun `decode with empty value (non dirty)`() { + parsedBody["Account"] = "" + decodeTest(MSG_EMPTY_VAL, "No valid value at offset: 235", dirtyMode = false) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with non printable characters`(isDirty: Boolean) { parsedBody["Account"] = "test\taccount" - encodeTest(MSG_NON_PRINTABLE, "Non-printable characters in the field 'Account'. Value: test\taccount") + encodeTest(MSG_NON_PRINTABLE, "Non-printable characters in the field 'Account'. Value: test\taccount", dirtyMode = isDirty) } - @Test - fun `decode with non printable characters`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with non printable characters`(isDirty: Boolean) { parsedBody["Account"] = "test\taccount" - decodeTest(MSG_NON_PRINTABLE, "Non printable characters in the field 'Account'.") + decodeTest(MSG_NON_PRINTABLE, "Non printable characters in the field 'Account'.", dirtyMode = isDirty) } - @Test - fun `encode with calculated required fields removed`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with calculated required fields removed`(isDirty: Boolean) { @Suppress("UNCHECKED_CAST") val header = parsedBody["header"] as MutableMap header.remove("BeginString") @@ -215,25 +267,125 @@ class FixNgCodecTest { header.remove("MsgType") @Suppress("UNCHECKED_CAST") (parsedBody["trailer"] as MutableMap).remove("CheckSum") - encodeTest(MSG_CORRECT) + encodeTest(MSG_CORRECT, dirtyMode = isDirty) } - @Test - fun `encode with calculated required header fields removed`() { + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode with calculated required header fields removed`(isDirty: Boolean) { @Suppress("UNCHECKED_CAST") val header = parsedBody["header"] as MutableMap header.remove("SenderCompID") header.remove("TargetCompID") header.remove("MsgSeqNum") header.remove("SendingTime") - encodeTest(MSG_REQUIRED_HEADER_REMOVED) + encodeTest(MSG_REQUIRED_HEADER_REMOVED, dirtyMode = isDirty) } @Test - fun `tag appears out of order`() = - decodeTest(MSG_TAG_OUT_OF_ORDER, "Tag appears out of order: 999", dirtyMode = false) + fun `tag appears out of order (dirty)`() { + @Suppress("UNCHECKED_CAST") + val trailer = parsedBody["trailer"] as MutableMap + trailer["LegUnitOfMeasure"] = "500" + decodeTest(MSG_TAG_OUT_OF_ORDER, "Unexpected field in message. Field name: LegUnitOfMeasure. Field value: 500", dirtyMode = true) + } + + @Test + fun `tag appears out of order (non dirty)`() = decodeTest(MSG_TAG_OUT_OF_ORDER, "Tag appears out of order: 999", dirtyMode = false) + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode nested components`(isDirty: Boolean) = + decodeTest(MSG_NESTED_REQ_COMPONENTS, expectedMessage = parsedMessageWithNestedComponents, dirtyMode = isDirty) + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with missing req field in req nested component`(isDirty: Boolean) { + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["OuterComponent"] as MutableMap>)["InnerComponent"]?.remove("OrdType") + decodeTest(MSG_NESTED_REQ_COMPONENTS_MISSED_REQ, expectedErrorText = "Required tag missing. Tag: 40.", expectedMessage = parsedMessageWithNestedComponents, dirtyMode = isDirty) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with missing optional field in req nested component`(isDirty: Boolean) { + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["OuterComponent"] as MutableMap>)["InnerComponent"]?.remove("Text") + decodeTest(MSG_NESTED_REQ_COMPONENTS_MISSED_OPTIONAL, expectedMessage = parsedMessageWithNestedComponents, dirtyMode = isDirty) + } + + private fun convertToOptionalComponent(): ParsedMessage { + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["header"] as MutableMap)["MsgType"] = "TEST_2" + val msgBuilder = parsedMessageWithNestedComponents.toBuilder() + msgBuilder.setType("NestedOptionalComponentTestMessage") + return msgBuilder.build() + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode nested optional components`(isDirty: Boolean) { + val message = convertToOptionalComponent() + decodeTest(MSG_NESTED_OPT_COMPONENTS, expectedMessage = message, dirtyMode = isDirty) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with missing req field in opt nested component`(isDirty: Boolean) { + val message = convertToOptionalComponent() + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["OuterComponent"] as MutableMap>)["InnerComponent"]?.remove("OrdType") + decodeTest(MSG_NESTED_OPT_COMPONENTS_MISSED_REQ, expectedErrorText = "Required tag missing. Tag: 40.", expectedMessage = message, dirtyMode = isDirty) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with missing all fields in opt nested component`(isDirty: Boolean) { + val message = convertToOptionalComponent() + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["OuterComponent"] as MutableMap>).remove("InnerComponent") + decodeTest(MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_FIELDS, expectedErrorText = "Required tag missing. Tag: 40.", expectedMessage = message, dirtyMode = isDirty) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with missing all fields in inner and outer nested components`(isDirty: Boolean) { + val message = convertToOptionalComponent() + parsedBodyWithNestedComponents.remove("OuterComponent") + decodeTest(MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_FIELDS_INNER_AND_OUTER, expectedMessage = message, dirtyMode = isDirty) + } + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode with missing req fields in both inner and outer components`(isDirty: Boolean) { + val message = convertToOptionalComponent() + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["OuterComponent"] as MutableMap>).remove("LeavesQty") + @Suppress("UNCHECKED_CAST") + (parsedBodyWithNestedComponents["OuterComponent"] as MutableMap>)["InnerComponent"]!!.remove("OrdType") + decodeTest( + MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_OUTER_FIELDS_AND_REQ_INNER_FIELD, + expectedErrorText = "Required tag missing. Tag: 40.", + expectedSecondErrorText = "Required tag missing. Tag: 151.", + expectedMessage = message, + dirtyMode = isDirty + ) + } private fun encodeTest( + expectedRawMessage: String, + expectedError: String? = null, + dirtyMode: Boolean, + encodeFromStringValues: Boolean = false + ) { + if (dirtyMode) { + encodeTestDirty(expectedRawMessage, expectedError, encodeFromStringValues) + } else { + encodeTestNonDirty(expectedRawMessage, expectedError, encodeFromStringValues) + } + } + + private fun encodeTestDirty( expectedRawMessage: String, expectedWarning: String? = null, encodeFromStringValues: Boolean = false @@ -255,33 +407,77 @@ class FixNgCodecTest { } } + private fun encodeTestNonDirty( + expectedRawMessage: String, + expectedError: String? = null, + encodeFromStringValues: Boolean = false + ) { + if (encodeFromStringValues) { + @Suppress("UNCHECKED_CAST") + val stringBody = convertValuesToString(parsedBody) as Map + parsedBody.putAll(stringBody) + } + + val parsed = parsedMessage.toBuilder().apply { metadataBuilder().remove("encode-mode").build() }.build() + + if (expectedError != null) { + assertThatThrownBy { + codec.encode(MessageGroup(listOf(parsed)), reportingContext) + println() + }.isInstanceOf(IllegalStateException::class.java).message() + .startsWith(expectedError) + } else { + val encoded = codec.encode(MessageGroup(listOf(parsed)), reportingContext) + + val body = encoded.messages.single().body as CompositeByteBuf + val fixMsg = body.toString(StandardCharsets.US_ASCII) + assertThat(fixMsg).isEqualTo(expectedRawMessage) + } + } + private fun decodeTest( rawMessageString: String, expectedErrorText: String? = null, + expectedSecondErrorText: String? = null, + expectedMessage: ParsedMessage = parsedMessage, + dirtyMode: Boolean, + decodeToStringValues: Boolean = false + ) { + if (dirtyMode) { + decodeTestDirty( + rawMessageString, + expectedErrorText, + expectedSecondErrorText, + expectedMessage, + decodeToStringValues + ) + } else { + decodeTestNonDirty( + rawMessageString, + expectedErrorText, + expectedMessage, + decodeToStringValues + ) + } + } + + private fun decodeTestDirty( + rawMessageString: String, + expectedErrorText: String? = null, + expectedSecondErrorText: String? = null, expectedMessage: ParsedMessage = parsedMessage, - dirtyMode: Boolean = true, decodeToStringValues: Boolean = false ) { val expectedBody = expectedMessage.body val rawMessage = RawMessage( id = parsedMessage.id, eventId = parsedMessage.eventId, - metadata = if (dirtyMode) mapOf("encode-mode" to "dirty") else emptyMap(), + metadata = mapOf("encode-mode" to "dirty"), body = Unpooled.wrappedBuffer(rawMessageString.toByteArray(Charsets.US_ASCII)) ) - val decodedGroup = try { - val codec = if (decodeToStringValues) FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) else this.codec - codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) - } catch (e: IllegalStateException) { - if (dirtyMode) { - throw e - } else { - assertThat(e.message).startsWith(expectedErrorText) - return - } - } - + val codec = if (decodeToStringValues) FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) else this.codec + val decodedGroup = codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) val parsedMessage = decodedGroup.messages.single() as ParsedMessage // we don't validate `CheckSum` and `BodyLength` in incorrect messages @@ -296,7 +492,42 @@ class FixNgCodecTest { if (expectedErrorText == null) { assertThat(reportingContext.warnings).isEmpty() } else { - assertThat(reportingContext.warnings.single()).startsWith(DIRTY_MODE_WARNING_PREFIX + expectedErrorText) + if (expectedSecondErrorText == null) { + assertThat(reportingContext.warnings.single()).startsWith(DIRTY_MODE_WARNING_PREFIX + expectedErrorText) + } else { + assertThat(reportingContext.warnings).size().isEqualTo(2) + assertThat(reportingContext.warnings[0]).startsWith(DIRTY_MODE_WARNING_PREFIX + expectedErrorText) + assertThat(reportingContext.warnings[1]).startsWith(DIRTY_MODE_WARNING_PREFIX + expectedSecondErrorText) + } + } + } + + private fun decodeTestNonDirty( + rawMessageString: String, + expectedErrorText: String? = null, + expectedMessage: ParsedMessage = parsedMessage, + decodeToStringValues: Boolean = false + ) { + val expectedBody = expectedMessage.body + val rawMessage = RawMessage( + id = parsedMessage.id, + eventId = parsedMessage.eventId, + metadata = emptyMap(), + body = Unpooled.wrappedBuffer(rawMessageString.toByteArray(Charsets.US_ASCII)) + ) + + val codec = if (decodeToStringValues) FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "")) else this.codec + if (expectedErrorText != null) { + assertThatThrownBy { + codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) + }.isInstanceOf(IllegalStateException::class.java).message().startsWith(expectedErrorText) + } else { + val decodedGroup = codec.decode(MessageGroup(listOf(rawMessage)), reportingContext) + val parsedMessage = decodedGroup.messages.single() as ParsedMessage + val expected = if (decodeToStringValues) convertValuesToString(expectedBody) else expectedBody + assertThat(parsedMessage.body) + .usingRecursiveComparison() + .isEqualTo(expected) } } @@ -385,6 +616,35 @@ class FixNgCodecTest { ) ) + private val parsedMessageWithNestedComponents = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "NestedRequiredComponentTestMessage", + mutableMapOf("encode-mode" to "dirty"), + PROTOCOL, + mutableMapOf( + "header" to mutableMapOf( + "BeginString" to "FIXT.1.1", + "BodyLength" to 59, + "MsgType" to "TEST_1", + "MsgSeqNum" to 125, + "TargetCompID" to "INET", + "SenderCompID" to "MZHOT0" + ), + "OuterComponent" to mutableMapOf( + "LeavesQty" to BigDecimal(1234), // tag 151 + "InnerComponent" to mutableMapOf( + "Text" to "text_1", // tag 58 + "OrdType" to '1' // 40 + ) + ), + "trailer" to mapOf( + "CheckSum" to "191" + ) + ) + ) + private val parsedBodyWithNestedComponents: MutableMap = parsedMessageWithNestedComponents.body as MutableMap + companion object { private const val DIRTY_MODE_WARNING_PREFIX = "Dirty mode WARNING: " @@ -402,5 +662,15 @@ class FixNgCodecTest { private const val MSG_NON_PRINTABLE = "8=FIXT.1.1\u00019=303\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\taccount\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=171\u0001" private const val MSG_REQUIRED_HEADER_REMOVED = "8=FIXT.1.1\u00019=236\u000135=8\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=050\u0001" private const val MSG_TAG_OUT_OF_ORDER = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=000\u0001999=500\u0001" + + private const val MSG_NESTED_REQ_COMPONENTS = "8=FIXT.1.19=5935=TEST_149=MZHOT056=INET34=12558=text_140=1151=123410=191" + private const val MSG_NESTED_REQ_COMPONENTS_MISSED_REQ = "8=FIXT.1.19=5935=TEST_149=MZHOT056=INET34=12558=text_1151=123410=191" + private const val MSG_NESTED_REQ_COMPONENTS_MISSED_OPTIONAL = "8=FIXT.1.19=5935=TEST_149=MZHOT056=INET34=12540=1151=123410=191" + + private const val MSG_NESTED_OPT_COMPONENTS = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=12558=text_140=1151=123410=191" + private const val MSG_NESTED_OPT_COMPONENTS_MISSED_REQ = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=12558=text_1151=123410=191" + private const val MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_FIELDS = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=125151=123410=191" + private const val MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_FIELDS_INNER_AND_OUTER = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=12510=191" + private const val MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_OUTER_FIELDS_AND_REQ_INNER_FIELD = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=12558=text_110=191" } } \ No newline at end of file diff --git a/src/test/resources/dictionary.xml b/src/test/resources/dictionary.xml index a04f185..a1f9bd2 100644 --- a/src/test/resources/dictionary.xml +++ b/src/test/resources/dictionary.xml @@ -7361,6 +7361,28 @@ + + Message + false + TEST_1 + + + + Message + false + TEST_2 + + + + Component + + + + + Component + + + Component From d8604e506fc63c57980c5ee136c2762a4ebfaaa7 Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Mon, 16 Sep 2024 17:07:20 +0400 Subject: [PATCH 13/15] tests for nested groups added --- .../th2/codec/fixng/FixNgCodecTest.kt | 66 ++++++++++++++++++- src/test/resources/dictionary.xml | 18 ++++- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt index ae498bb..138170d 100644 --- a/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt +++ b/src/test/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecTest.kt @@ -372,24 +372,36 @@ class FixNgCodecTest { ) } + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `encode nested groups`(isDirty: Boolean) = encodeTest(MSG_NESTED_GROUPS, dirtyMode = isDirty, parsedMessage = parsedMessageWithNestedGroups) + + @ParameterizedTest + @ValueSource(booleans = [true, false]) + fun `decode nested groups`(isDirty: Boolean) = decodeTest(MSG_NESTED_GROUPS, expectedMessage = parsedMessageWithNestedGroups, dirtyMode = isDirty) + private fun encodeTest( expectedRawMessage: String, expectedError: String? = null, dirtyMode: Boolean, - encodeFromStringValues: Boolean = false + encodeFromStringValues: Boolean = false, + parsedMessage: ParsedMessage = this.parsedMessage ) { if (dirtyMode) { - encodeTestDirty(expectedRawMessage, expectedError, encodeFromStringValues) + encodeTestDirty(expectedRawMessage, expectedError, parsedMessage, encodeFromStringValues) } else { - encodeTestNonDirty(expectedRawMessage, expectedError, encodeFromStringValues) + encodeTestNonDirty(expectedRawMessage, expectedError, parsedMessage, encodeFromStringValues) } } private fun encodeTestDirty( expectedRawMessage: String, expectedWarning: String? = null, + parsedMessage: ParsedMessage, encodeFromStringValues: Boolean = false ) { + val parsedBody = parsedMessage.body as MutableMap + if (encodeFromStringValues) { @Suppress("UNCHECKED_CAST") val stringBody = convertValuesToString(parsedBody) as Map @@ -410,8 +422,11 @@ class FixNgCodecTest { private fun encodeTestNonDirty( expectedRawMessage: String, expectedError: String? = null, + parsedMessage: ParsedMessage, encodeFromStringValues: Boolean = false ) { + val parsedBody = parsedMessage.body as MutableMap + if (encodeFromStringValues) { @Suppress("UNCHECKED_CAST") val stringBody = convertValuesToString(parsedBody) as Map @@ -645,6 +660,49 @@ class FixNgCodecTest { ) private val parsedBodyWithNestedComponents: MutableMap = parsedMessageWithNestedComponents.body as MutableMap + private val parsedMessageWithNestedGroups = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "NestedGroupsTestMessage", + mutableMapOf("encode-mode" to "dirty"), + PROTOCOL, + mutableMapOf( + "header" to mutableMapOf( + "BeginString" to "FIXT.1.1", + "BodyLength" to 88, + "MsgType" to "TEST_3", + "MsgSeqNum" to 125, + "TargetCompID" to "INET", + "SenderCompID" to "MZHOT0" + ), + "OuterGroup" to mutableMapOf( + "NoOrders" to mutableListOf( + mutableMapOf( + "NestedGroups" to mutableMapOf( + "NoBidDescriptors" to mutableListOf( + mutableMapOf("BidDescriptorType" to 1), + mutableMapOf("BidDescriptorType" to 2), + mutableMapOf("BidDescriptorType" to 3) + ) + ) + ), + mutableMapOf( + "NestedGroups" to mutableMapOf( + "NoBidDescriptors" to mutableListOf( + mutableMapOf("BidDescriptorType" to 3), + mutableMapOf("BidDescriptorType" to 2), + mutableMapOf("BidDescriptorType" to 1) + ) + ) + ) + ) + ), + "trailer" to mapOf( + "CheckSum" to "211" + ) + ) + ) + companion object { private const val DIRTY_MODE_WARNING_PREFIX = "Dirty mode WARNING: " @@ -672,5 +730,7 @@ class FixNgCodecTest { private const val MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_FIELDS = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=125151=123410=191" private const val MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_FIELDS_INNER_AND_OUTER = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=12510=191" private const val MSG_NESTED_OPT_COMPONENTS_MISSED_ALL_OUTER_FIELDS_AND_REQ_INNER_FIELD = "8=FIXT.1.19=5935=TEST_249=MZHOT056=INET34=12558=text_110=191" + + private const val MSG_NESTED_GROUPS = "8=FIXT.1.19=8835=TEST_349=MZHOT056=INET34=12573=2398=3399=1399=2399=3398=3399=3399=2399=110=211" } } \ No newline at end of file diff --git a/src/test/resources/dictionary.xml b/src/test/resources/dictionary.xml index a1f9bd2..f682a15 100644 --- a/src/test/resources/dictionary.xml +++ b/src/test/resources/dictionary.xml @@ -7272,6 +7272,12 @@ NUMINGROUP + + Group + 73 + NUMINGROUP + + Message false @@ -7373,6 +7379,12 @@ TEST_2 + + Message + false + TEST_3 + + Component @@ -7400,6 +7412,10 @@ Component + + Component + + Header @@ -7491,4 +7507,4 @@ - + \ No newline at end of file From 5951ab745e8846369a1ec35b4a11886325c88985 Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:56:42 +0400 Subject: [PATCH 14/15] benchmark results added th2 gradle plugin updated --- README.md | 3 + build.gradle | 6 +- docs/benchmarks/jmh-benchmark.md | 84 ++++++++++++++ .../th2/codec/fixng/FixNgCodecBenchmark.kt | 103 ++++++++++++------ 4 files changed, 159 insertions(+), 37 deletions(-) create mode 100644 docs/benchmarks/jmh-benchmark.md diff --git a/README.md b/README.md index f2a6488..7550367 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,9 @@ default value: `true`. If `true`, decodes all values to strings instead of typed #### decodeComponentsToNestedMaps default value: `true`. If `true`, decodes `components` to nested maps instead of unwrap component's map to message's main map. +## Performance +Component benchmark results available [here](docs/benchmarks/jmh-benchmark.md). + ## Release notes ### 0.1.0 + Dirty mode added. diff --git a/build.gradle b/build.gradle index bda24d6..57b3558 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "application" - id "com.exactpro.th2.gradle.component" version "0.1.1" + id "com.exactpro.th2.gradle.component" version "0.1.2" id "org.jetbrains.kotlin.jvm" version "$kotlin_version" id "org.jetbrains.kotlin.kapt" version "$kotlin_version" id "me.champeau.jmh" version "0.7.2" @@ -95,11 +95,11 @@ dependencies { jmh "org.openjdk.jmh:jmh-generator-annprocess:$jmhVersion" jmh "org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion" - testImplementation "org.junit.jupiter:junit-jupiter" + testImplementation "org.junit.jupiter:junit-jupiter:5.11.0" testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" testImplementation "org.assertj:assertj-core:3.26.3" } test.useJUnitPlatform() application.mainClass = "com.exactpro.th2.codec.MainKt" -dependencyCheck.suppressionFile = file('suppressions.xml') \ No newline at end of file +dependencyCheck.suppressionFile = "suppressions.xml" \ No newline at end of file diff --git a/docs/benchmarks/jmh-benchmark.md b/docs/benchmarks/jmh-benchmark.md new file mode 100644 index 0000000..23d435e --- /dev/null +++ b/docs/benchmarks/jmh-benchmark.md @@ -0,0 +1,84 @@ +# JMH benchmark + +encode the following FIX message: + +```kotlin + ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "ExecutionReport", + mutableMapOf("encode-mode" to "dirty"), + PROTOCOL, + mutableMapOf( + "header" to mutableMapOf( + "MsgSeqNum" to 10947, + "SenderCompID" to "SENDER", + "SendingTime" to LocalDateTime.parse("2023-04-19T10:36:07.415088"), + "TargetCompID" to "RECEIVER", + "BeginString" to "FIXT.1.1", + "BodyLength" to 295, + "MsgType" to "8" + ), + "ExecID" to "495504662", + "ClOrdID" to "zSuNbrBIZyVljs", + "OrigClOrdID" to "zSuNbrBIZyVljs", + "OrderID" to "49415882", + "ExecType" to '0', + "OrdStatus" to '0', + "LeavesQty" to BigDecimal(500), + "CumQty" to BigDecimal(500), + "SecurityID" to "NWDR", + "SecurityIDSource" to "8", + "TradingParty" to mutableMapOf( + "NoPartyIDs" to mutableListOf( + mutableMapOf( + "PartyID" to "NGALL1FX01", + "PartyIDSource" to 'D', + "PartyRole" to 76 + ), + mutableMapOf( + "PartyID" to "0", + "PartyIDSource" to 'P', + "PartyRole" to 3 + ) + ) + ), + "Account" to "test", + "OrdType" to 'A', + "TimeInForce" to '0', + "Side" to 'B', + "Symbol" to "ABC", + "OrderQty" to BigDecimal(500), + "Price" to BigDecimal(1000), + "Unknown" to "500", + "TransactTime" to LocalDateTime.parse("2018-02-05T10:38:08.000008"), + "trailer" to mutableMapOf( + "CheckSum" to "191" + ) + ) + ) +``` + +decode the same FIX message: + +8=FIXT.1.19=29535=849=SENDER56=RECEIVER34=1094752=20230419-10:36:07.41508817=49550466211=zSuNbrBIZyVljs41=zSuNbrBIZyVljs37=49415882150=039=0151=50014=50048=NWDR22=8453=2448=NGALL1FX01447=D452=76448=0447=P452=31=test40=A59=054=B55=ABC38=50044=100047=50060=20180205-10:38:08.00000810=191 + +Testing is carried out in two formats of parsed messages: String values and Typed values. + +## benchmark results for version 0.1.0-dev + +dirty mode: + +Benchmark Mode Cnt Score Error Units +FixNgCodecBenchmark.encodeFixMessageString thrpt 25 178479.225 ± 2851.079 ops/s +FixNgCodecBenchmark.encodeFixMessageTyped thrpt 25 263077.629 ± 3967.905 ops/s +FixNgCodecBenchmark.parseFixMessageString thrpt 25 173370.305 ± 1878.013 ops/s +FixNgCodecBenchmark.parseFixMessageTyped thrpt 25 186232.291 ± 1295.186 ops/s + +strict mode: + +Benchmark Mode Cnt Score Error Units +FixNgCodecBenchmark.encodeFixMessageString thrpt 25 179523.040 ± 3084.493 ops/s +FixNgCodecBenchmark.encodeFixMessageTyped thrpt 25 265769.868 ± 3893.223 ops/s +FixNgCodecBenchmark.parseFixMessageString thrpt 25 165978.593 ± 6474.860 ops/s +FixNgCodecBenchmark.parseFixMessageTyped thrpt 25 186475.155 ± 1548.224 ops/s \ No newline at end of file diff --git a/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt b/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt index f7c66f4..9cfb560 100644 --- a/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt +++ b/src/jmh/kotlin/com/exactpro/th2/codec/fixng/FixNgCodecBenchmark.kt @@ -36,14 +36,18 @@ import org.openjdk.jmh.annotations.Mode import org.openjdk.jmh.annotations.Scope import org.openjdk.jmh.annotations.Setup import org.openjdk.jmh.annotations.State +import java.math.BigDecimal import java.time.Instant +import java.time.LocalDateTime @State(Scope.Benchmark) open class BenchmarkState { - lateinit var codec: IPipelineCodec - lateinit var rawBody: ByteBuf + lateinit var codecTyped: IPipelineCodec + lateinit var codecString: IPipelineCodec + private lateinit var rawBody: ByteBuf lateinit var rawGroup: MessageGroup - lateinit var parsedGroup: MessageGroup + lateinit var parsedGroupTyped: MessageGroup + lateinit var parsedGroupString: MessageGroup @Setup(Level.Trial) fun setup() { @@ -51,10 +55,12 @@ open class BenchmarkState { .getResourceAsStream("dictionary-benchmark.xml") .use(XmlDictionaryStructureLoader()::load) - codec = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "", decodeValuesToStrings = true)) + codecTyped = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "", decodeValuesToStrings = false)) + codecString = FixNgCodec(dictionary, FixNgCodecSettings(dictionary = "", decodeValuesToStrings = true)) rawBody = Unpooled.wrappedBuffer(MSG_CORRECT.toByteArray(Charsets.US_ASCII)) - rawGroup = MessageGroup(listOf(RawMessage(id = parsedMessage.id, eventId = parsedMessage.eventId, body = rawBody))) - parsedGroup = MessageGroup(listOf(parsedMessage)) + rawGroup = MessageGroup(listOf(RawMessage(id = parsedMessageTyped.id, eventId = parsedMessageTyped.eventId, body = rawBody, metadata = mutableMapOf("encode-mode" to "dirty")))) + parsedGroupTyped = MessageGroup(listOf(parsedMessageTyped)) + parsedGroupString = MessageGroup(listOf(parsedMessageString)) } @Setup(Level.Invocation) @@ -64,20 +70,21 @@ open class BenchmarkState { companion object { private const val MSG_CORRECT = "8=FIXT.1.1\u00019=295\u000135=8\u000149=SENDER\u000156=RECEIVER\u000134=10947\u000152=20230419-10:36:07.415088\u000117=495504662\u000111=zSuNbrBIZyVljs\u000141=zSuNbrBIZyVljs\u000137=49415882\u0001150=0\u000139=0\u0001151=500\u000114=500\u000148=NWDR\u000122=8\u0001453=2\u0001448=NGALL1FX01\u0001447=D\u0001452=76\u0001448=0\u0001447=P\u0001452=3\u00011=test\u000140=A\u000159=0\u000154=B\u000155=ABC\u000138=500\u000144=1000\u000147=500\u000160=20180205-10:38:08.000008\u000110=191\u0001" - private val parsedMessage = ParsedMessage( + + private val parsedMessageTyped = ParsedMessage( MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), EventId("test_id", "test_book", "test_scope", Instant.now()), "ExecutionReport", - mapOf("encode-mode" to "dirty"), + mutableMapOf("encode-mode" to "dirty"), PROTOCOL, - mapOf( - "header" to mapOf( - "MsgSeqNum" to "10947", + mutableMapOf( + "header" to mutableMapOf( + "MsgSeqNum" to 10947, "SenderCompID" to "SENDER", - "SendingTime" to "2023-04-19T10:36:07.415088", + "SendingTime" to LocalDateTime.parse("2023-04-19T10:36:07.415088"), "TargetCompID" to "RECEIVER", "BeginString" to "FIXT.1.1", - "BodyLength" to "295", + "BodyLength" to 295, "MsgType" to "8" ), "ExecID" to "495504662", @@ -86,52 +93,80 @@ open class BenchmarkState { "OrderID" to "49415882", "ExecType" to '0', "OrdStatus" to '0', - "LeavesQty" to "500", - "CumQty" to "500", + "LeavesQty" to BigDecimal(500), + "CumQty" to BigDecimal(500), "SecurityID" to "NWDR", "SecurityIDSource" to "8", - "TradingParty" to mapOf( - "NoPartyIDs" to listOf( - mapOf( + "TradingParty" to mutableMapOf( + "NoPartyIDs" to mutableListOf( + mutableMapOf( "PartyID" to "NGALL1FX01", - "PartyIDSource" to "D", - "PartyRole" to "76" + "PartyIDSource" to 'D', + "PartyRole" to 76 ), - mapOf( + mutableMapOf( "PartyID" to "0", - "PartyIDSource" to "P", - "PartyRole" to "3" + "PartyIDSource" to 'P', + "PartyRole" to 3 ) ) ), "Account" to "test", - "OrdType" to "A", - "TimeInForce" to "0", - "Side" to "B", + "OrdType" to 'A', + "TimeInForce" to '0', + "Side" to 'B', "Symbol" to "ABC", - "OrderQty" to "500", - "Price" to "1000", + "OrderQty" to BigDecimal(500), + "Price" to BigDecimal(1000), "Unknown" to "500", - "TransactTime" to "2018-02-05T10:38:08.000008", - "trailer" to mapOf( + "TransactTime" to LocalDateTime.parse("2018-02-05T10:38:08.000008"), + "trailer" to mutableMapOf( "CheckSum" to "191" ) ) ) + + @Suppress("UNCHECKED_CAST") + private val parsedMessageString = ParsedMessage( + MessageId("test_alias", Direction.OUTGOING, 0L, Instant.now(), emptyList()), + EventId("test_id", "test_book", "test_scope", Instant.now()), + "ExecutionReport", + mutableMapOf(/*"encode-mode" to "dirty"*/), + PROTOCOL, + convertValuesToString(parsedMessageTyped.body) as MutableMap + ) + + private fun convertValuesToString(value: Any?): Any = when (value) { + is Map<*, *> -> value.mapValues { convertValuesToString(it.value) } + is List<*> -> value.map(::convertValuesToString) + else -> value.toString() + } } } open class FixNgCodecBenchmark { @Benchmark @BenchmarkMode(Mode.Throughput) - fun encodeFixMessage(state: BenchmarkState) { - state.codec.encode(state.parsedGroup, context) + fun encodeFixMessageTyped(state: BenchmarkState) { + state.codecTyped.encode(state.parsedGroupTyped, context) + } + + @Benchmark + @BenchmarkMode(Mode.Throughput) + fun parseFixMessageTyped(state: BenchmarkState) { + state.codecTyped.decode(state.rawGroup, context) + } + + @Benchmark + @BenchmarkMode(Mode.Throughput) + fun encodeFixMessageString(state: BenchmarkState) { + state.codecString.encode(state.parsedGroupString, context) } @Benchmark @BenchmarkMode(Mode.Throughput) - fun parseFixMessage(state: BenchmarkState) { - state.codec.decode(state.rawGroup, context) + fun parseFixMessageString(state: BenchmarkState) { + state.codecString.decode(state.rawGroup, context) } companion object { From 2c40594b47f5a2a57010678acdcfe7f71552e737 Mon Sep 17 00:00:00 2001 From: lumber1000 <45400511+lumber1000@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:21:12 +0400 Subject: [PATCH 15/15] release notes added to README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 7550367..33815b0 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,12 @@ Component benchmark results available [here](docs/benchmarks/jmh-benchmark.md). + Dirty mode added. + `dirtyMode` setting option added. + `decodeValuesToStrings` setting option added. + + JMH benchmarks added + + Migrate to th2 gradle plugin `0.1.2` (th2-bom:4.7.0) + + Updated th2-common: `5.11.0-dev` + + Updated th2-codec: `5.5.0-dev` + + Updated sailfish: `3.3.241` + + Workflows updated ### 0.0.1 + Initial release \ No newline at end of file