commit 5f34c1dc98c4cf8c09a045df1316d43bfafa5a8f
author Yuta HIGUCHI <y-higuchi@onlab.us> Tue Jul 15 15:15:08 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jul 17 10:54:59 2014 -0700
tree e0c36eb1c65354447940daa1f7419a0892f6b65b
parent bfc77f09ab5841b838850ab4e2eefb4e4d52d124

Remove Long constructor/methods from Topology related Impls

Change-Id: Ic76bacc4cb5088b5d2b9568ee1909ff54899778b

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

diff --git a/src/main/java/net/onrc/onos/core/topology/PortImpl.java b/src/main/java/net/onrc/onos/core/topology/PortImpl.java
index a4f34d5..099fa41 100644
--- a/src/main/java/net/onrc/onos/core/topology/PortImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/PortImpl.java
@@ -71,22 +71,6 @@
         Validate.notNull(number);
     }
 
-    public PortImpl(Topology topology, Long dpid, Long number) {
-        this(topology, new SwitchPort(dpid, number));
-        Validate.notNull(dpid);
-        Validate.notNull(number);
-    }
-
-    @Deprecated
-    public PortImpl(Topology topology, Switch parentSwitch, PortNumber number) {
-        this(topology, new SwitchPort(parentSwitch.getDpid(), number));
-    }
-
-    @Deprecated
-    public PortImpl(Topology topology, Switch parentSwitch, Long number) {
-        this(topology, parentSwitch, new PortNumber(number.shortValue()));
-    }
-
     @Override
     public Dpid getDpid() {
         return asSwitchPort().getDpid();

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

diff --git a/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java b/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java
index fdd37b3..aa730c3 100644
--- a/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/SwitchImpl.java
@@ -33,11 +33,6 @@
 
     // none
 
-    // TODO remove when test codes are cleaned up.
-    public SwitchImpl(Topology topology, Long dpid) {
-        this(topology, new Dpid(dpid));
-    }
-
     /**
      * Creates a Switch object with empty attributes.
      *

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

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java b/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java
index ed03cb5..decab6b 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java
@@ -71,11 +71,6 @@
         ports.putIfAbsent(sw.getDpid(), new ConcurrentHashMap<PortNumber, Port>());
     }
 
-    // TODO remove me when ready
-    protected void removeSwitch(Long dpid) {
-        removeSwitch(new Dpid(dpid));
-    }
-
     // XXX Will remove ports in snapshot as side-effect.
     protected void removeSwitch(Dpid dpid) {
         switches.remove(dpid);

src/test/java/net/onrc/onos/core/topology/MockTopology.java

diff --git a/src/test/java/net/onrc/onos/core/topology/MockTopology.java b/src/test/java/net/onrc/onos/core/topology/MockTopology.java
index 9ceaa2a..a089b6c 100644
--- a/src/test/java/net/onrc/onos/core/topology/MockTopology.java
+++ b/src/test/java/net/onrc/onos/core/topology/MockTopology.java
@@ -20,7 +20,7 @@
     public SwitchImpl sw1, sw2, sw3, sw4;
 
     public Switch addSwitch(Long switchId) {
-        SwitchImpl sw = new SwitchImpl(this, switchId);
+        SwitchImpl sw = new SwitchImpl(this, new Dpid(switchId));
         this.putSwitch(sw);
         return sw;
     }

src/test/java/net/onrc/onos/core/topology/TopologyImplTest.java

diff --git a/src/test/java/net/onrc/onos/core/topology/TopologyImplTest.java b/src/test/java/net/onrc/onos/core/topology/TopologyImplTest.java
index cb21b8d..d02142a 100644
--- a/src/test/java/net/onrc/onos/core/topology/TopologyImplTest.java
+++ b/src/test/java/net/onrc/onos/core/topology/TopologyImplTest.java
@@ -39,7 +39,7 @@
 
         // Create a number of switches and install two ports for each switch
         for (long switchID = 1; switchID <= TEST_SWITCH_NUM; switchID++) {
-            SwitchImpl testSwitch = new SwitchImpl(testTopology, switchID);
+            SwitchImpl testSwitch = new SwitchImpl(testTopology, new Dpid(switchID));
             testTopology.putSwitch(testSwitch);
             testTopology.putPort(new PortImpl(testTopology,
                     new Dpid(switchID), PORT_NUMBER_1));
@@ -246,7 +246,7 @@
             while (itr.hasNext()) {
                 testTopology.removeHost(itr.next());
             }
-            testTopology.removeSwitch(switchID);
+            testTopology.removeSwitch(new Dpid(switchID));
 
             // Verify the switch has been removed from the graphDB successfully
             assertNull(testTopology.getSwitch(new Dpid(switchID)));