Remove EncodeConstants.SIZE_OF_{BYTE,SHORT,INT,LONG}_IN_BYTES

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / match / VlanVidEntryDeserializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializer.java
index 2298b23c4695b336cd39b29456b67919cb2d065c..5886a9a018872a13f548cbc842674c4be93c99a3 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializer.java
@@ -5,19 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-import java.util.Objects;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.vlan.match.fields.VlanIdBuilder;
 
 public class VlanVidEntryDeserializer extends AbstractMatchEntryDeserializer {
-
     @Override
     public void deserializeEntry(ByteBuf message, MatchBuilder builder) {
         final boolean hasMask = processHeader(message);
@@ -25,23 +21,23 @@ public class VlanVidEntryDeserializer extends AbstractMatchEntryDeserializer {
         final int vlanVidValue = message.readUnsignedShort();
 
         if (hasMask) {
-            message.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES); // Skip mask
+            message.skipBytes(Short.BYTES); // Skip mask
             vlanIdBuilder
                     .setVlanId(new VlanId(0))
                     .setVlanIdPresent(true);
         } else {
-            final boolean vidPresent = (vlanVidValue & (1 << 12)) != 0;
+            final boolean vidPresent = (vlanVidValue & 1 << 12) != 0;
 
             vlanIdBuilder
-                    .setVlanId(new VlanId((vidPresent ? vlanVidValue & ((1 << 12) - 1) : vlanVidValue)))
+                    .setVlanId(new VlanId(vidPresent ? vlanVidValue & (1 << 12) - 1 : vlanVidValue))
                     .setVlanIdPresent(vidPresent);
         }
 
-        if (Objects.isNull(builder.getVlanMatch())) {
+        if (builder.getVlanMatch() == null) {
             builder.setVlanMatch(new VlanMatchBuilder()
                     .setVlanId(vlanIdBuilder.build())
                     .build());
-        } else if (Objects.isNull(builder.getVlanMatch().getVlanId())) {
+        } else if (builder.getVlanMatch().getVlanId() == null) {
             builder.setVlanMatch(new VlanMatchBuilder(builder.getVlanMatch())
                     .setVlanId(vlanIdBuilder.build())
                     .build());
@@ -49,5 +45,4 @@ public class VlanVidEntryDeserializer extends AbstractMatchEntryDeserializer {
             throwErrorOnMalformed(builder, "vlanMatch", "vlanVid");
         }
     }
-
 }