Merge branch 'master' into std-span

Author: nbradac

.github/workflows/release.yml

@@ -43,14 +43,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
-      - name: Create Release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: true
       - name: Setup java
         uses: actions/setup-java@v4
         with:

build.gradle

@@ -653,6 +653,7 @@ tasks.register('generateRustTestCodecs', JavaExec) {
             'sbe-tool/src/test/resources/issue972.xml',
             'sbe-tool/src/test/resources/issue984.xml',
             'sbe-tool/src/test/resources/issue987.xml',
+            'sbe-tool/src/test/resources/issue1028.xml',
             'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
             'sbe-tool/src/test/resources/nested-composite-name.xml',
     ]
@@ -866,7 +867,7 @@ tasks.register('generateGolangCodecs') {
             'generateGolangFlyweightCodecTestComposite',
             'generateGolangFlyweightCodecsWithXIncludes',
             'generateGolangFlyweightCodecsWithXSD',
-	    'generateIrCodecs',
+	        'generateIrCodecs',
             ':sbe-all:jar'
 }
 

config/checkstyle/checkstyle.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
     <module name="SuppressionFilter">
         <property name="file" value="${config_loc}/suppressions.xml"/>
     </module>
 
+    <module name="SuppressWithPlainTextCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE\:OFF\:(\w+)"/>
+        <property name="onCommentFormat" value="CHECKSTYLE\:ON\:(\w+)"/>
+        <property name="checkFormat" value="$1"/>
+    </module>
+
     <module name="SuppressWarningsFilter"/>
 
     <module name="SeverityMatchFilter">
@@ -22,8 +28,8 @@
         <property name="ignorePattern" value="^[ \t]*\*.*@.*$"/>
     </module>
 
-    <module name="Header">
-        <property name="header" value="/*\n * Copyright 2013-2024 Real Logic Limited."/>
+    <module name="RegexpHeader">
+        <property name="header" value="/*\n * Copyright \d{4}(-\d{4})? (Real Logic|Adaptive Financial Consulting) Limited."/>
         <property name="fileExtensions" value="java"/>
     </module>
 
@@ -33,9 +39,13 @@
 
         <module name="SuppressWarningsHolder"/>
 
+        <module name="JavadocStyle"/>
+        <module name="JavadocType"/>
+        <module name="JavadocMethod"/>
         <module name="JavadocVariable">
             <property name="scope" value="public"/>
         </module>
+
         <module name="MissingJavadocType"/>
         <module name="MissingJavadocMethod"/>
         <module name="MissingJavadocPackage"/>

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 agrona = "1.23.1"
-checkstyle = "10.20.1"
+checkstyle = "10.21.0"
 junit = "5.11.3"
 jmh = "1.37"
-gradle = "8.11"
+gradle = "8.11.1"
 
 [libraries]
 agrona = { group = "org.agrona", name = "agrona", version = { strictly = "[1.23.1, 2.0[", require = "1.23.1" } }
 mockito = { group = "org.mockito", name = "mockito-core", version = "5.14.2" }
 hamcrest = { group = "org.hamcrest", name = "hamcrest", version = "3.0" }
-jqwik = { group = "net.jqwik", name = "jqwik", version = "1.9.1" }
+jqwik = { group = "net.jqwik", name = "jqwik", version = "1.9.2" }
 json = { group = "org.json", name = "json", version = "20240303" }
 jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

rust/Cargo.toml

@@ -16,6 +16,7 @@ issue_895 = { path = "../generated/rust/issue895" }
 issue_972 = { path = "../generated/rust/issue972" }
 issue_984 = { path = "../generated/rust/issue984" }
 issue_987 = { path = "../generated/rust/issue987" }
+issue_1028 = { path = "../generated/rust/issue1028" }
 baseline_bigendian = { path = "../generated/rust/baseline-bigendian" }
 nested_composite_name = { path = "../generated/rust/nested-composite-name" }
 

sbe-tool/src/main/java/uk/co/real_logic/sbe/PrimitiveValue.java

@@ -308,7 +308,7 @@ public Representation representation()
     }
 
     /**
-     * Parse constant value string and set representation based on type
+     * Parse constant value string and set representation based on type.
      *
      * @param value         expressed as a String.
      * @param primitiveType that this is supposed to be.
@@ -367,7 +367,7 @@ public static PrimitiveValue parse(final String value, final PrimitiveType primi
     }
 
     /**
-     * Parse constant value string and set representation based on type
+     * Parse constant value string and set representation based on type.
      *
      * @param value             expressed as a String.
      * @param primitiveType     that this is supposed to be.
@@ -392,7 +392,7 @@ public static PrimitiveValue parse(
     }
 
     /**
-     * Parse constant value string and set representation based on type, length, and characterEncoding
+     * Parse constant value string and set representation based on type, length, and characterEncoding.
      *
      * @param value             expressed as a String.
      * @param length            of the type.
@@ -469,7 +469,7 @@ public byte[] byteArrayValue()
     }
 
     /**
-     * Return byte array value for this PrimitiveValue given a particular type
+     * Return byte array value for this PrimitiveValue given a particular type.
      *
      * @param type of this value.
      * @return value expressed as a byte array.

sbe-tool/src/main/java/uk/co/real_logic/sbe/ValidationUtil.java

@@ -19,7 +19,7 @@
 import java.util.regex.Pattern;
 
 /**
- * Various validation utilities used across parser, IR, and generator
+ * Various validation utilities used across parser, IR, and generator.
  */
 public class ValidationUtil
 {
@@ -228,7 +228,7 @@ private static boolean isSbeCppIdentifierPart(final char c)
      * <p>
      * <a href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.9">Java JLS</a>
      *
-     * @param value to check
+     * @param value to check.
      * @return true for validity as a Java name. false if not.
      */
     public static boolean isSbeJavaName(final String value)
@@ -391,6 +391,7 @@ private static boolean isSbeGolangIdentifierPart(final char c)
     }
 
     /**
+     * C# keywords.
      * <a href="https://docs.microsoft.com/en-gb/dotnet/articles/csharp/language-reference/keywords/index">
      *     C# keywords</a>
      * Note this does not include the contextual keywords

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CUtil.java

@@ -108,11 +108,11 @@ public static String formatScopedName(final CharSequence[] scope, final String v
     }
 
     /**
-     * Return the C99 formatted byte order encoding string to use for a given byte order and primitiveType
+     * Return the C99 formatted byte order encoding string to use for a given byte order and primitiveType.
      *
-     * @param byteOrder     of the {@link uk.co.real_logic.sbe.ir.Token}
-     * @param primitiveType of the {@link uk.co.real_logic.sbe.ir.Token}
-     * @return the string formatted as the byte ordering encoding
+     * @param byteOrder     of the {@link uk.co.real_logic.sbe.ir.Token}.
+     * @param primitiveType of the {@link uk.co.real_logic.sbe.ir.Token}.
+     * @return the string formatted as the byte ordering encoding.
      */
     public static String formatByteOrderEncoding(final ByteOrder byteOrder, final PrimitiveType primitiveType)
     {