Deprecate potentially error prone constructor methods
Change-Id: I82d95c27dc7c4b1a6dcf5cc48a1c7583b5e30e2c
diff --git a/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java b/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
index a4a68ec..1da7ad0 100644
--- a/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
+++ b/drivers/cisco/netconf/src/main/java/org/onosproject/drivers/cisco/TextBlockParserCisco.java
@@ -185,8 +185,13 @@
long portSpeed = getPortSpeed(textStr);
DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
.set(AnnotationKeys.PORT_NAME, firstWord);
- return "-1".equals(port) ? null : new DefaultPortDescription(PortNumber.portNumber(port),
- isEnabled, type, portSpeed, annotations.build());
+ return "-1".equals(port) ? null : DefaultPortDescription.builder()
+ .withPortNumber(PortNumber.portNumber(port))
+ .isEnabled(isEnabled)
+ .type(type)
+ .portSpeed(portSpeed)
+ .annotations(annotations.build())
+ .build();
}
/**
@@ -295,4 +300,4 @@
return portSpeed;
}
-}
\ No newline at end of file
+}
diff --git a/drivers/cisco/netconf/src/test/java/org/onosproject/drivers/cisco/TextBlockParserCiscoTest.java b/drivers/cisco/netconf/src/test/java/org/onosproject/drivers/cisco/TextBlockParserCiscoTest.java
index 39bd2e9..5b9bf92 100644
--- a/drivers/cisco/netconf/src/test/java/org/onosproject/drivers/cisco/TextBlockParserCiscoTest.java
+++ b/drivers/cisco/netconf/src/test/java/org/onosproject/drivers/cisco/TextBlockParserCiscoTest.java
@@ -118,18 +118,24 @@
.set(AnnotationKeys.PORT_NAME, INTF6_NAME);
List<PortDescription> intfs = new ArrayList<>();
- intfs.add(new DefaultPortDescription(INTF1_PORT, IS_ENABLED, COPPER, CONNECTION_SPEED_ETHERNET,
- int1Annotations.build()));
- intfs.add(new DefaultPortDescription(INTF2_PORT, IS_NOT_ENABLED, COPPER, CONNECTION_SPEED_ETHERNET,
- int2Annotations.build()));
- intfs.add(new DefaultPortDescription(INTF3_PORT, IS_NOT_ENABLED, COPPER, CONNECTION_SPEED_ETHERNET,
- int3Annotations.build()));
- intfs.add(new DefaultPortDescription(INTF4_PORT, IS_ENABLED, COPPER, CONNECTION_SPEED_SERIAL,
- int4Annotations.build()));
- intfs.add(new DefaultPortDescription(INTF5_PORT, IS_ENABLED, FIBER, CONNECTION_SPEED_POS,
- int5Annotations.build()));
- intfs.add(new DefaultPortDescription(INTF6_PORT, IS_ENABLED, FIBER, CONNECTION_SPEED_FDDI,
- int6Annotations.build()));
+ intfs.add(DefaultPortDescription.builder().withPortNumber(INTF1_PORT).isEnabled(IS_ENABLED)
+ .type(COPPER).portSpeed(CONNECTION_SPEED_ETHERNET)
+ .annotations(int1Annotations.build()).build());
+ intfs.add(DefaultPortDescription.builder().withPortNumber(INTF2_PORT).isEnabled(IS_NOT_ENABLED)
+ .type(COPPER).portSpeed(CONNECTION_SPEED_ETHERNET)
+ .annotations(int2Annotations.build()).build());
+ intfs.add(DefaultPortDescription.builder().withPortNumber(INTF3_PORT).isEnabled(IS_NOT_ENABLED)
+ .type(COPPER).portSpeed(CONNECTION_SPEED_ETHERNET)
+ .annotations(int3Annotations.build()).build());
+ intfs.add(DefaultPortDescription.builder().withPortNumber(INTF4_PORT).isEnabled(IS_ENABLED)
+ .type(COPPER).portSpeed(CONNECTION_SPEED_SERIAL)
+ .annotations(int4Annotations.build()).build());
+ intfs.add(DefaultPortDescription.builder().withPortNumber(INTF5_PORT).isEnabled(IS_ENABLED)
+ .type(FIBER).portSpeed(CONNECTION_SPEED_POS)
+ .annotations(int5Annotations.build()).build());
+ intfs.add(DefaultPortDescription.builder().withPortNumber(INTF6_PORT).isEnabled(IS_ENABLED)
+ .type(FIBER).portSpeed(CONNECTION_SPEED_FDDI)
+ .annotations(int6Annotations.build()).build());
return intfs;
}