OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

[openflowplugin.git] / samples / learning-switch / src / main / java / org / opendaylight / openflowplugin / learningswitch / LearningSwitchHandlerSimpleImpl.java

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchHandlerSimpleImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchHandlerSimpleImpl.java
index d1a0b9be0ad08c26cca16637906dc30cf75fd407..a7d86b9300b2b28c81c2f0d1eae630b881567936 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchHandlerSimpleImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchHandlerSimpleImpl.java
@@ -96,7 +96,7 @@ public class LearningSwitchHandlerSimpleImpl implements LearningSwitchHandler, P
 
         tablePath = appearedTablePath;
         nodePath = tablePath.firstIdentifierOf(Node.class);
-        nodeId = nodePath.firstKeyOf(Node.class, NodeKey.class).getId();
+        nodeId = nodePath.firstKeyOf(Node.class).getId();
         mac2portMapping = new HashMap<>();
 
         // start forwarding all packages to controller
@@ -181,7 +181,7 @@ public class LearningSwitchHandlerSimpleImpl implements LearningSwitchHandler, P
             String macPath = srcMac.toString() + dstMac.toString();
             if (!coveredMacPaths.contains(macPath)) {
                 LOG.debug("covering mac path: {} by [{}]", macPath,
-                        destNodeConnector.getValue().firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId());
+                        destNodeConnector.getValue().firstKeyOf(NodeConnector.class).getId());
 
                 coveredMacPaths.add(macPath);
                 FlowId flowId = new FlowId(String.valueOf(flowIdInc.getAndIncrement()));
@@ -211,7 +211,7 @@ public class LearningSwitchHandlerSimpleImpl implements LearningSwitchHandler, P
     }
 
     private NodeConnectorId nodeConnectorId(String connectorId) {
-        NodeKey nodeKey = nodePath.firstKeyOf(Node.class, NodeKey.class);
+        NodeKey nodeKey = nodePath.firstKeyOf(Node.class);
         StringBuilder stringId = new StringBuilder(nodeKey.getId().getValue()).append(":").append(connectorId);
         return new NodeConnectorId(stringId.toString());
     }