[Java] Properly skip fields when generating appendTo for composite

Change-Id: I47b7d8d563c678fe14c316b8678c00051bfd602a

Author: xdaragon

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

@@ -2381,15 +2381,12 @@ private CharSequence generateCompositeDecoderDisplay(final List<Token> tokens, f
         append(sb, indent, "{");
         append(sb, indent, "    builder.append(\"[\");");
 
-        for (int i = 1, end = tokens.size() - 1; i < end; i++)
+        for (int i = 1, end = tokens.size() - 1; i < end; )
         {
             final Token encodingToken = tokens.get(i);
             final String propertyName = formatPropertyName(encodingToken.name());
             writeTokenDisplay(propertyName, encodingToken, sb, indent + INDENT);
-            if (encodingToken.signal() == Signal.BEGIN_COMPOSITE)
-            {
-                i += encodingToken.componentTokenCount();
-            }
+            i += encodingToken.componentTokenCount();
         }
 
         append(sb, indent, "    builder.setLength(builder.length() - 1);");

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/CompositeElementsGenerationTest.java

@@ -42,6 +42,8 @@
 import java.nio.ByteBuffer;
 
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -121,6 +123,19 @@ public void shouldDecodeCorrectly()
         assertThat(msgDecoder.encodedLength(), is(22));
     }
 
+    @Test
+    public void shouldDisplayCorrectly()
+    {
+        final ByteBuffer encodedMsgBuffer = ByteBuffer.allocateDirect(MSG_BUFFER_CAPACITY);
+        encodeTestMessage(encodedMsgBuffer);
+
+        final String compositeString = MSG_ENCODER.structure().toString();
+        assertThat(compositeString, containsString("enumOne="));
+        assertThat(compositeString, not(containsString("enumOne=|")));
+        assertThat(compositeString, containsString("setOne="));
+        assertThat(compositeString, not(containsString("setOne=|")));
+    }
+
     @Test
     public void shouldOtfDecodeCorrectly() throws Exception
     {