From da06de0834e6d925a8af9d3e9bc7483b7fcb18cb Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 4 Jan 2021 10:52:30 +0100
Subject: [PATCH] Do not use sal-common-util

This simple helper has been deprecated, stop using it.

Change-Id: I30a1b2999751fddf12735d673791426a0779d620
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 openflowplugin/pom.xml                        |  4 ---
 .../sal/convertor/PacketOutConvertor.java     | 35 ++++++++++---------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 32f2b94b06..54c51a130e 100644
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -78,10 +78,6 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflowjava-util</artifactId>
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
index dbdec7239b..66aa772bb6 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,7 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import org.opendaylight.controller.sal.common.util.Arguments;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
@@ -32,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
@@ -71,13 +72,14 @@ public class PacketOutConvertor extends Convertor<TransmitPacketInput, PacketOut
     }
 
     private static PortNumber getPortNumber(final PathArgument pathArgument, final Short ofVersion) {
+        checkArgument(pathArgument instanceof IdentifiableItem, "Unexpected path argument %s", pathArgument);
+
         // FIXME VD P! find InstanceIdentifier helper
-        InstanceIdentifier.IdentifiableItem<?, ?> item = Arguments.checkInstanceOf(pathArgument,
-                InstanceIdentifier.IdentifiableItem.class);
-        NodeConnectorKey key = Arguments.checkInstanceOf(item.getKey(), NodeConnectorKey.class);
-        Uint32 port = InventoryDataServiceUtil.portNumberfromNodeConnectorId(
-                OpenflowVersion.get(ofVersion), key.getId());
-        return new PortNumber(port);
+        final Object key = ((IdentifiableItem<?, ?>) pathArgument).getKey();
+        checkArgument(key instanceof NodeConnectorKey, "Unexpected key %s", key);
+
+        return new PortNumber(InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.get(ofVersion),
+            ((NodeConnectorKey) key).getId()));
     }
 
     @Override
@@ -148,14 +150,13 @@ public class PacketOutConvertor extends Convertor<TransmitPacketInput, PacketOut
             actions.add(actionBuild.build());
         }
 
-        PacketOutInputBuilder builder = new PacketOutInputBuilder();
-        builder.setAction(actions);
-        builder.setData(source.getPayload());
-        builder.setVersion(data.getVersion());
-        builder.setXid(data.getXid());
-        builder.setInPort(inPortNr);
-        builder.setBufferId(bufferId);
-
-        return builder.build();
+        return new PacketOutInputBuilder()
+            .setAction(actions)
+            .setData(source.getPayload())
+            .setVersion(data.getVersion())
+            .setXid(data.getXid())
+            .setInPort(inPortNr)
+            .setBufferId(bufferId)
+            .build();
     }
 }
-- 
2.36.6