Avoid using 'message' as a name for fields.

Author: ZachBray

sbe-core/src/test/java/com/aeroncookbook/sbe/SbeTests.java

@@ -28,8 +28,8 @@ public class SbeTests
 {
 
     public static final String TEMPLATE_IDS_DO_NOT_MATCH = "Template ids do not match";
-    public static final String MESSAGE_2 = "a message";
-    public static final String MESSAGE_1 = "message a";
+    public static final String DATA_1 = "foo";
+    public static final String DATA_2 = "bar";
 
     @Test
     public void canWriteReadSampleA()
@@ -42,7 +42,7 @@ public void canWriteReadSampleA()
         encoder.wrapAndApplyHeader(directBuffer, 0, messageHeaderEncoder);
         encoder.sequence(123L);
         encoder.enumField(SampleEnum.VALUE_1);
-        encoder.message(MESSAGE_1);
+        encoder.message(DATA_1);
 
         final SampleSimpleDecoder decoder = new SampleSimpleDecoder();
         final MessageHeaderDecoder headerDecoder = new MessageHeaderDecoder();
@@ -64,7 +64,7 @@ public void canWriteReadSampleA()
 
         assertEquals(123, decoder.sequence());
         assertEquals(SampleEnum.VALUE_1, decoder.enumField());
-        assertEquals(MESSAGE_1, decoder.message());
+        assertEquals(DATA_1, decoder.message());
     }
 
     @Test
@@ -77,15 +77,15 @@ public void canWriteReadSampleAWithoutHeader()
         encoder.wrap(directBuffer, 0);
         encoder.sequence(123L);
         encoder.enumField(SampleEnum.VALUE_1);
-        encoder.message(MESSAGE_1);
+        encoder.message(DATA_1);
 
         final SampleSimpleDecoder decoder = new SampleSimpleDecoder();
 
         decoder.wrap(directBuffer, 0, decoder.sbeBlockLength(), decoder.sbeSchemaVersion());
 
         assertEquals(123, decoder.sequence());
         assertEquals(SampleEnum.VALUE_1, decoder.enumField());
-        assertEquals(MESSAGE_1, decoder.message());
+        assertEquals(DATA_1, decoder.message());
     }
 
     @Test
@@ -102,12 +102,12 @@ public void canWriteReadSampleRepeatGroups()
         groupEncoder.next();
         groupEncoder.groupField1(1);
         groupEncoder.groupField2(2);
-        groupEncoder.groupField3(MESSAGE_2);
+        groupEncoder.groupField3(DATA_2);
         groupEncoder.next();
         groupEncoder.groupField1(1);
         groupEncoder.groupField2(2);
-        groupEncoder.groupField3(MESSAGE_2);
-        encoder.message(MESSAGE_1);
+        groupEncoder.groupField3(DATA_2);
+        encoder.message(DATA_1);
 
 
         final SampleGroupDecoder decoder = new SampleGroupDecoder();
@@ -132,9 +132,9 @@ public void canWriteReadSampleRepeatGroups()
         {
             assertEquals(1, groupDecoder.groupField1());
             assertEquals(2, groupDecoder.groupField2());
-            assertEquals(MESSAGE_2, groupDecoder.groupField3());
+            assertEquals(DATA_2, groupDecoder.groupField3());
         }
-        assertEquals(MESSAGE_1, decoder.message());
+        assertEquals(DATA_1, decoder.message());
     }
 
     @Test
@@ -146,8 +146,8 @@ public void dataCanBeCorrupted()
         final UnsafeBuffer directBuffer = new UnsafeBuffer(byteBuffer);
 
         encoder.wrapAndApplyHeader(directBuffer, 0, messageHeaderEncoder);
-        encoder.message2(MESSAGE_2);
-        encoder.message1(MESSAGE_1);
+        encoder.data2(DATA_2);
+        encoder.data1(DATA_1);
         encoder.sequence1(123L);
         encoder.sequence2(321L);
 
@@ -170,9 +170,9 @@ public void dataCanBeCorrupted()
         decoder.wrap(directBuffer, bufferOffset, actingBlockLength, actingVersion);
 
         assertEquals(123, decoder.sequence1());
-        Assertions.assertNotEquals(MESSAGE_1, decoder.message1());
+        Assertions.assertNotEquals(DATA_1, decoder.data1());
         assertEquals(321, decoder.sequence2());
-        Assertions.assertNotEquals(MESSAGE_2, decoder.message2());
+        Assertions.assertNotEquals(DATA_2, decoder.data2());
     }
 
     @Test
@@ -186,8 +186,8 @@ public void dataCanBeReadCorrectlyWhenWrittenCorrectly()
         encoder.wrapAndApplyHeader(directBuffer, 0, messageHeaderEncoder);
         encoder.sequence1(123L);
         encoder.sequence2(321L);
-        encoder.message1(MESSAGE_1);
-        encoder.message2(MESSAGE_2);
+        encoder.data1(DATA_1);
+        encoder.data2(DATA_2);
 
         final SampleCorruptionDecoder decoder = new SampleCorruptionDecoder();
         final MessageHeaderDecoder headerDecoder = new MessageHeaderDecoder();
@@ -209,8 +209,8 @@ public void dataCanBeReadCorrectlyWhenWrittenCorrectly()
 
         assertEquals(123, decoder.sequence1());
         assertEquals(321, decoder.sequence2());
-        assertEquals(MESSAGE_1, decoder.message1());
-        assertEquals(MESSAGE_2, decoder.message2());
+        assertEquals(DATA_1, decoder.data1());
+        assertEquals(DATA_2, decoder.data2());
     }
 
 
@@ -225,8 +225,8 @@ public void nullStringReturnsAsEmptyString()
         encoder.wrapAndApplyHeader(directBuffer, 0, messageHeaderEncoder);
         encoder.sequence1(123L);
         encoder.sequence2(321L);
-        encoder.message1(MESSAGE_1);
-        encoder.message2(null);
+        encoder.data1(DATA_1);
+        encoder.data2(null);
 
         final SampleCorruptionDecoder decoder = new SampleCorruptionDecoder();
         final MessageHeaderDecoder headerDecoder = new MessageHeaderDecoder();
@@ -248,7 +248,7 @@ public void nullStringReturnsAsEmptyString()
 
         assertEquals(123, decoder.sequence1());
         assertEquals(321, decoder.sequence2());
-        assertEquals(MESSAGE_1, decoder.message1());
-        assertEquals("", decoder.message2());
+        assertEquals(DATA_1, decoder.data1());
+        assertEquals("", decoder.data2());
     }
 }

sbe-protocol/src/main/resources/messages.xml

@@ -61,8 +61,8 @@
     <sbe:message name="SampleCorruption" id="2" description="Corruption sample">
         <field name="sequence1" id="1" type="Sequence"/>
         <field name="sequence2" id="2" type="Sequence"/>
-        <data name="message1" id="3" type="varStringEncoding"/>
-        <data name="message2" id="4" type="varStringEncoding"/>
+        <data name="data1" id="3" type="varStringEncoding"/>
+        <data name="data2" id="4" type="varStringEncoding"/>
     </sbe:message>
 
     <sbe:message name="SampleGroup" id="3" description="Sample with group">