Deprecate joda-time
- ref:
http://blog.joda.org/2014/11/converting-from-joda-time-to-javatime.html
Change-Id: I1115e8053f601e78cb933ccbfa664ff8787d2da1
diff --git a/apps/events/src/main/java/org/onosproject/events/EventsCommand.java b/apps/events/src/main/java/org/onosproject/events/EventsCommand.java
index db8df10..2664344 100644
--- a/apps/events/src/main/java/org/onosproject/events/EventsCommand.java
+++ b/apps/events/src/main/java/org/onosproject/events/EventsCommand.java
@@ -24,7 +24,7 @@
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.joda.time.LocalDateTime;
+import org.onlab.util.Tools;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.ClusterEvent;
import org.onosproject.event.Event;
@@ -187,7 +187,7 @@
if (event.type().toString().startsWith("PORT")) {
// Port event
print("%s %s\t%s/%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
deviceEvent.subject().id(), deviceEvent.port().number(),
deviceEvent.port()
@@ -195,7 +195,7 @@
} else {
// Device event
print("%s %s\t%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
deviceEvent.subject().id(),
deviceEvent.subject()
@@ -204,7 +204,7 @@
} else if (event instanceof MastershipEvent) {
print("%s %s\t%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
event.subject(),
((MastershipEvent) event).roleInfo());
@@ -213,7 +213,7 @@
LinkEvent linkEvent = (LinkEvent) event;
Link link = linkEvent.subject();
print("%s %s\t%s/%s-%s/%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
link.src().deviceId(), link.src().port(), link.dst().deviceId(), link.dst().port(),
link);
@@ -221,7 +221,7 @@
} else if (event instanceof HostEvent) {
HostEvent hostEvent = (HostEvent) event;
print("%s %s\t%s [%s->%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
hostEvent.subject().id(),
hostEvent.prevSubject(), hostEvent.subject());
@@ -236,14 +236,14 @@
topo.linkCount(),
topo.clusterCount());
print("%s %s%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
summary,
reasons.stream().map(e -> e.type()).collect(toList()));
} else if (event instanceof ClusterEvent) {
print("%s %s\t%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
((ClusterEvent) event).subject().id(),
event.subject());
@@ -251,7 +251,7 @@
} else {
// Unknown Event?
print("%s %s\t%s [%s]",
- new LocalDateTime(event.time()),
+ Tools.defaultOffsetDataTime(event.time()),
event.type(),
event.subject(),
event);