Bump upstreams

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / serialization / messages / PortMessageSerializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializer.java
index 63058b70d1acc6e6ab4ebfb5afee77531bde3b60..ac8a8c87f1dbfd340d92f238885c9a0d2ac2c3ce 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializer.java
@@ -5,13 +5,12 @@
  * 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.openflowplugin.impl.protocol.serialization.messages;
 
-import com.google.common.base.MoreObjects;
+import static java.util.Objects.requireNonNullElse;
+
 import com.google.common.collect.ImmutableMap;
 import io.netty.buffer.ByteBuf;
-import java.util.Objects;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
@@ -25,11 +24,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.P
  * OF protocol versions: 1.3.
  */
 public class PortMessageSerializer extends AbstractMessageSerializer<PortMessage> {
-
     private static final byte PADDING_IN_PORT_MOD_MESSAGE_01 = 4;
     private static final byte PADDING_IN_PORT_MOD_MESSAGE_02 = 2;
     private static final byte PADDING_IN_PORT_MOD_MESSAGE_03 = 4;
-    private static final int DEFAULT_PORT_CONFIG_MASK = createPortConfigBitMask(
+    private static final Integer DEFAULT_PORT_CONFIG_MASK = createPortConfigBitMask(
             new PortConfig(true, true, true, true));
 
     @Override
@@ -39,11 +37,10 @@ public class PortMessageSerializer extends AbstractMessageSerializer<PortMessage
         outBuffer.writeInt(OpenflowPortsUtil
                 .getProtocolPortNumber(OpenflowVersion.OF13, message.getPortNumber()).intValue());
         outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_01);
-        outBuffer.writeBytes(IetfYangUtil.INSTANCE.bytesFor(message.getHardwareAddress()));
+        outBuffer.writeBytes(IetfYangUtil.macAddressBytes(message.getHardwareAddress()));
         outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_02);
         outBuffer.writeInt(createPortConfigBitMask(message.getConfiguration()));
-        outBuffer.writeInt(MoreObjects
-                .firstNonNull(createPortConfigBitMask(message.getMask()), DEFAULT_PORT_CONFIG_MASK));
+        outBuffer.writeInt(requireNonNullElse(createPortConfigBitMask(message.getMask()), DEFAULT_PORT_CONFIG_MASK));
         outBuffer.writeInt(createPortFeaturesBitMask(message.getAdvertisedFeatures()));
         outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_03);
         outBuffer.setShort(index + 2, outBuffer.writerIndex() - index);
@@ -55,33 +52,32 @@ public class PortMessageSerializer extends AbstractMessageSerializer<PortMessage
     }
 
     private static Integer createPortConfigBitMask(final PortConfig config) {
-        return Objects.isNull(config) ? null : ByteBufUtils.fillBitMaskFromMap(ImmutableMap
+        return config == null ? null : ByteBufUtils.fillBitMaskFromMap(ImmutableMap
                 .<Integer, Boolean>builder()
-                .put(0, config.isPORTDOWN())
-                .put(2, config.isNORECV())
-                .put(5, config.isNOFWD())
-                .put(6, config.isNOPACKETIN())
+                .put(0, config.getPORTDOWN())
+                .put(2, config.getNORECV())
+                .put(5, config.getNOFWD())
+                .put(6, config.getNOPACKETIN())
                 .build());
     }
 
     private static int createPortFeaturesBitMask(final PortFeatures feature) {
         return ByteBufUtils.fillBitMask(0,
-                feature.isTenMbHd(),
-                feature.isTenMbFd(),
-                feature.isHundredMbHd(),
-                feature.isHundredMbFd(),
-                feature.isOneGbHd(),
-                feature.isOneGbFd(),
-                feature.isTenGbFd(),
-                feature.isFortyGbFd(),
-                feature.isHundredGbFd(),
-                feature.isOneTbFd(),
-                feature.isOther(),
-                feature.isCopper(),
-                feature.isFiber(),
-                feature.isAutoeng(),
-                feature.isPause(),
-                feature.isPauseAsym());
+                feature.getTenMbHd(),
+                feature.getTenMbFd(),
+                feature.getHundredMbHd(),
+                feature.getHundredMbFd(),
+                feature.getOneGbHd(),
+                feature.getOneGbFd(),
+                feature.getTenGbFd(),
+                feature.getFortyGbFd(),
+                feature.getHundredGbFd(),
+                feature.getOneTbFd(),
+                feature.getOther(),
+                feature.getCopper(),
+                feature.getFiber(),
+                feature.getAutoeng(),
+                feature.getPause(),
+                feature.getPauseAsym());
     }
-
 }