commit cad338a4cbbcecbf49b1f0cce0f650d10b1673e1
author Charles Chan <rascov@gmail.com> Fri Sep 16 18:03:11 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Oct 19 16:55:56 2016 +0000
tree 9923f34ece13753aec4b49802a91e8b4cbff97a2
parent d2edd470303ab3e7ce9e7e51b61439a9831214c2

CORD-413 Implement MPLS Termination in OFDPA3 pipeliner

Additionally, this patch includes
- Minor refactoring
- Skip method length checkstyle for FlowEntryBuilder::hasSetField

Change-Id: I7887f454f552a9e346c323524f359929deadf427

drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchVlanVidCodec.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchVlanVidCodec.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchVlanVidCodec.java
index bc0e876..65ed92b 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchVlanVidCodec.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/codec/OfdpaMatchVlanVidCodec.java
@@ -30,15 +30,14 @@
 public class OfdpaMatchVlanVidCodec extends JsonCodec<OfdpaMatchVlanVid> {
 
     private static final String VLAN_ID = "vlanId";
-
     private static final String MISSING_MEMBER_MESSAGE = " member is required in OfdpaMatchVlanVid";
+    private static final String MISSING_VLAN_ID_MESSAGE = "Vlan ID cannot be null";
 
     @Override
     public ObjectNode encode(OfdpaMatchVlanVid vlanId, CodecContext context) {
-        checkNotNull(vlanId, "Vlan ID cannot be null");
-        ObjectNode root = context.mapper().createObjectNode()
+        checkNotNull(vlanId, MISSING_VLAN_ID_MESSAGE);
+        return context.mapper().createObjectNode()
                 .put(VLAN_ID, vlanId.vlanId().id());
-        return root;
     }
 
     @Override