commit 02ccb8cf721321de19c1ba1981a49bf5668f6909
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jul 10 11:29:45 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jul 14 13:10:26 2014 -0700
tree 3104a80ca94ab576e39b992d868f1cababc3c913
parent 8313f0b86aa805fa529f1aff4583fec7c2a5e1cd

Use LinkTuple as identifier.

- Use LinkTuple as Identifier for
  - Link, LinkEvent
- Register LinkTuple to KryoFactory
- Fix mocked Link to return LinkTuple

Change-Id: Ie58f31d4b2c906bc2343e2414d06190828e7e5c9

src/main/java/net/onrc/onos/core/topology/LinkEvent.java

diff --git a/src/main/java/net/onrc/onos/core/topology/LinkEvent.java b/src/main/java/net/onrc/onos/core/topology/LinkEvent.java
index 01b4efe..dadf3c6 100644
--- a/src/main/java/net/onrc/onos/core/topology/LinkEvent.java
+++ b/src/main/java/net/onrc/onos/core/topology/LinkEvent.java
@@ -5,6 +5,7 @@
 
 import net.onrc.onos.core.topology.web.serializers.LinkEventSerializer;
 import net.onrc.onos.core.util.Dpid;
+import net.onrc.onos.core.util.LinkTuple;
 import net.onrc.onos.core.util.PortNumber;
 import net.onrc.onos.core.util.SwitchPort;
 
@@ -22,8 +23,7 @@
 @JsonSerialize(using = LinkEventSerializer.class)
 public class LinkEvent extends TopologyElement<LinkEvent> {
 
-    private final SwitchPort src;
-    private final SwitchPort dst;
+    private final LinkTuple id;
     // TODO add LastSeenTime, Capacity if appropriate
 
     /**
@@ -31,8 +31,18 @@
      */
     @Deprecated
     protected LinkEvent() {
-        src = null;
-        dst = null;
+        id = null;
+    }
+
+    /**
+     * Creates the Link object.
+     *
+     * @param id link tuple to identify this link
+     */
+    public LinkEvent(LinkTuple id) {
+        Validate.notNull(id);
+
+        this.id = id;
     }
 
     /**
@@ -42,11 +52,7 @@
      * @param dst destination SwitchPort
      */
     public LinkEvent(SwitchPort src, SwitchPort dst) {
-        Validate.notNull(src);
-        Validate.notNull(dst);
-
-        this.src = src;
-        this.dst = dst;
+        this(new LinkTuple(src, dst));
     }
 
     /**
@@ -56,16 +62,14 @@
      */
     public LinkEvent(LinkEvent original) {
         super(original);
-        this.src = original.src;
-        this.dst = original.dst;
+        Validate.isTrue(Objects.equals(this.id, original.id));
+
+        this.id = original.id;
     }
 
     // TODO probably want to remove this
     public LinkEvent(Link link) {
-        src = new SwitchPort(link.getSrcSwitch().getDpid(),
-                link.getSrcPort().getNumber());
-        dst = new SwitchPort(link.getDstSwitch().getDpid(),
-                link.getDstPort().getNumber());
+        this(link.getLinkTuple());
         // FIXME losing attributes here
     }
 
@@ -79,8 +83,16 @@
      */
     public LinkEvent(Dpid srcDpid, PortNumber srcPortNo,
                      Dpid dstDpid, PortNumber dstPortNo) {
-        src = new SwitchPort(srcDpid, srcPortNo);
-        dst = new SwitchPort(dstDpid, dstPortNo);
+        this(new LinkTuple(srcDpid, srcPortNo, dstDpid, dstPortNo));
+    }
+
+    /**
+     * Gets a {@link LinkTuple} that identifies this link.
+     *
+     * @return a LinkTuple representing the Port
+     */
+    public LinkTuple getLinkTuple() {
+        return id;
     }
 
     /**
@@ -89,7 +101,7 @@
      * @return source SwitchPort.
      */
     public SwitchPort getSrc() {
-        return src;
+        return getLinkTuple().getSrc();
     }
 
     /**
@@ -98,12 +110,12 @@
      * @return destination SwitchPort.
      */
     public SwitchPort getDst() {
-        return dst;
+        return getLinkTuple().getDst();
     }
 
     @Override
     public String toString() {
-        return "[LinkEvent " + src + "->" + dst + "]";
+        return "[LinkEvent " + getSrc() + "->" + getDst() + "]";
     }
 
     public static final int LINKID_BYTES = 2 + PortEvent.PORTID_BYTES * 2;
@@ -127,16 +139,15 @@
     }
 
     public ByteBuffer getIDasByteBuffer() {
-        return getLinkID(src.getDpid(), src.getPortNumber(),
-                dst.getDpid(), dst.getPortNumber());
+        return getLinkID(getSrc().getDpid(), getSrc().getPortNumber(),
+                getDst().getDpid(), getDst().getPortNumber());
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = super.hashCode();
-        result = prime * result + ((dst == null) ? 0 : dst.hashCode());
-        result = prime * result + ((src == null) ? 0 : src.hashCode());
+        result = prime * result + Objects.hashCode(id);
         return result;
     }
 
@@ -160,7 +171,6 @@
             return false;
         }
 
-        return Objects.equals(this.src, other.src) &&
-                Objects.equals(this.dst, other.dst);
+        return Objects.equals(this.id, other.id);
     }
 }