commit 0c47d5386e7042ca9035196bd29a86618bd2346f
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Aug 18 23:16:35 2017 -0700
committer Andrea Campanella <andrea@opennetworking.org> Fri Oct 20 09:40:05 2017 +0000
tree 343aa77cb943daaee5988df5ea6700d20d7f9add
parent 69bf4ddc27db2abe27065f726c16ed3f5856d696

Deprecate joda-time

- ref:
  http://blog.joda.org/2014/11/converting-from-joda-time-to-javatime.html

Change-Id: I1115e8053f601e78cb933ccbfa664ff8787d2da1

cli/src/main/java/org/onosproject/cli/MetricsListCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
index 32a4ba0..d1ecafa 100644
--- a/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
@@ -31,8 +31,8 @@
 import com.google.common.collect.TreeMultimap;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
-import org.joda.time.LocalDateTime;
 import org.onlab.metrics.MetricsService;
+import org.onlab.util.Tools;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -108,7 +108,7 @@
             Gauge gauge = (Gauge) metric;
             final Object value = gauge.getValue();
             if (name.endsWith("EpochMs") && value instanceof Long) {
-                print("          value = %s (%s)", value, new LocalDateTime(value));
+                print("          value = %s (%s)", value, Tools.defaultOffsetDataTime((Long) value));
             } else {
                 print("          value = %s", value);
             }
@@ -233,4 +233,6 @@
     private double nanoToMs(double nano) {
         return nano / 1_000_000D;
     }
+
+
 }

cli/src/main/java/org/onosproject/cli/NodesListCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/NodesListCommand.java b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
index a0967b3..8246b1d 100644
--- a/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
@@ -20,13 +20,13 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.karaf.shell.commands.Command;
-import org.joda.time.DateTime;
 import org.onlab.util.Tools;
 import org.onosproject.cluster.ClusterAdminService;
 import org.onosproject.cluster.ControllerNode;
 import org.onosproject.core.Version;
 import org.onosproject.utils.Comparators;
 
+import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 
@@ -51,10 +51,10 @@
         } else {
             ControllerNode self = service.getLocalNode();
             for (ControllerNode node : nodes) {
-                DateTime lastUpdated = service.getLastUpdated(node.id());
+                Instant lastUpdated = service.getLastUpdatedInstant(node.id());
                 String timeAgo = "Never";
                 if (lastUpdated != null) {
-                    timeAgo = Tools.timeAgo(lastUpdated.getMillis());
+                    timeAgo = Tools.timeAgo(lastUpdated.getEpochSecond());
                 }
                 Version version = service.getVersion(node.id());
                 print(FMT, node.id(), node.ip(), node.tcpPort(),