Remove deprecated constructors and change usges to builder pattern
Change-Id: I4d3b756268db233debdcb0782f738d38c77a50ac
diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
index 57fdbe2..12396c2 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
@@ -39,38 +39,6 @@
private final long portSpeed;
/**
- * Creates a DEFAULT_SPEED COPPER port description using the supplied information.
- *
- * @param number port number
- * @param isEnabled port enabled state
- * @param annotations optional key/value annotations map
- *
- * @deprecated in 1.13.0 use {@link #builder()} instead
- */
- @Deprecated
- public DefaultPortDescription(PortNumber number, boolean isEnabled,
- SparseAnnotations... annotations) {
- this(number, isEnabled, Type.COPPER, DEFAULT_SPEED, annotations);
- }
-
- /**
- * Creates a port description using the supplied information.
- *
- * @param number port number
- * @param isEnabled port enabled state
- * @param type port type
- * @param portSpeed port speed in Mbps
- * @param annotations optional key/value annotations map
- * @deprecated in 1.13.0 use {@link #builder()} instead
- */
- @Deprecated
- public DefaultPortDescription(PortNumber number, boolean isEnabled,
- Type type, long portSpeed,
- SparseAnnotations...annotations) {
- this(number, isEnabled, false, type, portSpeed, annotations);
- }
-
- /**
* Creates a port description using the supplied information.
*
* @param number port number
@@ -79,10 +47,8 @@
* @param type port type
* @param portSpeed port speed in Mbps
* @param annotations optional key/value annotations map
- * @deprecated in 1.13.0 use {@link #builder()} instead
*/
- @Deprecated // to be made non-public
- public DefaultPortDescription(PortNumber number, boolean isEnabled, boolean isRemoved,
+ private DefaultPortDescription(PortNumber number, boolean isEnabled, boolean isRemoved,
Type type, long portSpeed,
SparseAnnotations...annotations) {
super(annotations);
@@ -102,39 +68,6 @@
this.type = Type.COPPER;
}
- /**
- * Creates a port description using the supplied information.
- *
- * @param base PortDescription to get basic information from
- * @param annotations optional key/value annotations map
- *
- * @deprecated in 1.13.0 use {@link #builder(PortDescription)} instead.
- */
- @Deprecated
- public DefaultPortDescription(PortDescription base,
- SparseAnnotations annotations) {
- this(base.portNumber(), base.isEnabled(), base.isRemoved(), base.type(), base.portSpeed(),
- annotations);
- }
-
- /**
- * Creates a port description using the supplied information.
- *
- * @param base port description to copy fields from
- * @param annotations to be used in the copied description.
- * Note: Annotations on {@code base} will be ignored.
- * @return copied port description
- *
- * @deprecated in 1.13.0 use {@link #builder(PortDescription)} instead.
- */
- @Deprecated
- public static DefaultPortDescription copyReplacingAnnotation(PortDescription base,
- SparseAnnotations annotations) {
- return DefaultPortDescription.builder(base)
- .annotations(annotations)
- .build();
- }
-
@Override
public PortNumber portNumber() {
return number;
diff --git a/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumNetconfRoadmDiscovery.java b/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumNetconfRoadmDiscovery.java
index 791e0cd..2cdcc1a 100644
--- a/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumNetconfRoadmDiscovery.java
+++ b/drivers/lumentum/src/main/java/org/onosproject/drivers/lumentum/LumentumNetconfRoadmDiscovery.java
@@ -271,9 +271,14 @@
log.debug("Lumentum NETCONF - retrieved port {},{},{},{},{}",
portNum, isEnabled, type, speed, annotations.build());
- portDescriptions.add(new DefaultPortDescription(portNum, isEnabled,
- type, speed,
- annotations.build()));
+ DefaultPortDescription.Builder portDescriptionBuilder = DefaultPortDescription.builder();
+ portDescriptionBuilder.withPortNumber(portNum)
+ .isEnabled(isEnabled)
+ .type(type)
+ .portSpeed(speed)
+ .annotations(annotations.build());
+
+ portDescriptions.add(portDescriptionBuilder.build());
});
return portDescriptions;