aeron-io#910 Finish(?) fixing unqualified yield errors

This now generates code that compiles in Java 17 for all the paths through writeTokenDisplay I can find, and I think that's all that's needed here?

Author: tom.johnson

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

@@ -3575,9 +3575,9 @@ private int writeTokenDisplay(
                     if (typeToken.encoding().primitiveType() == PrimitiveType.CHAR)
                     {
                         append(sb, indent,
-                            "for (int i = 0; i < " + fieldName + "Length() && " + fieldName + "(i) > 0; i++)");
+                            "for (int i = 0; i < " + fieldName + "Length() && this." + fieldName + "(i) > 0; i++)");
                         append(sb, indent, "{");
-                        append(sb, indent, "    builder.append((char)" + fieldName + "(i));");
+                        append(sb, indent, "    builder.append((char)this." + fieldName + "(i));");
                         append(sb, indent, "}");
                     }
                     else
@@ -3587,7 +3587,7 @@ private int writeTokenDisplay(
                         append(sb, indent, "{");
                         append(sb, indent, "    for (int i = 0; i < " + fieldName + "Length(); i++)");
                         append(sb, indent, "    {");
-                        append(sb, indent, "        builder.append(" + fieldName + "(i));");
+                        append(sb, indent, "        builder.append(this." + fieldName + "(i));");
                         Separator.ENTRY.appendToGeneratedBuilder(sb, indent + INDENT + INDENT);
                         append(sb, indent, "    }");
                         append(sb, indent, "    builder.setLength(builder.length() - 1);");
@@ -3603,11 +3603,11 @@ private int writeTokenDisplay(
                 break;
 
             case BEGIN_ENUM:
-                append(sb, indent, "builder.append(" + fieldName + "());");
+                append(sb, indent, "builder.append(this." + fieldName + "());");
                 break;
 
             case BEGIN_SET:
-                append(sb, indent, fieldName + "().appendTo(builder);");
+                append(sb, indent, "this." + fieldName + "().appendTo(builder);");
                 break;
 
             case BEGIN_COMPOSITE:

sbe-tool/src/test/resources/issue910.xml

@@ -21,6 +21,18 @@
             <type name="blockLength" primitiveType="uint16"/>
             <type name="numInGroup" primitiveType="uint16"/>
         </composite>
+        <enum name="Enum" encodingType="char">
+            <validValue name="A">A</validValue>
+            <validValue name="B">B</validValue>
+            <validValue name="C">C</validValue>
+        </enum>
+        <set name="Set" encodingType="uint8">
+            <choice name="A">0</choice>
+            <choice name="B">1</choice>
+            <choice name="C">2</choice>
+        </set>
+        <type name="Array" primitiveType="int32" length="5"/>
+        <type name="CharArray" primitiveType="char" length="5"/>
     </types>
     <sbe:message name="issue910Field" id="1" description="issue 910 field test">
         <field name="yield" type="uint64" id="1"/>
@@ -33,4 +45,16 @@
             <field name="whatever" type="uint64" id="1"/>
         </group>
     </sbe:message>
+    <sbe:message name="issue910Enum" id="4" description="issue 910 enum test">
+        <field name="yield" type="Enum" id="1"/>
+    </sbe:message>
+    <sbe:message name="issue910Set" id="5" description="issue 910 set test">
+        <field name="yield" type="Set" id="1"/>
+    </sbe:message>
+    <sbe:message name="issue910Array" id="6" description="issue 910 array test">
+        <field name="yield" type="Array" id="1"/>
+    </sbe:message>
+    <sbe:message name="issue910CharArray" id="7" description="issue 910 char array test">
+        <field name="yield" type="CharArray" id="1"/>
+    </sbe:message>
 </sbe:messageSchema>