Merge "Remove redundant type specifiers"

[openflowplugin.git] / applications / topology-manager / src / main / java / org / opendaylight / openflowplugin / applications / topology / manager / FlowCapableNodeMapping.java

diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableNodeMapping.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableNodeMapping.java
index d2e1550505de9c130888dff0bc3f824138032c36..d79cebb1e67d663b968d807c9850dd5e7d6c072e 100644 (file)
--- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableNodeMapping.java
+++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableNodeMapping.java
@@ -36,15 +36,15 @@ public final class FlowCapableNodeMapping {
     }
 
     public static NodeKey getNodeKey(final NodeRef ref) {
-        return ref.getValue().firstKeyOf(Node.class, NodeKey.class);
+        return ref.getValue().firstKeyOf(Node.class);
     }
 
     public static NodeKey getNodeKey(final NodeConnectorRef ref) {
-        return ref.getValue().firstKeyOf(Node.class, NodeKey.class);
+        return ref.getValue().firstKeyOf(Node.class);
     }
 
     public static NodeConnectorKey getNodeConnectorKey(final NodeConnectorRef ref) {
-        return ref.getValue().firstKeyOf(NodeConnector.class, NodeConnectorKey.class);
+        return ref.getValue().firstKeyOf(NodeConnector.class);
     }
 
     public static NodeId toTopologyNodeId(
@@ -64,14 +64,11 @@ public final class FlowCapableNodeMapping {
         return toTerminationPointId(getNodeConnectorKey(source).getId());
     }
 
-    public static org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node toTopologyNode(
+    public static org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology
+            .topology.Node toTopologyNode(
             final NodeId nodeId, final NodeRef invNodeRef) {
-        return new NodeBuilder()
-                .setNodeId(nodeId)
-                .addAugmentation(InventoryNode.class, new InventoryNodeBuilder()
-                        .setInventoryNodeRef(invNodeRef)
-                        .build())
-                .build();
+        return new NodeBuilder().setNodeId(nodeId).addAugmentation(InventoryNode.class, new InventoryNodeBuilder()
+                .setInventoryNodeRef(invNodeRef).build()).build();
     }
 
     public static TerminationPoint toTerminationPoint(final TpId id, final NodeConnectorRef invNodeConnectorRef) {