Remove deprecated Port Statistics APIs
- Builder set of port number as an integer
- Query port number as an integer
Change-Id: Id4b4380c75237f293d2cc28a102748d416cf5c01
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/PortStatisticsCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/PortStatisticsCodec.java
index 19b12c0..07c4464 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/PortStatisticsCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/PortStatisticsCodec.java
@@ -32,7 +32,7 @@
checkNotNull(entry, "Port Statistics cannot be null");
final ObjectNode result = context.mapper().createObjectNode()
- .put("port", entry.port())
+ .put("port", entry.portNumber().toLong())
.put("packetsReceived", entry.packetsReceived())
.put("packetsSent", entry.packetsSent())
.put("bytesReceived", entry.bytesReceived())
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 ec4d916..97d6e7b 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
@@ -447,7 +447,7 @@
if (prvStatsMap != null) {
for (PortStatistics newStats : newStatsCollection) {
- PortNumber port = PortNumber.portNumber(newStats.port());
+ PortNumber port = newStats.portNumber();
PortStatistics prvStats = prvStatsMap.get(port);
DefaultPortStatistics.Builder builder = DefaultPortStatistics.builder();
PortStatistics deltaStats = builder.build();
@@ -459,7 +459,7 @@
}
} else {
for (PortStatistics newStats : newStatsCollection) {
- PortNumber port = PortNumber.portNumber(newStats.port());
+ PortNumber port = newStats.portNumber();
newStatsMap.put(port, newStats);
}
}
@@ -480,7 +480,7 @@
}
DefaultPortStatistics.Builder builder = DefaultPortStatistics.builder();
DefaultPortStatistics deltaStats = builder.setDeviceId(deviceId)
- .setPort(newStats.port())
+ .setPort(newStats.portNumber())
.setPacketsReceived(newStats.packetsReceived() - prvStats.packetsReceived())
.setPacketsSent(newStats.packetsSent() - prvStats.packetsSent())
.setBytesReceived(newStats.bytesReceived() - prvStats.bytesReceived())