Update to work with Aluminium GA

[l2switch.git] / hosttracker / implementation / src / main / java / org / opendaylight / l2switch / hosttracker / plugin / util / Utilities.java

diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java
index 8aa307e465148ebd2b81a0266706f546438a48d6..30e3c8cc521e9f25fa5c95997086536fad84e303 100644 (file)
--- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java
+++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java
@@ -30,25 +30,23 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public final class Utilities {
     private Utilities() {
+        // Hidden on purpose
     }
 
     public static List<Link> createLinks(NodeId srcNId, TpId srcTpId, NodeId dstNId, TpId dstTpId) {
-        List<Link> links = new ArrayList();
-        LinkBuilder srcdst = new LinkBuilder()//
-                .setSource(new SourceBuilder()//
-                        .setSourceNode(srcNId)//
-                        .setSourceTp(srcTpId).build())//
-                .setDestination(new DestinationBuilder()//
-                        .setDestNode(dstNId).setDestTp(dstTpId).build())//
-                .setLinkId(new LinkId(srcTpId.getValue() + "/" + dstTpId.getValue()));
+        List<Link> links = new ArrayList<>();
+        LinkBuilder srcdst = new LinkBuilder()
+            .setSource(new SourceBuilder()
+                .setSourceNode(srcNId)
+                .setSourceTp(srcTpId).build())
+            .setDestination(new DestinationBuilder()
+                .setDestNode(dstNId).setDestTp(dstTpId).build())
+            .setLinkId(new LinkId(srcTpId.getValue() + "/" + dstTpId.getValue()));
         srcdst.withKey(new LinkKey(srcdst.getLinkId()));
-        LinkBuilder dstsrc = new LinkBuilder()//
-                .setSource(new SourceBuilder()//
-                        .setSourceNode(dstNId)//
-                        .setSourceTp(dstTpId).build())//
-                .setDestination(new DestinationBuilder()//
-                        .setDestNode(srcNId).setDestTp(srcTpId).build())//
-                .setLinkId(new LinkId(dstTpId.getValue() + "/" + srcTpId.getValue()));
+        LinkBuilder dstsrc = new LinkBuilder()
+            .setSource(new SourceBuilder().setSourceNode(dstNId).setSourceTp(dstTpId).build())
+            .setDestination(new DestinationBuilder().setDestNode(srcNId).setDestTp(srcTpId).build())
+            .setLinkId(new LinkId(dstTpId.getValue() + "/" + srcTpId.getValue()));
         dstsrc.withKey(new LinkKey(dstsrc.getLinkId()));
         links.add(dstsrc.build());
         links.add(srcdst.build());
@@ -56,28 +54,22 @@ public final class Utilities {
     }
 
     public static InstanceIdentifier<Node> buildNodeIID(NodeKey nk, String topologyId) {
-        InstanceIdentifier<Node> nodeIID = InstanceIdentifier.builder(NetworkTopology.class)//
-                .child(Topology.class, new TopologyKey(new TopologyId(topologyId)))//
-                .child(Node.class, nk).build();
-        return nodeIID;
+        return InstanceIdentifier.builder(NetworkTopology.class)
+            .child(Topology.class, new TopologyKey(new TopologyId(topologyId)))
+            .child(Node.class, nk).build();
     }
 
     public static InstanceIdentifier<Link> buildLinkIID(LinkKey lk, String topologyId) {
-        InstanceIdentifier<Link> linkIID = InstanceIdentifier.builder(NetworkTopology.class)//
-                .child(Topology.class, new TopologyKey(new TopologyId(topologyId)))//
-                .child(Link.class, lk).build();
-        return linkIID;
+        return InstanceIdentifier.builder(NetworkTopology.class)
+            .child(Topology.class, new TopologyKey(new TopologyId(topologyId)))
+            .child(Link.class, lk).build();
     }
 
     public static AttachmentPointsBuilder createAPsfromNodeConnector(NodeConnector nc) {
-        TpId tpId = new TpId(nc.getId().getValue());
-        return createAPsfromTP(tpId);
+        return createAPsfromTP(new TpId(nc.getId().getValue()));
     }
 
     public static AttachmentPointsBuilder createAPsfromTP(TpId tpId) {
-        AttachmentPointsBuilder at = new AttachmentPointsBuilder()//
-                .setTpId(tpId)//
-                .withKey(new AttachmentPointsKey(tpId));
-        return at;
+        return new AttachmentPointsBuilder().setTpId(tpId).withKey(new AttachmentPointsKey(tpId));
     }
 }