[Java] Format property name for C# code.

vyazelenko · vyazelenko · commit 0d3cd0e322a4 · 2025-08-30T19:14:50.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -958,8 +958,10 @@ tasks.register('generateCSharpTestDtos', JavaExec) {
             'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharpDtos',
             'sbe.xinclude.aware': 'true',
             'sbe.validation.xsd': validationXsdPath,
+            'sbe.keyword.append.token': 'X',
             'sbe.types.package.override': 'true')
-    args = ['sbe-samples/src/main/resources/example-extension-schema.xml']
+    args = ['sbe-tool/src/test/resources/dto-test-schema.xml',
+            'sbe-samples/src/main/resources/example-extension-schema.xml']
 }
 
 tasks.register('generateCSharpExplicitPackageOverrideCodecs', JavaExec) {
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java
@@ -534,7 +534,7 @@ private CharSequence generateVarData(
             if (token.signal() == Signal.BEGIN_VAR_DATA)
             {
                 generateFieldIdMethod(sb, token, indent);
-                generateSinceActingDeprecated(sb, indent, CSharpUtil.formatPropertyName(token.name()), token);
+                generateSinceActingDeprecated(sb, indent, formatPropertyName(token.name()), token);
                 generateOffsetMethod(sb, token, indent);
 
                 final Token varDataToken = Generators.findFirst("varData", tokens, i);
@@ -1608,12 +1608,12 @@ private CharSequence generateFullyEncodedCheck(
 
     private static String accessOrderListenerMethodName(final Token token)
     {
-        return "On" + Generators.toUpperFirstChar(token.name()) + "Accessed";
+        return "On" + Generators.toUpperFirstChar(formatPropertyName(token.name())) + "Accessed";
     }
 
     private static String accessOrderListenerMethodName(final Token token, final String suffix)
     {
-        return "On" + Generators.toUpperFirstChar(token.name()) + suffix + "Accessed";
+        return "On" + Generators.toUpperFirstChar(formatPropertyName(token.name())) + suffix + "Accessed";
     }
 
     private static void generateAccessOrderListenerMethod(
@@ -1956,7 +1956,7 @@ private CharSequence generateFields(
 
                 generateFieldIdMethod(sb, signalToken, indent + INDENT);
                 generateSinceActingDeprecated(
-                    sb, indent + INDENT, CSharpUtil.formatPropertyName(signalToken.name()), signalToken);
+                    sb, indent + INDENT, formatPropertyName(signalToken.name()), signalToken);
                 generateOffsetMethod(sb, signalToken, indent + INDENT);
                 generateFieldMetaAttributeMethod(sb, signalToken, indent + INDENT);
 
@@ -1997,15 +1997,15 @@ private void generateFieldIdMethod(final StringBuilder sb, final Token token, fi
     {
         sb.append(String.format("\n" +
             indent + "public const int %sId = %d;\n",
-            CSharpUtil.formatPropertyName(token.name()),
+            formatPropertyName(token.name()),
             token.id()));
     }
 
     private void generateOffsetMethod(final StringBuilder sb, final Token token, final String indent)
     {
         sb.append(String.format("\n" +
             indent + "public const int %sOffset = %d;\n",
-            CSharpUtil.formatPropertyName(token.name()),
+            formatPropertyName(token.name()),
             token.offset()));
     }
 
diff --git a/sbe-tool/src/test/resources/code-generation-schema.xml b/sbe-tool/src/test/resources/code-generation-schema.xml
@@ -174,6 +174,9 @@
         <field name="struct"        id="71" type="int64"/>
         <field name="Make"          id="72" type="int64"/>
         <field name="type"          id="73" type="uint8"/>
+        <field name="sealed"        id="74" type="uint8"/>
+        <field name="sbyte"         id="75" type="uint8"/>
+        <field name="using"         id="76" type="uint8"/>
         <group name="data"          id="90" dimensionType="groupSizeEncoding">
             <field name="this"      id="91" type="Ron"/>
             <group name="super"     id="92" dimensionType="groupSizeEncoding">
diff --git a/sbe-tool/src/test/resources/dto-test-schema.xml b/sbe-tool/src/test/resources/dto-test-schema.xml
@@ -196,6 +196,9 @@
         <field name="struct"        id="71" type="int64"/>
         <field name="Make"          id="72" type="int64"/>
         <field name="type"          id="73" type="uint8"/>
+        <field name="sealed"        id="74" type="uint8"/>
+        <field name="sbyte"         id="75" type="uint8"/>
+        <field name="using"         id="76" type="uint8"/>
         <group name="data"          id="90" dimensionType="groupSizeEncoding">
             <field name="this"      id="91" type="Ron"/>
             <group name="super"     id="92" dimensionType="groupSizeEncoding">

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ private CharSequence generateVarData(`
`534`	`534`	`if (token.signal() == Signal.BEGIN_VAR_DATA)`
`535`	`535`	`{`
`536`	`536`	`generateFieldIdMethod(sb, token, indent);`
`537`		`- generateSinceActingDeprecated(sb, indent, CSharpUtil.formatPropertyName(token.name()), token);`
	`537`	`+ generateSinceActingDeprecated(sb, indent, formatPropertyName(token.name()), token);`
`538`	`538`	`generateOffsetMethod(sb, token, indent);`
`539`	`539`
`540`	`540`	`final Token varDataToken = Generators.findFirst("varData", tokens, i);`
`@@ -1608,12 +1608,12 @@ private CharSequence generateFullyEncodedCheck(`
`1608`	`1608`
`1609`	`1609`	`private static String accessOrderListenerMethodName(final Token token)`
`1610`	`1610`	`{`
`1611`		`- return "On" + Generators.toUpperFirstChar(token.name()) + "Accessed";`
	`1611`	`+ return "On" + Generators.toUpperFirstChar(formatPropertyName(token.name())) + "Accessed";`
`1612`	`1612`	`}`
`1613`	`1613`
`1614`	`1614`	`private static String accessOrderListenerMethodName(final Token token, final String suffix)`
`1615`	`1615`	`{`
`1616`		`- return "On" + Generators.toUpperFirstChar(token.name()) + suffix + "Accessed";`
	`1616`	`+ return "On" + Generators.toUpperFirstChar(formatPropertyName(token.name())) + suffix + "Accessed";`
`1617`	`1617`	`}`
`1618`	`1618`
`1619`	`1619`	`private static void generateAccessOrderListenerMethod(`
`@@ -1956,7 +1956,7 @@ private CharSequence generateFields(`
`1956`	`1956`
`1957`	`1957`	`generateFieldIdMethod(sb, signalToken, indent + INDENT);`
`1958`	`1958`	`generateSinceActingDeprecated(`
`1959`		`- sb, indent + INDENT, CSharpUtil.formatPropertyName(signalToken.name()), signalToken);`
	`1959`	`+ sb, indent + INDENT, formatPropertyName(signalToken.name()), signalToken);`
`1960`	`1960`	`generateOffsetMethod(sb, signalToken, indent + INDENT);`
`1961`	`1961`	`generateFieldMetaAttributeMethod(sb, signalToken, indent + INDENT);`
`1962`	`1962`
`@@ -1997,15 +1997,15 @@ private void generateFieldIdMethod(final StringBuilder sb, final Token token, fi`
`1997`	`1997`	`{`
`1998`	`1998`	`sb.append(String.format("\n" +`
`1999`	`1999`	`indent + "public const int %sId = %d;\n",`
`2000`		`- CSharpUtil.formatPropertyName(token.name()),`
	`2000`	`+ formatPropertyName(token.name()),`
`2001`	`2001`	`token.id()));`
`2002`	`2002`	`}`
`2003`	`2003`
`2004`	`2004`	`private void generateOffsetMethod(final StringBuilder sb, final Token token, final String indent)`
`2005`	`2005`	`{`
`2006`	`2006`	`sb.append(String.format("\n" +`
`2007`	`2007`	`indent + "public const int %sOffset = %d;\n",`
`2008`		`- CSharpUtil.formatPropertyName(token.name()),`
	`2008`	`+ formatPropertyName(token.name()),`
`2009`	`2009`	`token.offset()));`
`2010`	`2010`	`}`
`2011`	`2011`