[ONOS-3737] Bump up checkstyle version from 2.16 to 2.17 with some compilation fixes
Change-Id: I3ade52ff15b3114f5748ab3151c02c8c74af38f0
diff --git a/utils/misc/src/main/java/org/onlab/packet/IGMP.java b/utils/misc/src/main/java/org/onlab/packet/IGMP.java
index 938cd6e..5f82d82 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IGMP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IGMP.java
@@ -159,7 +159,7 @@
@java.lang.SuppressWarnings(SONAR_SWITCH_FALLTHROUGH) // suppress switch fall through warning
@Override
public byte[] serialize() {
- byte [] data = new byte[8915];
+ byte[] data = new byte[8915];
ByteBuffer bb = ByteBuffer.wrap(data);
bb.put(this.getIgmpType());
@@ -193,7 +193,7 @@
int size = bb.position();
bb.position(0);
- byte [] rdata = new byte[size];
+ byte[] rdata = new byte[size];
bb.get(rdata, 0, size);
return rdata;
}
diff --git a/utils/misc/src/main/java/org/onlab/packet/pim/PIMHelloOption.java b/utils/misc/src/main/java/org/onlab/packet/pim/PIMHelloOption.java
index 1ea0ba8..7d05d92 100644
--- a/utils/misc/src/main/java/org/onlab/packet/pim/PIMHelloOption.java
+++ b/utils/misc/src/main/java/org/onlab/packet/pim/PIMHelloOption.java
@@ -131,7 +131,7 @@
return opt;
}
- public byte [] serialize() {
+ public byte[] serialize() {
int len = 4 + this.optLength;
ByteBuffer bb = ByteBuffer.allocate(len);
bb.putShort(this.optType);
diff --git a/utils/misc/src/test/java/org/onlab/packet/IGMPTest.java b/utils/misc/src/test/java/org/onlab/packet/IGMPTest.java
index 7634bbf..6a8a37b 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IGMPTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IGMPTest.java
@@ -73,7 +73,7 @@
@Test
public void testDeserializeTruncated() throws Exception {
- byte [] bits = igmpQuery.serialize();
+ byte[] bits = igmpQuery.serialize();
PacketTestUtils.testDeserializeTruncated(deserializer, bits);
bits = igmpMembership.serialize();
@@ -82,14 +82,14 @@
@Test
public void testDeserializeQuery() throws Exception {
- byte [] data = igmpQuery.serialize();
+ byte[] data = igmpQuery.serialize();
IGMP igmp = deserializer.deserialize(data, 0, data.length);
assertTrue(igmp.equals(igmpQuery));
}
@Test
public void testDeserializeMembership() throws Exception {
- byte [] data = igmpMembership.serialize();
+ byte[] data = igmpMembership.serialize();
IGMP igmp = deserializer.deserialize(data, 0, data.length);
assertTrue(igmp.equals(igmpMembership));
}
diff --git a/utils/misc/src/test/java/org/onlab/packet/PIMTest.java b/utils/misc/src/test/java/org/onlab/packet/PIMTest.java
index 7fba3cd..8e3e890 100644
--- a/utils/misc/src/test/java/org/onlab/packet/PIMTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/PIMTest.java
@@ -101,7 +101,7 @@
*/
@Test
public void testDeserializeTruncated() throws Exception {
- byte [] bits = pimJoinPrune.serialize();
+ byte[] bits = pimJoinPrune.serialize();
PacketTestUtils.testDeserializeTruncated(deserializer, bits);
}
@@ -112,7 +112,7 @@
*/
@Test
public void testDeserializeHello() throws Exception {
- byte [] data = pimHello.serialize();
+ byte[] data = pimHello.serialize();
PIM pim = deserializer.deserialize(data, 0, data.length);
assertTrue(pim.equals(pimHello));
}
@@ -124,7 +124,7 @@
*/
@Test
public void testDeserializeJoinPrune() throws Exception {
- byte [] data = pimJoinPrune.serialize();
+ byte[] data = pimJoinPrune.serialize();
PIM pim = deserializer.deserialize(data, 0, data.length);
assertTrue(pim.equals(pimJoinPrune));
}