commit e2a4e1728f002b01328657d0fd517c1641fecaf0
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jul 03 10:50:39 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Wed Jul 09 14:01:34 2014 -0700
tree f202d4486281107d0c0527a31d4fbd7d8ffbb328
parent d830aad288771fa8a13b4cf3d6c3a0a8aeb45898

Remove constructors/methods using Long

Change-Id: I1da6af2af3272de5be2f930653c5d96b594eff3f

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

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyManager.java b/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
index b079cae..eb2a799 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
@@ -26,6 +26,7 @@
 import net.onrc.onos.core.registry.IControllerRegistryService;
 import net.onrc.onos.core.util.Dpid;
 import net.onrc.onos.core.util.EventEntry;
+import net.onrc.onos.core.util.PortNumber;
 import net.onrc.onos.core.util.SwitchPort;
 import net.onrc.onos.core.util.serializers.KryoFactory;
 
@@ -1194,7 +1195,7 @@
                 continue;
             }
 
-            SwitchEvent switchEvent = new SwitchEvent(sw.getDpid());
+            SwitchEvent switchEvent = new SwitchEvent(new Dpid(sw.getDpid()));
             TopologyEvent topologyEvent = new TopologyEvent(switchEvent);
             EventEntry<TopologyEvent> eventEntry =
                     new EventEntry<TopologyEvent>(EventEntry.Type.ENTRY_ADD,
@@ -1208,7 +1209,9 @@
                 continue;
             }
 
-            PortEvent portEvent = new PortEvent(p.getDpid(), p.getNumber());
+            PortEvent portEvent = new PortEvent(
+                    new Dpid(p.getDpid()),
+                    new PortNumber(p.getNumber().shortValue()));
             TopologyEvent topologyEvent = new TopologyEvent(portEvent);
             EventEntry<TopologyEvent> eventEntry =
                     new EventEntry<TopologyEvent>(EventEntry.Type.ENTRY_ADD,
@@ -1226,10 +1229,9 @@
          }
 
         for (KVLink l : KVLink.getAllLinks()) {
-            LinkEvent linkEvent = new LinkEvent(l.getSrc().dpid,
-                    l.getSrc().number,
-                    l.getDst().dpid,
-                    l.getDst().number);
+            LinkEvent linkEvent = new LinkEvent(
+                    new SwitchPort(l.getSrc().dpid, l.getSrc().number),
+                    new SwitchPort(l.getDst().dpid, l.getDst().number));
             TopologyEvent topologyEvent = new TopologyEvent(linkEvent);
             EventEntry<TopologyEvent> eventEntry =
                     new EventEntry<TopologyEvent>(EventEntry.Type.ENTRY_ADD,