Optimize mask creation utilities

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / PortModInputMessageFactory.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactory.java
index 61632cf7902440a3f2f2c3888d867b9ffbf5e13d..ba271d6a49130e3d889771afc77d5f803254ae37 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactory.java
@@ -32,7 +32,7 @@ public class PortModInputMessageFactory implements OFSerializer<PortModInput> {
     private static final byte PADDING_IN_PORT_MOD_MESSAGE_03 = 4;
 
     @Override
-    public void serialize(PortModInput message, ByteBuf outBuffer) {
+    public void serialize(final PortModInput message, final ByteBuf outBuffer) {
         ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH);
         outBuffer.writeInt(message.getPortNo().getValue().intValue());
         ByteBufUtils.padBuffer(PADDING_IN_PORT_MOD_MESSAGE_01, outBuffer);
@@ -47,42 +47,37 @@ public class PortModInputMessageFactory implements OFSerializer<PortModInput> {
 
     /**
      * @param config
-     * @return port config bitmask 
+     * @return port config bitmask
      */
-    private static int createPortConfigBitmask(PortConfig config) {
+    private static int createPortConfigBitmask(final PortConfig config) {
         int configBitmask = 0;
         Map<Integer, Boolean> portConfigMap = new HashMap<>();
         portConfigMap.put(0, config.isPortDown());
         portConfigMap.put(2, config.isNoRecv());
         portConfigMap.put(5, config.isNoFwd());
         portConfigMap.put(6, config.isNoPacketIn());
-        
+
         configBitmask = ByteBufUtils.fillBitMaskFromMap(portConfigMap);
         return configBitmask;
     }
-    
-    private static int createPortFeaturesBitmask(PortFeatures feature) {
-        int configBitmask = 0;
-        Map<Integer, Boolean> portFeaturesMap = new HashMap<>();
-        portFeaturesMap.put(0, feature.is_10mbHd());
-        portFeaturesMap.put(1, feature.is_10mbFd());
-        portFeaturesMap.put(2, feature.is_100mbHd());
-        portFeaturesMap.put(3, feature.is_100mbFd());
-        portFeaturesMap.put(4, feature.is_1gbHd());
-        portFeaturesMap.put(5, feature.is_1gbFd());
-        portFeaturesMap.put(6, feature.is_10gbFd());
-        portFeaturesMap.put(7, feature.is_40gbFd());
-        portFeaturesMap.put(8, feature.is_100gbFd());
-        portFeaturesMap.put(9, feature.is_1tbFd());
-        portFeaturesMap.put(10, feature.isOther());
-        portFeaturesMap.put(11, feature.isCopper());
-        portFeaturesMap.put(12, feature.isFiber());
-        portFeaturesMap.put(13, feature.isAutoneg());
-        portFeaturesMap.put(14, feature.isPause());
-        portFeaturesMap.put(15, feature.isPauseAsym());
-        
-        configBitmask = ByteBufUtils.fillBitMaskFromMap(portFeaturesMap);
-        return configBitmask;
+
+    private static int createPortFeaturesBitmask(final PortFeatures feature) {
+        return ByteBufUtils.fillBitMask(0, feature.is_10mbHd(),
+                feature.is_10mbFd(),
+                feature.is_100mbHd(),
+                feature.is_100mbFd(),
+                feature.is_1gbHd(),
+                feature.is_1gbFd(),
+                feature.is_10gbFd(),
+                feature.is_40gbFd(),
+                feature.is_100gbFd(),
+                feature.is_1tbFd(),
+                feature.isOther(),
+                feature.isCopper(),
+                feature.isFiber(),
+                feature.isAutoneg(),
+                feature.isPause(),
+                feature.isPauseAsym());
     }
 
 }