Skip to content

Commit eba5270

Browse files
authored
Merge branch 'real-logic:master' into master
2 parents 3e61c44 + bcb2e06 commit eba5270

File tree

26 files changed

+363
-229
lines changed

26 files changed

+363
-229
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@ jobs:
4343
uses: actions/checkout@v4
4444
with:
4545
ref: ${{ github.ref }}
46-
- name: Create Release
47-
uses: actions/create-release@v1
48-
env:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
with:
51-
tag_name: ${{ github.ref }}
52-
release_name: Release ${{ github.ref }}
53-
draft: true
5446
- name: Setup java
5547
uses: actions/setup-java@v4
5648
with:

config/checkstyle/checkstyle.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
3-
"https://checkstyle.org/dtds/configuration_1_3.dtd">
3+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
44
<module name="Checker">
55
<module name="SuppressionFilter">
66
<property name="file" value="${config_loc}/suppressions.xml"/>
77
</module>
88

9+
<module name="SuppressWithPlainTextCommentFilter">
10+
<property name="offCommentFormat" value="CHECKSTYLE\:OFF\:(\w+)"/>
11+
<property name="onCommentFormat" value="CHECKSTYLE\:ON\:(\w+)"/>
12+
<property name="checkFormat" value="$1"/>
13+
</module>
14+
915
<module name="SuppressWarningsFilter"/>
1016

1117
<module name="SeverityMatchFilter">
@@ -22,8 +28,8 @@
2228
<property name="ignorePattern" value="^[ \t]*\*.*@.*$"/>
2329
</module>
2430

25-
<module name="Header">
26-
<property name="header" value="/*\n * Copyright 2013-2024 Real Logic Limited."/>
31+
<module name="RegexpHeader">
32+
<property name="header" value="/*\n * Copyright \d{4}(-\d{4})? (Real Logic|Adaptive Financial Consulting) Limited."/>
2733
<property name="fileExtensions" value="java"/>
2834
</module>
2935

@@ -33,9 +39,13 @@
3339

3440
<module name="SuppressWarningsHolder"/>
3541

42+
<module name="JavadocStyle"/>
43+
<module name="JavadocType"/>
44+
<module name="JavadocMethod"/>
3645
<module name="JavadocVariable">
3746
<property name="scope" value="public"/>
3847
</module>
48+
3949
<module name="MissingJavadocType"/>
4050
<module name="MissingJavadocMethod"/>
4151
<module name="MissingJavadocPackage"/>

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
agrona = "1.23.1"
3-
checkstyle = "10.20.1"
3+
checkstyle = "10.20.2"
44
junit = "5.11.3"
55
jmh = "1.37"
6-
gradle = "8.11"
6+
gradle = "8.11.1"
77

88
[libraries]
99
agrona = { group = "org.agrona", name = "agrona", version = { strictly = "[1.23.1, 2.0[", require = "1.23.1" } }
1010
mockito = { group = "org.mockito", name = "mockito-core", version = "5.14.2" }
1111
hamcrest = { group = "org.hamcrest", name = "hamcrest", version = "3.0" }
12-
jqwik = { group = "net.jqwik", name = "jqwik", version = "1.9.1" }
12+
jqwik = { group = "net.jqwik", name = "jqwik", version = "1.9.2" }
1313
json = { group = "org.json", name = "json", version = "20240303" }
1414
jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
1515
jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public Representation representation()
308308
}
309309

310310
/**
311-
* Parse constant value string and set representation based on type
311+
* Parse constant value string and set representation based on type.
312312
*
313313
* @param value expressed as a String.
314314
* @param primitiveType that this is supposed to be.
@@ -367,7 +367,7 @@ public static PrimitiveValue parse(final String value, final PrimitiveType primi
367367
}
368368

369369
/**
370-
* Parse constant value string and set representation based on type
370+
* Parse constant value string and set representation based on type.
371371
*
372372
* @param value expressed as a String.
373373
* @param primitiveType that this is supposed to be.
@@ -392,7 +392,7 @@ public static PrimitiveValue parse(
392392
}
393393

394394
/**
395-
* Parse constant value string and set representation based on type, length, and characterEncoding
395+
* Parse constant value string and set representation based on type, length, and characterEncoding.
396396
*
397397
* @param value expressed as a String.
398398
* @param length of the type.
@@ -469,7 +469,7 @@ public byte[] byteArrayValue()
469469
}
470470

471471
/**
472-
* Return byte array value for this PrimitiveValue given a particular type
472+
* Return byte array value for this PrimitiveValue given a particular type.
473473
*
474474
* @param type of this value.
475475
* @return value expressed as a byte array.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.regex.Pattern;
2020

2121
/**
22-
* Various validation utilities used across parser, IR, and generator
22+
* Various validation utilities used across parser, IR, and generator.
2323
*/
2424
public class ValidationUtil
2525
{
@@ -228,7 +228,7 @@ private static boolean isSbeCppIdentifierPart(final char c)
228228
* <p>
229229
* <a href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.9">Java JLS</a>
230230
*
231-
* @param value to check
231+
* @param value to check.
232232
* @return true for validity as a Java name. false if not.
233233
*/
234234
public static boolean isSbeJavaName(final String value)
@@ -391,6 +391,7 @@ private static boolean isSbeGolangIdentifierPart(final char c)
391391
}
392392

393393
/**
394+
* C# keywords.
394395
* <a href="https://docs.microsoft.com/en-gb/dotnet/articles/csharp/language-reference/keywords/index">
395396
* C# keywords</a>
396397
* Note this does not include the contextual keywords

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ public static String formatScopedName(final CharSequence[] scope, final String v
108108
}
109109

110110
/**
111-
* Return the C99 formatted byte order encoding string to use for a given byte order and primitiveType
111+
* Return the C99 formatted byte order encoding string to use for a given byte order and primitiveType.
112112
*
113-
* @param byteOrder of the {@link uk.co.real_logic.sbe.ir.Token}
114-
* @param primitiveType of the {@link uk.co.real_logic.sbe.ir.Token}
115-
* @return the string formatted as the byte ordering encoding
113+
* @param byteOrder of the {@link uk.co.real_logic.sbe.ir.Token}.
114+
* @param primitiveType of the {@link uk.co.real_logic.sbe.ir.Token}.
115+
* @return the string formatted as the byte ordering encoding.
116116
*/
117117
public static String formatByteOrderEncoding(final ByteOrder byteOrder, final PrimitiveType primitiveType)
118118
{

0 commit comments

Comments
 (0)