Deprecate potentially error prone constructor methods
Change-Id: I82d95c27dc7c4b1a6dcf5cc48a1c7583b5e30e2c
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
index 5a41057..f4a7836 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
@@ -725,7 +725,9 @@
if (oldOne != null) {
SparseAnnotations merged = union(oldOne.annotations(),
newDesc.annotations());
- newOne = new DefaultPortDescription(newOne, merged);
+ newOne = DefaultPortDescription.builder(newOne)
+ .annotations(merged)
+ .build();
}
return portDescs.put(newOne.portNumber(), newOne);
}
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
index 595280a..719307f 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
@@ -282,8 +282,8 @@
public final void testUpdatePorts() {
putDevice(DID1, SW1);
List<PortDescription> pds = Arrays.asList(
- new DefaultPortDescription(P1, true),
- new DefaultPortDescription(P2, true)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).build(),
+ DefaultPortDescription.builder().withPortNumber(P2).isEnabled(true).build()
);
List<DeviceEvent> events = deviceStore.updatePorts(PID, DID1, pds);
@@ -300,9 +300,9 @@
List<PortDescription> pds2 = Arrays.asList(
- new DefaultPortDescription(P1, false),
- new DefaultPortDescription(P2, true),
- new DefaultPortDescription(P3, true)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(false).build(),
+ DefaultPortDescription.builder().withPortNumber(P2).isEnabled(true).build(),
+ DefaultPortDescription.builder().withPortNumber(P3).isEnabled(true).build()
);
events = deviceStore.updatePorts(PID, DID1, pds2);
@@ -325,8 +325,8 @@
}
List<PortDescription> pds3 = Arrays.asList(
- new DefaultPortDescription(P1, false),
- new DefaultPortDescription(P2, true)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(false).build(),
+ DefaultPortDescription.builder().withPortNumber(P2).isEnabled(true).build()
);
events = deviceStore.updatePorts(PID, DID1, pds3);
assertFalse("event should be triggered", events.isEmpty());
@@ -351,12 +351,12 @@
public final void testUpdatePortStatus() {
putDevice(DID1, SW1);
List<PortDescription> pds = Arrays.asList(
- new DefaultPortDescription(P1, true)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).build()
);
deviceStore.updatePorts(PID, DID1, pds);
DeviceEvent event = deviceStore.updatePortStatus(PID, DID1,
- new DefaultPortDescription(P1, false));
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(false).build());
assertEquals(PORT_UPDATED, event.type());
assertDevice(DID1, SW1, event.subject());
assertEquals(P1, event.port().number());
@@ -369,12 +369,12 @@
putDeviceAncillary(DID1, SW1);
putDevice(DID1, SW1);
List<PortDescription> pds = Arrays.asList(
- new DefaultPortDescription(P1, true, A1)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).annotations(A1).build()
);
deviceStore.updatePorts(PID, DID1, pds);
DeviceEvent event = deviceStore.updatePortStatus(PID, DID1,
- new DefaultPortDescription(P1, false, A1_2));
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(false).annotations(A1_2).build());
assertEquals(PORT_UPDATED, event.type());
assertDevice(DID1, SW1, event.subject());
assertEquals(P1, event.port().number());
@@ -382,12 +382,12 @@
assertFalse("Port is disabled", event.port().isEnabled());
DeviceEvent event2 = deviceStore.updatePortStatus(PIDA, DID1,
- new DefaultPortDescription(P1, true));
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).build());
assertNull("Ancillary is ignored if primary exists", event2);
// but, Ancillary annotation update will be notified
DeviceEvent event3 = deviceStore.updatePortStatus(PIDA, DID1,
- new DefaultPortDescription(P1, true, A2));
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).annotations(A2).build());
assertEquals(PORT_UPDATED, event3.type());
assertDevice(DID1, SW1, event3.subject());
assertEquals(P1, event3.port().number());
@@ -396,7 +396,7 @@
// port only reported from Ancillary will be notified as down
DeviceEvent event4 = deviceStore.updatePortStatus(PIDA, DID1,
- new DefaultPortDescription(P2, true));
+ DefaultPortDescription.builder().withPortNumber(P2).isEnabled(true).build());
assertEquals(PORT_ADDED, event4.type());
assertDevice(DID1, SW1, event4.subject());
assertEquals(P2, event4.port().number());
@@ -410,8 +410,8 @@
putDevice(DID1, SW1);
putDevice(DID2, SW1);
List<PortDescription> pds = Arrays.<PortDescription>asList(
- new DefaultPortDescription(P1, true),
- new DefaultPortDescription(P2, true)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).build(),
+ DefaultPortDescription.builder().withPortNumber(P2).isEnabled(true).build()
);
deviceStore.updatePorts(PID, DID1, pds);
@@ -433,8 +433,8 @@
putDevice(DID1, SW1);
putDevice(DID2, SW1);
List<PortDescription> pds = Arrays.asList(
- new DefaultPortDescription(P1, true),
- new DefaultPortDescription(P2, false)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).build(),
+ DefaultPortDescription.builder().withPortNumber(P2).isEnabled(false).build()
);
deviceStore.updatePorts(PID, DID1, pds);
@@ -454,7 +454,7 @@
public final void testRemoveDevice() {
putDevice(DID1, SW1, A1);
List<PortDescription> pds = Arrays.asList(
- new DefaultPortDescription(P1, true, A2)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).annotations(A2).build()
);
deviceStore.updatePorts(PID, DID1, pds);
putDevice(DID2, SW1);
@@ -474,7 +474,7 @@
// putBack Device, Port w/o annotation
putDevice(DID1, SW1);
List<PortDescription> pds2 = Arrays.asList(
- new DefaultPortDescription(P1, true)
+ DefaultPortDescription.builder().withPortNumber(P1).isEnabled(true).build()
);
deviceStore.updatePorts(PID, DID1, pds2);