Use Short.BYTES

We have a few places where we a using Short.SIZE / Byte.SIZE. This
is already a constant known as Short.BYTES.

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

diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java
index f91e479e7d29fdd88894020b6b666ef320a0a6cd..be727c9b299aed743511a4b6dba7ddaa9c3d6d82 100644 (file)
--- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java
+++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java
@@ -70,7 +70,7 @@ public interface EncodeConstants {
     byte GROUPS_IN_IPV6_ADDRESS = 8;
 
     /** Length of ipv6 address in bytes. */
-    byte SIZE_OF_IPV6_ADDRESS_IN_BYTES = 8 * Short.SIZE / Byte.SIZE;
+    byte SIZE_OF_IPV6_ADDRESS_IN_BYTES = 8 * Short.BYTES;
 
     /** Length of 3 bytes. */
     byte SIZE_OF_3_BYTES = 3;

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
index 4d00442316d5bc0f0b331c9a4995665b9c68f8ec..6b520c6f28914db12e593647f66c451275c34ac9 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
@@ -117,7 +117,7 @@ public class MeterModInputMessageFactoryTest {
         final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
         MeterBandDropBuilder dropBand = new MeterBandDropBuilder();
         dropBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
-        input.skipBytes(Short.SIZE / Byte.SIZE);
+        input.skipBytes(Short.BYTES);
         dropBand.setRate(Uint32.fromIntBits(input.readInt()));
         dropBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
         input.skipBytes(4);
@@ -126,7 +126,7 @@ public class MeterModInputMessageFactoryTest {
         final MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
         MeterBandDscpRemarkBuilder dscpRemarkBand = new MeterBandDscpRemarkBuilder();
         dscpRemarkBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
-        input.skipBytes(Short.SIZE / Byte.SIZE);
+        input.skipBytes(Short.BYTES);
         dscpRemarkBand.setRate(Uint32.fromIntBits(input.readInt()));
         dscpRemarkBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
         dscpRemarkBand.setPrecLevel(Uint8.fromByteBits(input.readByte()));

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java
index e0693f66357395bd5f288758fbcec6eacdb0761b..97d0ca4256d20ae66ee1f893f90a9bbe021cf323 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java
@@ -1065,7 +1065,7 @@ public class MultipartReplyMessageFactoryTest {
         final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
         MeterBandDropBuilder dropBand = new MeterBandDropBuilder();
         dropBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
-        input.skipBytes(Short.SIZE / Byte.SIZE);
+        input.skipBytes(Short.BYTES);
         dropBand.setRate(Uint32.fromIntBits(input.readInt()));
         dropBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
         dropCaseBuilder.setMeterBandDrop(dropBand.build());
@@ -1073,7 +1073,7 @@ public class MultipartReplyMessageFactoryTest {
         final MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
         MeterBandDscpRemarkBuilder dscpRemarkBand = new MeterBandDscpRemarkBuilder();
         dscpRemarkBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
-        input.skipBytes(Short.SIZE / Byte.SIZE);
+        input.skipBytes(Short.BYTES);
         dscpRemarkBand.setRate(Uint32.fromIntBits(input.readInt()));
         dscpRemarkBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
         dscpRemarkBand.setPrecLevel(Uint8.valueOf(3));