Fix checkstyle

Upgraded checkstyle finds a number of formatting issues which were
previously undetected. Fix them up.

Change-Id: I63640aee38927bde9f22e73e21640b81cfb07d85
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
index 37e2148695a830e06897ef51ae9930470ca65a8a..7c46b1fc0a89278d8cf014576765fd6ae931e4f3 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
@@ -52,21 +52,21 @@ public class PortStatusMessageFactoryTest {
     @Test
     public void test() {
         ByteBuf bb = BufferHelper.buildBuffer(
-                "01 " + //reason
-                "00 00 00 00 00 00 00 " + //padding
-                "00 01 02 03 " + //port no
-                "00 00 00 00 " + //padding in ofp_port1
-                "08 00 27 00 B0 EB " + //mac address
-                "00 00 " + //padding in ofp_port2
-                "73 31 2d 65 74 68 31 00 00 00 00 00 00 00 00 00 " + // port name, String "s1-eth1"
-                "00 00 00 41 " + //port config
-                "00 00 00 05 " + //port state
-                "00 00 00 81 " + //current features
-                "00 00 00 A1 " + //advertised features
-                "00 00 00 B1 " + //supported features
-                "00 00 00 81 " + //peer features
-                "00 00 00 81 " + //curr speed
-                "00 00 00 80"); //max speed
+                "01 " //reason
+                + "00 00 00 00 00 00 00 " //padding
+                + "00 01 02 03 " //port no
+                + "00 00 00 00 " //padding in ofp_port1
+                + "08 00 27 00 B0 EB " //mac address
+                + "00 00 " //padding in ofp_port2
+                + "73 31 2d 65 74 68 31 00 00 00 00 00 00 00 00 00 " // port name, String "s1-eth1"
+                + "00 00 00 41 " //port config
+                + "00 00 00 05 " //port state
+                + "00 00 00 81 " //current features
+                + "00 00 00 A1 " //advertised features
+                + "00 00 00 B1 " //supported features
+                + "00 00 00 81 " //peer features
+                + "00 00 00 81 " //curr speed
+                + "00 00 00 80"); //max speed
 
         PortStatusMessage builtByFactory = BufferHelper.deserialize(statusFactory, bb);
 
@@ -99,15 +99,15 @@ public class PortStatusMessageFactoryTest {
     @Test
     public void testWithDifferentBitmaps() {
         ByteBuf bb = BufferHelper.buildBuffer(
-                "01 00 00 00 00 00 00 00 " + //reason, padding
-                "00 01 02 03 00 00 00 00 " + //port no, padding
-                "08 00 27 00 B0 EB 00 00 " + //mac address, padding
-                "73 31 2d 65 74 68 31 00 00 00 00 00 00 00 00 00 " + // port name, String "s1-eth1"
-                "00 00 00 24 " + //port config
-                "00 00 00 02 " + //port state
-                "00 00 00 81 00 00 00 A1 " + //current + advertised features
-                "00 00 FF FF 00 00 00 00 " + //supported + peer features
-                "00 00 00 81 00 00 00 80"); //curr speed, max speed
+                "01 00 00 00 00 00 00 00 " //reason, padding
+                + "00 01 02 03 00 00 00 00 " //port no, padding
+                + "08 00 27 00 B0 EB 00 00 " //mac address, padding
+                + "73 31 2d 65 74 68 31 00 00 00 00 00 00 00 00 00 " // port name, String "s1-eth1"
+                + "00 00 00 24 " //port config
+                + "00 00 00 02 " //port state
+                + "00 00 00 81 00 00 00 A1 " //current + advertised features
+                + "00 00 FF FF 00 00 00 00 " //supported + peer features
+                + "00 00 00 81 00 00 00 80"); //curr speed, max speed
 
         PortStatusMessage message = BufferHelper.deserialize(statusFactory, bb);
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java
index a0f73d5aea6c3159906eac017b4a1013b9792dbe..deee9f9a0ae41f3cbca5ca29d7a5820d03a0da4d 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java
@@ -58,26 +58,26 @@ public class QueueGetConfigReplyMessageFactoryMultiTest {
      */
     @Test
     public void test() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 " + // port
-                "00 00 00 00 " + // padding
-                "00 00 00 01 " + // queueId
-                "00 00 00 01 " + // port
-                "00 20 " + // length
-                "00 00 00 00 00 00 " + // pad
-                "00 02 " + // property
-                "00 10 " + // length
-                "00 00 00 00 " + // pad
-                "00 05 " + // rate
-                "00 00 00 00 00 00 " + // pad
-                "00 00 00 02 " + // queueId
-                "00 00 00 02 " + // port
-                "00 20 " + // length
-                "00 00 00 00 00 00 " + // pad
-                "00 02 " + // property
-                "00 10 " + // length
-                "00 00 00 00 " + // pad
-                "00 05 " + // rate
-                "00 00 00 00 00 00" // pad
+        ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 " // port
+                + "00 00 00 00 " // padding
+                + "00 00 00 01 " // queueId
+                + "00 00 00 01 " // port
+                + "00 20 " // length
+                + "00 00 00 00 00 00 " // pad
+                + "00 02 " // property
+                + "00 10 " // length
+                + "00 00 00 00 " // pad
+                + "00 05 " // rate
+                + "00 00 00 00 00 00 " // pad
+                + "00 00 00 02 " // queueId
+                + "00 00 00 02 " // port
+                + "00 20 " // length
+                + "00 00 00 00 00 00 " // pad
+                + "00 02 " // property
+                + "00 10 " // length
+                + "00 00 00 00 " // pad
+                + "00 05 " // rate
+                + "00 00 00 00 00 00" // pad
         );
 
         GetQueueConfigOutput builtByFactory = BufferHelper.deserialize(

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java
index 6a1fea6d48c57c5dc5d9b4147e18666be5a23e94..aaf8c104660226bc0b285e78377157c72c3bf89b 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java
@@ -67,31 +67,31 @@ public class MultipartReplyFlowTest {
      */
     @Test
     public void testMultipartReplyFlowBody() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00 " + //
+        ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00 " //
                                               // first flow stat
-                                              "00 48 08 00 " + // length, tableId, padding
-                                              "00 00 00 09 " + //durationSec
-                                              "00 00 00 07 " + //durationNsec
-                                              "00 0C 00 0E 00 0F 00 1F " + //priority, idleTimeout, hardTimeout, flags
-                                              "00 00 00 00 " + //pad_02
-                                              "FF 01 01 01 01 01 01 01 " + //cookie
-                                              "EF 01 01 01 01 01 01 01 " + //packetCount
-                                              "7F 01 01 01 01 01 01 01 " + //byteCount
-                                              "00 01 00 04 00 00 00 00 " + //empty match
-                                              "00 01 00 08 06 00 00 00 " + //
-                                              "00 01 00 08 06 00 00 00 " + //
+                                              + "00 48 08 00 " // length, tableId, padding
+                                              + "00 00 00 09 " //durationSec
+                                              + "00 00 00 07 " //durationNsec
+                                              + "00 0C 00 0E 00 0F 00 1F " //priority, idleTimeout, hardTimeout, flags
+                                              + "00 00 00 00 " //pad_02
+                                              + "FF 01 01 01 01 01 01 01 " //cookie
+                                              + "EF 01 01 01 01 01 01 01 " //packetCount
+                                              + "7F 01 01 01 01 01 01 01 " //byteCount
+                                              + "00 01 00 04 00 00 00 00 " //empty match
+                                              + "00 01 00 08 06 00 00 00 " //
+                                              + "00 01 00 08 06 00 00 00 " //
                                               // second flow stat
-                                              "00 48 08 00 " + // length, tableId, padding
-                                              "00 00 00 09 " + //durationSec
-                                              "00 00 00 07 " + //durationNsec
-                                              "00 0C 00 0E 00 0F 00 00 " + // priority, idleTimeout, hardTimeout, flags
-                                              "00 00 00 00 " + //pad_02
-                                              "FF 01 01 01 01 01 01 01 " + //cookie
-                                              "EF 01 01 01 01 01 01 01 " + //packetCount
-                                              "7F 01 01 01 01 01 01 01 " + //byteCount
-                                              "00 01 00 04 00 00 00 00 " + //empty match
-                                              "00 01 00 08 06 00 00 00 " + //
-                                              "00 01 00 08 06 00 00 00");
+                                              + "00 48 08 00 " // length, tableId, padding
+                                              + "00 00 00 09 " //durationSec
+                                              + "00 00 00 07 " //durationNsec
+                                              + "00 0C 00 0E 00 0F 00 00 " // priority, idleTimeout, hardTimeout, flags
+                                              + "00 00 00 00 " //pad_02
+                                              + "FF 01 01 01 01 01 01 01 " //cookie
+                                              + "EF 01 01 01 01 01 01 01 " //packetCount
+                                              + "7F 01 01 01 01 01 01 01 " //byteCount
+                                              + "00 01 00 04 00 00 00 00 " //empty match
+                                              + "00 01 00 08 06 00 00 00 " //
+                                              + "00 01 00 08 06 00 00 00");
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyGroupFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyGroupFeaturesTest.java
index e0bc3dab5453ad6da85a61afe7783fa3b0d0b120..d3763a690aefa5d9e8c27e014ef2b959c0a4861b 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyGroupFeaturesTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyGroupFeaturesTest.java
@@ -33,17 +33,17 @@ public class MultipartReplyGroupFeaturesTest {
      */
     @Test
     public void testMultipartReplyGroupFeatures() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 " + //
-                                              "00 00 00 0F " + // types
-                                              "00 00 00 0F " + // capabilities
-                                              "00 00 00 01 " + // max groups
-                                              "00 00 00 02 " + // max groups
-                                              "00 00 00 03 " + // max groups
-                                              "00 00 00 04 " + // max groups
-                                              "0F FF 98 01 " + // actions bitmap (all actions included)
-                                              "00 00 00 00 " + // actions bitmap (no actions included)
-                                              "00 00 00 00 " + // actions bitmap (no actions included)
-                                              "00 00 00 00"// actions bitmap (no actions included)
+        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 " //
+                                              + "00 00 00 0F " // types
+                                              + "00 00 00 0F " // capabilities
+                                              + "00 00 00 01 " // max groups
+                                              + "00 00 00 02 " // max groups
+                                              + "00 00 00 03 " // max groups
+                                              + "00 00 00 04 " // max groups
+                                              + "0F FF 98 01 " // actions bitmap (all actions included)
+                                              + "00 00 00 00 " // actions bitmap (no actions included)
+                                              + "00 00 00 00 " // actions bitmap (no actions included)
+                                              + "00 00 00 00" // actions bitmap (no actions included)
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 
@@ -79,17 +79,17 @@ public class MultipartReplyGroupFeaturesTest {
      */
     @Test
     public void testMultipartReplyGroupFeatures2() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 " + //
-                                              "00 00 00 00 " + // types
-                                              "00 00 00 00 " + // capabilities
-                                              "00 00 00 01 " + // max groups
-                                              "00 00 00 02 " + // max groups
-                                              "00 00 00 03 " + // max groups
-                                              "00 00 00 04 " + // max groups
-                                              "00 00 00 00 " + // actions bitmap (all actions included)
-                                              "00 00 00 00 " + // actions bitmap (no actions included)
-                                              "00 00 00 00 " + // actions bitmap (no actions included)
-                                              "00 00 00 00"// actions bitmap (no actions included)
+        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 " //
+                                              + "00 00 00 00 " // types
+                                              + "00 00 00 00 " // capabilities
+                                              + "00 00 00 01 " // max groups
+                                              + "00 00 00 02 " // max groups
+                                              + "00 00 00 03 " // max groups
+                                              + "00 00 00 04 " // max groups
+                                              + "00 00 00 00 " // actions bitmap (all actions included)
+                                              + "00 00 00 00 " // actions bitmap (no actions included)
+                                              + "00 00 00 00 " // actions bitmap (no actions included)
+                                              + "00 00 00 00" // actions bitmap (no actions included)
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyMeterFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyMeterFeaturesTest.java
index 6d7a48945d198aef941f45b78b96f744e95e989d..e9bd093bb9fb2510ca7742210082d9d9a9323b25 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyMeterFeaturesTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyMeterFeaturesTest.java
@@ -32,11 +32,11 @@ public class MultipartReplyMeterFeaturesTest {
      */
     @Test
     public void testMultipartReplyMeterFeatures() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 " + //
-                                              "00 00 00 0A " + // maxMeter
-                                              "00 00 00 06 " + // bandTypes
-                                              "00 00 00 0F " + // capabilities
-                                              "07 08 00 00" // maxBands, maxColor, padding
+        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 " //
+                                              + "00 00 00 0A " // maxMeter
+                                              + "00 00 00 06 " // bandTypes
+                                              + "00 00 00 0F " // capabilities
+                                              + "07 08 00 00" // maxBands, maxColor, padding
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 
@@ -58,11 +58,11 @@ public class MultipartReplyMeterFeaturesTest {
      */
     @Test
     public void testMultipartReplyMeterFeatures2() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 " + //
-                                              "00 00 00 09 " + // maxMeter
-                                              "00 00 00 00 " + // bandTypes
-                                              "00 00 00 00 " + // capabilities
-                                              "03 04 00 00" // maxBands, maxColor, padding
+        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 " //
+                                              + "00 00 00 09 " // maxMeter
+                                              + "00 00 00 00 " // bandTypes
+                                              + "00 00 00 00 " // capabilities
+                                              + "03 04 00 00" // maxBands, maxColor, padding
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyPortDescTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyPortDescTest.java
index af25bc99545172c21896e8406b0f065b0e25e61f..c3a55b42ee77ebc4337c9e3cfed07f85a4403702 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyPortDescTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyPortDescTest.java
@@ -51,31 +51,31 @@ public class MultipartReplyPortDescTest {
      */
     @Test
     public void testMultipartReplyPortDesc() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0D 00 00 00 00 00 00 " + //
+        ByteBuf bb = BufferHelper.buildBuffer("00 0D 00 00 00 00 00 00 " //
                                               // first port desc
-                                              "00 01 02 03 00 00 00 00 " + // portNo, padding
-                                              "08 00 27 00 B0 EB 00 00 " + // mac address, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 " + // name
-                                              "00 00 00 65 " + //port config
-                                              "00 00 00 07 " + //port state
-                                              "00 00 00 81 " + //current features
-                                              "00 00 FF FF " + //advertised features
-                                              "00 00 C1 89 " + //supported features
-                                              "00 00 C5 8D " + //peer features
-                                              "00 00 00 81 " + //curr speed
-                                              "00 00 00 80 " + //max speed
+                                              + "00 01 02 03 00 00 00 00 " // portNo, padding
+                                              + "08 00 27 00 B0 EB 00 00 " // mac address, padding
+                                              + "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 " // name
+                                              + "00 00 00 65 " //port config
+                                              + "00 00 00 07 " //port state
+                                              + "00 00 00 81 " //current features
+                                              + "00 00 FF FF " //advertised features
+                                              + "00 00 C1 89 " //supported features
+                                              + "00 00 C5 8D " //peer features
+                                              + "00 00 00 81 " //curr speed
+                                              + "00 00 00 80 " //max speed
                                               // second port desc
-                                              "00 00 00 01 00 00 00 00 " + // portNo, padding
-                                              "08 00 27 00 B0 EB 00 00 " + // mac address, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 " + // name
-                                              "00 00 00 00 " + //port config
-                                              "00 00 00 00 " + //port state
-                                              "00 00 00 00 " + //current features
-                                              "00 00 00 00 " + //advertised features
-                                              "00 00 00 00 " + //supported features
-                                              "00 00 00 00 " + //peer features
-                                              "00 00 00 05 " + //curr speed
-                                              "00 00 00 06" //max speed
+                                              + "00 00 00 01 00 00 00 00 " // portNo, padding
+                                              + "08 00 27 00 B0 EB 00 00 " // mac address, padding
+                                              + "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 " // name
+                                              + "00 00 00 00 " //port config
+                                              + "00 00 00 00 " //port state
+                                              + "00 00 00 00 " //current features
+                                              + "00 00 00 00 " //advertised features
+                                              + "00 00 00 00 " //supported features
+                                              + "00 00 00 00 " //peer features
+                                              + "00 00 00 05 " //curr speed
+                                              + "00 00 00 06" //max speed
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java
index 6a4ef19c15bcfe66cf51c0dc2c85897ad829dfa3..07b9c62eaf552e8339521ae0d7495a18067d0347 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java
@@ -53,23 +53,23 @@ public class MultipartReplyTableFeaturesTest {
      */
     @Test
     public void testMultipartReplyTableFeatures() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 " + //
+        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 " //
                                               // first table feature
-                                              "00 40 01 00 00 00 00 00 " + // length, tableId, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 " + //
-                                              "00 00 00 00 00 00 00 00 00 00 00 00 00 " + // name
-                                              "00 00 00 00 00 00 00 01 " + // metadata match
-                                              "00 00 00 00 00 00 00 02 " + // metadata write
-                                              "00 00 00 00 " + // config
-                                              "00 00 00 2A " + // max entries
+                                              + "00 40 01 00 00 00 00 00 " // length, tableId, padding
+                                              + "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 " //
+                                              + "00 00 00 00 00 00 00 00 00 00 00 00 00 " // name
+                                              + "00 00 00 00 00 00 00 01 " // metadata match
+                                              + "00 00 00 00 00 00 00 02 " // metadata write
+                                              + "00 00 00 00 " // config
+                                              + "00 00 00 2A " // max entries
                                               // second table feature
-                                              "00 40 02 00 00 00 00 00 " + // length, tableId, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00"
-                                              + " 00 00 00 00 00 00 00 00 00 00 00 00 00 " + // name
-                                              "00 00 00 00 00 00 00 03 " + // metadata match
-                                              "00 00 00 00 00 00 00 04 " + // metadata write
-                                              "00 00 00 03 " + // config
-                                              "00 00 00 2B"  // max entries
+                                              + "00 40 02 00 00 00 00 00 " // length, tableId, padding
+                                              + "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 "
+                                              + "00 00 00 00 00 00 00 00 00 00 00 00 00 " // name
+                                              + "00 00 00 00 00 00 00 03 " // metadata match
+                                              + "00 00 00 00 00 00 00 04 " // metadata write
+                                              + "00 00 00 03 " // config
+                                              + "00 00 00 2B"  // max entries
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 
@@ -105,28 +105,28 @@ public class MultipartReplyTableFeaturesTest {
      */
     @Test
     public void testMultipartReplyTableFeatures2() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 " + //
-                                              "00 B0 01 00 00 00 00 00 " + // length, tableId, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 " + //
-                                              "00 00 00 00 00 00 00 00 00 00 00 00 00 " + // name
-                                              "00 00 00 00 00 00 00 01 " + // metadata match
-                                              "00 00 00 00 00 00 00 02 " + // metadata write
-                                              "00 00 00 00 " + // config
-                                              "00 00 00 2A " + // max entries
-                                              "00 00 00 04 00 00 00 00 " + //
-                                              "00 01 00 04 00 00 00 00 " + //
-                                              "00 02 00 08 01 02 03 04 " + //
-                                              "00 03 00 07 05 06 07 00 " + //
-                                              "00 04 00 04 00 00 00 00 " + //
-                                              "00 05 00 04 00 00 00 00 " + //
-                                              "00 06 00 04 00 00 00 00 " + //
-                                              "00 07 00 04 00 00 00 00 " + //
-                                              "00 08 00 04 00 00 00 00 " + //
-                                              "00 0A 00 04 00 00 00 00 " + //
-                                              "00 0C 00 04 00 00 00 00 " + //
-                                              "00 0D 00 04 00 00 00 00 " + //
-                                              "00 0E 00 04 00 00 00 00 " + //
-                                              "00 0F 00 04 00 00 00 00"
+        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 " //
+                                              + "00 B0 01 00 00 00 00 00 " // length, tableId, padding
+                                              + "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 " //
+                                              + "00 00 00 00 00 00 00 00 00 00 00 00 00 " // name
+                                              + "00 00 00 00 00 00 00 01 " // metadata match
+                                              + "00 00 00 00 00 00 00 02 " // metadata write
+                                              + "00 00 00 00 " // config
+                                              + "00 00 00 2A " // max entries
+                                              + "00 00 00 04 00 00 00 00 "
+                                              + "00 01 00 04 00 00 00 00 "
+                                              + "00 02 00 08 01 02 03 04 "
+                                              + "00 03 00 07 05 06 07 00 "
+                                              + "00 04 00 04 00 00 00 00 "
+                                              + "00 05 00 04 00 00 00 00 "
+                                              + "00 06 00 04 00 00 00 00 "
+                                              + "00 07 00 04 00 00 00 00 "
+                                              + "00 08 00 04 00 00 00 00 "
+                                              + "00 0A 00 04 00 00 00 00 "
+                                              + "00 0C 00 04 00 00 00 00 "
+                                              + "00 0D 00 04 00 00 00 00 "
+                                              + "00 0E 00 04 00 00 00 00 "
+                                              + "00 0F 00 04 00 00 00 00"
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);