Remove constructors/methods using Long
Change-Id: I1da6af2af3272de5be2f930653c5d96b594eff3f
diff --git a/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java b/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
index afc903d..30cdfb8 100644
--- a/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
@@ -2,6 +2,7 @@
import static org.junit.Assert.assertEquals;
import net.onrc.onos.core.topology.LinkEvent;
+import net.onrc.onos.core.util.SwitchPort;
import net.onrc.onos.core.util.serializers.KryoFactory;
import org.junit.After;
@@ -33,9 +34,9 @@
new ConstrainedShortestPathIntent("1", 2L, 3L, 4L, 5L, 6L, 7L, 1000.0);
Path path = new Path();
- path.add(new LinkEvent(1L, 2L, 3L, 4L));
- path.add(new LinkEvent(5L, 6L, 7L, 8L));
- path.add(new LinkEvent(9L, 0L, 1L, 2L));
+ path.add(new LinkEvent(new SwitchPort(1L, 2L), new SwitchPort(3L, 4L)));
+ path.add(new LinkEvent(new SwitchPort(5L, 6L), new SwitchPort(7L, 8L)));
+ path.add(new LinkEvent(new SwitchPort(9L, 0L), new SwitchPort(1L, 2L)));
PathIntent pathIntent1 = new PathIntent("11", path, 123.45, cspIntent1);
opList.add(IntentOperation.Operator.ADD, pathIntent1);
diff --git a/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
index 9e00d1d..3149103 100644
--- a/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
@@ -4,6 +4,7 @@
import net.onrc.onos.core.topology.LinkEvent;
import net.onrc.onos.core.util.Dpid;
import net.onrc.onos.core.util.PortNumber;
+import net.onrc.onos.core.util.SwitchPort;
import net.onrc.onos.core.util.serializers.KryoFactory;
import org.junit.After;
@@ -57,9 +58,9 @@
new ConstrainedShortestPathIntent("1", 2L, 3L, 4L, 5L, 6L, 7L, 1000.0);
Path path = new Path();
- path.add(new LinkEvent(1L, 1L, 2L, 2L));
- path.add(new LinkEvent(2L, 1L, 3L, 2L));
- path.add(new LinkEvent(3L, 1L, 4L, 2L));
+ path.add(new LinkEvent(new SwitchPort(1L, 1L), new SwitchPort(2L, 2L)));
+ path.add(new LinkEvent(new SwitchPort(2L, 1L), new SwitchPort(3L, 2L)));
+ path.add(new LinkEvent(new SwitchPort(3L, 1L), new SwitchPort(4L, 2L)));
PathIntent pathIntent1 = new PathIntent("11", path, 123.45, cspIntent1);
diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
index 568b242..1ae1bb9 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -24,6 +24,7 @@
import net.onrc.onos.core.topology.PortEvent;
import net.onrc.onos.core.topology.SwitchEvent;
import net.onrc.onos.core.topology.TopologyEvents;
+import net.onrc.onos.core.util.SwitchPort;
import org.hamcrest.Description;
import org.hamcrest.Factory;
@@ -462,8 +463,8 @@
final MockTopology topology = mocks.getTopology();
topology.removeLink(1L, 12L, 2L, 21L); // This link is used by the intent "1"
topology.removeLink(2L, 21L, 1L, 12L);
- LinkEvent linkEvent1 = new LinkEvent(1L, 12L, 2L, 21L);
- LinkEvent linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
+ LinkEvent linkEvent1 = new LinkEvent(new SwitchPort(1L, 12L), new SwitchPort(2L, 21L));
+ LinkEvent linkEvent2 = new LinkEvent(new SwitchPort(2L, 21L), new SwitchPort(1L, 12L));
removedLinkEvents.add(linkEvent1);
removedLinkEvents.add(linkEvent2);
@@ -696,8 +697,8 @@
final MockTopology topology = mocks.getTopology();
topology.removeLink(1L, 12L, 2L, 21L); // This link is used by the intent "1"
topology.removeLink(2L, 21L, 1L, 12L);
- final LinkEvent linkEvent1 = new LinkEvent(1L, 12L, 2L, 21L);
- final LinkEvent linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
+ final LinkEvent linkEvent1 = new LinkEvent(new SwitchPort(1L, 12L), new SwitchPort(2L, 21L));
+ final LinkEvent linkEvent2 = new LinkEvent(new SwitchPort(2L, 21L), new SwitchPort(1L, 12L));
removedLinkEvents.add(linkEvent1);
removedLinkEvents.add(linkEvent2);
diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
index a5b8816..08150ec 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
@@ -38,6 +38,7 @@
import net.onrc.onos.core.topology.SwitchEvent;
import net.onrc.onos.core.topology.Topology;
import net.onrc.onos.core.topology.TopologyEvents;
+import net.onrc.onos.core.util.SwitchPort;
import org.junit.After;
import org.junit.Before;
@@ -269,8 +270,8 @@
// link down
((MockTopology) topology).removeLink(1L, 12L, 2L, 21L); // This link is used by the intent "1"
((MockTopology) topology).removeLink(2L, 21L, 1L, 12L);
- LinkEvent linkEvent1 = new LinkEvent(1L, 12L, 2L, 21L);
- LinkEvent linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
+ LinkEvent linkEvent1 = new LinkEvent(new SwitchPort(1L, 12L), new SwitchPort(2L, 21L));
+ LinkEvent linkEvent2 = new LinkEvent(new SwitchPort(2L, 21L), new SwitchPort(1L, 12L));
removedLinkEvents.clear();
removedLinkEvents.add(linkEvent1);
removedLinkEvents.add(linkEvent2);
@@ -302,8 +303,8 @@
// link up
((MockTopology) topology).addBidirectionalLinks(1L, 12L, 2L, 21L);
- linkEvent1 = new LinkEvent(1L, 12L, 2L, 21L);
- linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
+ linkEvent1 = new LinkEvent(new SwitchPort(1L, 12L), new SwitchPort(2L, 21L));
+ linkEvent2 = new LinkEvent(new SwitchPort(2L, 21L), new SwitchPort(1L, 12L));
removedLinkEvents.clear();
addedLinkEvents.clear();
addedLinkEvents.add(linkEvent1);