BUG-3363: code optimization and cleanup - Fix a few warnings

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

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/AbstractActionCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/AbstractActionCodec.java
index 29f997d49e731a7ddbd5943e5c49053d589e5a97..459377d69c5f5b64e3e9692c5746152c3f928659 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/AbstractActionCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/AbstractActionCodec.java
@@ -1,6 +1,6 @@
 /**
  * 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
@@ -8,37 +8,31 @@
 package org.opendaylight.openflowjava.nx.codec.action;
 
 import io.netty.buffer.ByteBuf;
-
 import org.opendaylight.openflowjava.nx.api.NiciraConstants;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.ExperimenterActionSubType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder;
+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.openflow.common.types.rev130731.ExperimenterId;
 
 /**
  * @author msunal
- *
  */
 public abstract class AbstractActionCodec implements OFSerializer<Action>, OFDeserializer<Action> {
 
-    protected final static void serializeHeader(int msgLength, int subtype, ByteBuf outBuffer) {
+    protected final static void serializeHeader(final int msgLength, final int subtype, final ByteBuf outBuffer) {
         outBuffer.writeShort(EncodeConstants.EXPERIMENTER_VALUE);
         writeMsgLengthVendorIdSubtypeToBuffer(msgLength, subtype, outBuffer);
     }
 
-    private final static void writeMsgLengthVendorIdSubtypeToBuffer(int msgLength, int subtype, ByteBuf outBuffer) {
+    private final static void writeMsgLengthVendorIdSubtypeToBuffer(final int msgLength, final int subtype, final ByteBuf outBuffer) {
         outBuffer.writeShort(msgLength);
         outBuffer.writeInt(NiciraConstants.NX_VENDOR_ID.intValue());
         outBuffer.writeShort(subtype);
     }
-    
-    protected final static ActionBuilder deserializeHeader(ByteBuf message) {
+
+    protected final static ActionBuilder deserializeHeader(final ByteBuf message) {
         // size of experimenter type
         message.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         // size of length
@@ -48,15 +42,13 @@ public abstract class AbstractActionCodec implements OFSerializer<Action>, OFDes
         // subtype
         message.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         ActionBuilder actionBuilder = new ActionBuilder();
-        actionBuilder.setType(Experimenter.class);
+        actionBuilder.setExperimenterId(getExperimenterId());
         return actionBuilder;
     }
-    
-    protected final static ExperimenterIdAction createExperimenterIdAction(Class<? extends ExperimenterActionSubType> subtype) {
-        ExperimenterIdActionBuilder expIdBuilder = new ExperimenterIdActionBuilder();
-        expIdBuilder.setExperimenter(new ExperimenterId(NiciraConstants.NX_VENDOR_ID));
-        expIdBuilder.setSubType(subtype);
-        return expIdBuilder.build();
+
+    protected final static ExperimenterId getExperimenterId(){
+        return new ExperimenterId(NiciraConstants.NX_VENDOR_ID);
     }
 
+
 }