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/TopologyPublisher.java

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
index 60b0823..6cb2bc1 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -123,7 +123,7 @@
                 log.debug("Got control to set switch {} INACTIVE",
                         HexString.toHexString(dpid));
 
-                SwitchEvent switchEvent = new SwitchEvent(dpid);
+                SwitchEvent switchEvent = new SwitchEvent(new Dpid(dpid));
                 topologyDiscoveryInterface.
                         removeSwitchDiscoveryEvent(switchEvent);
                 registryService.releaseControl(dpid);
@@ -193,13 +193,14 @@
 
     @Override
     public void switchPortRemoved(Long switchId, OFPhysicalPort port) {
+        final Dpid dpid = new Dpid(switchId);
 
-        PortEvent portEvent = new PortEvent(switchId, (long) port.getPortNumber());
+        PortEvent portEvent = new PortEvent(dpid, new PortNumber(port.getPortNumber()));
         if (registryService.hasControl(switchId)) {
             topologyDiscoveryInterface.removePortDiscoveryEvent(portEvent);
         } else {
             log.debug("Not the master for switch {}. Suppressed port del event {}.",
-                    new Dpid(switchId), portEvent);
+                    dpid, portEvent);
         }
     }
 
@@ -218,7 +219,7 @@
         // TODO Not very robust
         if (!registryService.hasControl(sw.getId())) {
             log.debug("Not the master for switch {}. Suppressed switch add event {}.",
-                    new Dpid(sw.getId()), switchEvent);
+                    dpid, switchEvent);
             return;
         }