Use conventions from JavaGenerator in CSharpGenerator where possible.

Note that the `BuildString` methods are still unsafe to use during group iteration.
aeron-io · Aug 1, 2024 · 4c8f35b · 4c8f35b
1 parent 4ddf522
commit 4c8f35b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/csharp/sbe-tests/Issue992Tests.cs b/csharp/sbe-tests/Issue992Tests.cs
@@ -28,7 +28,7 @@ public void SetUp()
     }
 
     [TestMethod]
-    public void CheckToStringDontMessWithGroupIteration()
+    public void CheckToStringDoesNotBreakGroupIteration()
     {
       var encoder = new MDIncrementalRefreshBook46()
         .WrapForEncodeAndApplyHeader(_buffer, Offset, _messageHeader);

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
@@ -2406,22 +2406,26 @@ private int writeTokenDisplay(
         return lengthBeforeFieldSeparator;
     }
 
-    private void appendToString(final StringBuilder sb, final String indent, final String className)
+    private void appendToString(final StringBuilder sb, final String indent)
     {
         sb.append('\n');
         append(sb, indent, "public override string ToString()");
         append(sb, indent, "{");
         append(sb, indent, "    var sb = new StringBuilder(100);");
-        if(null != className) 
-        {
-            append(sb, indent, "    var m = new " + className + "();");
-            append(sb, indent, "    m.WrapForDecode(_buffer, _offset, _actingBlockLength, _actingVersion);");
-            append(sb, indent, "    m.BuildString(sb);");
-        } 
-        else 
-        {
-            append(sb, indent, "    this.BuildString(sb);");
-        }
+        append(sb, indent, "    this.BuildString(sb);");
+        append(sb, indent, "    return sb.ToString();");
+        append(sb, indent, "}");
+    }
+
+    private void appendMessageToString(final StringBuilder sb, final String indent, final String className)
+    {
+        sb.append('\n');
+        append(sb, indent, "public override string ToString()");
+        append(sb, indent, "{");
+        append(sb, indent, "    var sb = new StringBuilder(100);");
+        append(sb, indent, "    var m = new " + className + "();");
+        append(sb, indent, "    m.WrapForDecode(_buffer, _offset, _actingBlockLength, _actingVersion);");
+        append(sb, indent, "    m.BuildString(sb);");
         append(sb, indent, "    return sb.ToString();");
         append(sb, indent, "}");
     }
@@ -2454,7 +2458,7 @@ private CharSequence generateDisplay(
     {
         final StringBuilder sb = new StringBuilder(100);
 
-        appendToString(sb, TWO_INDENT, className);
+        appendMessageToString(sb, TWO_INDENT, className);
         sb.append('\n');
         append(sb, TWO_INDENT, "internal void BuildString(StringBuilder builder)");
         append(sb, TWO_INDENT, "{");
@@ -2512,7 +2516,7 @@ private CharSequence generateCompositeDisplay(final List<Token> tokens)
     {
         final StringBuilder sb = new StringBuilder();
 
-        appendToString(sb, TWO_INDENT, null);
+        appendToString(sb, TWO_INDENT);
         sb.append('\n');
         append(sb, TWO_INDENT, "internal void BuildString(StringBuilder builder)");
         append(sb, TWO_INDENT, "{");