Rename to match the name of classes that are supplied to codec

Change-Id: I4b67ce8343cd0227728c55ba9a0181855464ecc6
(cherry picked from commit a0f6530e)

@@ -46,8 +46,8 @@ final class Codecs {
     }
 
     private void init() {
-        codecs.put(VlanId.class, new VlanCodec());
-        codecs.put(MplsLabel.class, new MplsCodec());
+        codecs.put(VlanId.class, new VlanIdCodec());
+        codecs.put(MplsLabel.class, new MplsLabelCodec());
     }
 
     /**

@@ -78,8 +78,8 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
             .register(EmptyDiscreteResources.class)
             .register(new EncodedResourcesSerializer(), EncodedDiscreteResources.class)
             .register(ContinuousResourceAllocation.class)
-            .register(VlanCodec.class)
-            .register(MplsCodec.class)
+            .register(VlanIdCodec.class)
+            .register(MplsLabelCodec.class)
             .build());
 
     // TODO: We should provide centralized values for this

@@ -23,7 +23,7 @@ import org.onosproject.net.resource.DiscreteResourceCodec;
  * Codec for MplsLabel.
  */
 @Beta
-final class MplsCodec implements DiscreteResourceCodec<MplsLabel> {
+final class MplsLabelCodec implements DiscreteResourceCodec<MplsLabel> {
     @Override
     public int encode(MplsLabel resource) {
         return resource.toInt();
@@ -49,6 +49,6 @@ final class MplsCodec implements DiscreteResourceCodec<MplsLabel> {
 
     @Override
     public int hashCode() {
-        return MplsCodec.class.hashCode();
+        return MplsLabelCodec.class.hashCode();
     }
 }

@@ -23,7 +23,7 @@ import org.onosproject.net.resource.DiscreteResourceCodec;
  * Codec for Vlan.
  */
 @Beta
-final class VlanCodec implements DiscreteResourceCodec<VlanId> {
+final class VlanIdCodec implements DiscreteResourceCodec<VlanId> {
     @Override
     public int encode(VlanId resource) {
         return resource.toShort();
@@ -49,6 +49,6 @@ final class VlanCodec implements DiscreteResourceCodec<VlanId> {
 
     @Override
     public int hashCode() {
-        return VlanCodec.class.hashCode();
+        return VlanIdCodec.class.hashCode();
     }
 }