Migrate uint/ByteBuf interactions

[openflowplugin.git] / extension / openflowjava-extension-nicira / src / main / java / org / opendaylight / openflowjava / nx / codec / action / OutputRegCodec.java

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java
index 77f577226b3ec3859cc6c76240476541656f6a92..a10fcf026e7720a84ebc7806df444e33adc0f482 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java
@@ -1,27 +1,27 @@
-/**
+/*
  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.openflowjava.nx.codec.action;
 
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint16;
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint32;
+
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.nx.api.NiciraActionDeserializerKey;
 import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.output.action._case.OutputAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.NxmNxOutputReg;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputRegBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg.grouping.NxActionOutputRegBuilder;
 
 /**
- * Codec for the Nicira OutputRegAction
+ * Codec for the Nicira OutputRegAction.
  *
  * @author readams
  */
@@ -35,8 +35,8 @@ public class OutputRegCodec extends AbstractActionCodec {
             new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, SUBTYPE);
 
     @Override
-    public void serialize(Action input, ByteBuf outBuffer) {
-        ActionOutputReg action = ((ActionOutputReg) input.getActionChoice());
+    public void serialize(final Action input, final ByteBuf outBuffer) {
+        ActionOutputReg action = (ActionOutputReg) input.getActionChoice();
         serializeHeader(LENGTH, SUBTYPE, outBuffer);
         outBuffer.writeShort(action.getNxActionOutputReg().getNBits().shortValue());
         outBuffer.writeInt(action.getNxActionOutputReg().getSrc().intValue());
@@ -45,13 +45,13 @@ public class OutputRegCodec extends AbstractActionCodec {
     }
 
     @Override
-    public Action deserialize(ByteBuf message) {
-        ActionBuilder actionBuilder = deserializeHeader(message);
-        ActionOutputRegBuilder builder = new ActionOutputRegBuilder();
+    public Action deserialize(final ByteBuf message) {
+        final ActionBuilder actionBuilder = deserializeHeader(message);
+        final ActionOutputRegBuilder builder = new ActionOutputRegBuilder();
         NxActionOutputRegBuilder nxActionOutputRegBuilder = new NxActionOutputRegBuilder();
-        nxActionOutputRegBuilder.setNBits(message.readUnsignedShort());
-        nxActionOutputRegBuilder.setSrc(message.readUnsignedInt());
-        nxActionOutputRegBuilder.setMaxLen(message.readUnsignedShort());
+        nxActionOutputRegBuilder.setNBits(readUint16(message));
+        nxActionOutputRegBuilder.setSrc(readUint32(message));
+        nxActionOutputRegBuilder.setMaxLen(readUint16(message));
         message.skipBytes(PADDING_IN_OUTPUT_REG_ACTION);
         builder.setNxActionOutputReg(nxActionOutputRegBuilder.build());
         actionBuilder.setActionChoice(builder.build());