Deprecate joda-time
- ref:
http://blog.joda.org/2014/11/converting-from-joda-time-to-javatime.html
Change-Id: I1115e8053f601e78cb933ccbfa664ff8787d2da1
diff --git a/apps/cpman/app/BUCK b/apps/cpman/app/BUCK
index 936c9ff..ea4dda7 100644
--- a/apps/cpman/app/BUCK
+++ b/apps/cpman/app/BUCK
@@ -3,7 +3,6 @@
'//lib:JACKSON',
'//lib:METRICS',
'//lib:KRYO',
- '//lib:joda-time',
'//lib:org.apache.karaf.shell.console',
'//lib:javax.ws.rs-api',
'//lib:rrd4j',
diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
index 9263aa8..8f64844 100644
--- a/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
+++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
@@ -23,7 +23,6 @@
import com.google.common.collect.Sets;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
-import org.joda.time.LocalDateTime;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId;
import org.onosproject.cpman.ControlLoadSnapshot;
@@ -36,6 +35,9 @@
import org.onosproject.ui.chart.ChartModel;
import org.onosproject.ui.chart.ChartRequestHandler;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
@@ -63,7 +65,7 @@
private static final int MILLI_CONV_UNIT = 1000;
- private static final String TIME_FORMAT = "HH:mm";
+ private static final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ISO_LOCAL_TIME;
private long timestamp = 0L;
@@ -98,7 +100,7 @@
DeviceId deviceId = DeviceId.deviceId(uri);
if (cpms.availableResourcesSync(localNodeId, CONTROL_MESSAGE).contains(deviceId.toString())) {
Map<ControlMetricType, Long[]> data = generateMatrix(cpms, cs, deviceId);
- LocalDateTime ldt = new LocalDateTime(timestamp * MILLI_CONV_UNIT);
+ LocalDateTime ldt = LocalDateTime.from(Instant.ofEpochMilli(timestamp * MILLI_CONV_UNIT));
populateMetrics(cm, data, ldt, NUM_OF_DATA_POINTS);
@@ -167,6 +169,7 @@
}
}
+ // FIXME using local time in timestamps likely to be sign of problem
private void populateMetrics(ChartModel cm,
Map<ControlMetricType, Long[]> data,
LocalDateTime time, int numOfDp) {
@@ -176,7 +179,7 @@
local.put(StringUtils.lowerCase(cmt.name()), data.get(cmt)[i]);
}
- String calculated = time.minusMinutes(numOfDp - i).toString(TIME_FORMAT);
+ String calculated = time.minusMinutes(numOfDp - i).format(TIME_FORMAT);
local.put(LABEL, calculated);
populateMetric(cm.addDataPoint(calculated), local);
diff --git a/apps/events/BUCK b/apps/events/BUCK
index 52fd3a9..12e888b 100644
--- a/apps/events/BUCK
+++ b/apps/events/BUCK
@@ -3,7 +3,6 @@
'//lib:JACKSON',
'//lib:org.apache.karaf.shell.console',
'//cli:onos-cli',
- '//lib:joda-time',
]
osgi_jar_with_tests (
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);
diff --git a/apps/evpn-route-service/api/BUCK b/apps/evpn-route-service/api/BUCK
index d4825d3..68eeacf 100644
--- a/apps/evpn-route-service/api/BUCK
+++ b/apps/evpn-route-service/api/BUCK
@@ -1,6 +1,5 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
- '//lib:joda-time',
]
TEST_DEPS = [
diff --git a/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteEvent.java b/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteEvent.java
index ae3d93a..5e7f83a 100644
--- a/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteEvent.java
+++ b/apps/evpn-route-service/api/src/main/java/org/onosproject/evpnrouteservice/EvpnRouteEvent.java
@@ -20,7 +20,7 @@
import java.util.Collections;
import java.util.Objects;
-import org.joda.time.LocalDateTime;
+import org.onlab.util.Tools;
import org.onosproject.event.AbstractEvent;
import static com.google.common.base.MoreObjects.toStringHelper;
@@ -185,7 +185,7 @@
@Override
public String toString() {
return toStringHelper(this)
- .add("time", new LocalDateTime(time()))
+ .add("time", Tools.defaultOffsetDataTime(time()))
.add("type", type())
.add("subject", subject())
.add("prevSubject", prevSubject)
diff --git a/apps/faultmanagement/fmgui/BUCK b/apps/faultmanagement/fmgui/BUCK
index 3d8cfc7..96c7835 100644
--- a/apps/faultmanagement/fmgui/BUCK
+++ b/apps/faultmanagement/fmgui/BUCK
@@ -4,7 +4,6 @@
'//lib:org.apache.karaf.shell.console',
'//incubator/api:onos-incubator-api',
'//cli:onos-cli',
- '//lib:joda-time',
]
osgi_jar_with_tests (
diff --git a/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTableMessageHandler.java b/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTableMessageHandler.java
index 1a21907..3bb49ad 100644
--- a/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTableMessageHandler.java
+++ b/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTableMessageHandler.java
@@ -18,7 +18,6 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
-import org.joda.time.DateTime;
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
import org.onosproject.net.DeviceId;
import org.onosproject.ui.RequestHandler;
@@ -29,6 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.time.Instant;
import java.util.Collection;
import java.util.Set;
@@ -126,7 +126,7 @@
.cell(DEVICE_ID_STR, alarm.deviceId())
.cell(DESCRIPTION, alarm.description())
.cell(SOURCE, alarm.source())
- .cell(TIME_RAISED, new DateTime(alarm.timeRaised()))
+ .cell(TIME_RAISED, Instant.ofEpochMilli(alarm.timeRaised()))
.cell(SEVERITY, alarm.severity());
}
}
@@ -177,6 +177,6 @@
if (msSinceStartOfEpoch == null) {
return "-";
}
- return new TimeFormatter().format(new DateTime(msSinceStartOfEpoch));
+ return new TimeFormatter().format(Instant.ofEpochMilli(msSinceStartOfEpoch));
}
}
diff --git a/apps/influxdbmetrics/BUCK b/apps/influxdbmetrics/BUCK
index 6c0bbc8..14e6a4b 100644
--- a/apps/influxdbmetrics/BUCK
+++ b/apps/influxdbmetrics/BUCK
@@ -10,7 +10,6 @@
'//lib:okio',
'//lib:gson',
'//cli:onos-cli',
- '//lib:joda-time',
]
EXCLUDED_BUNDLES = [
diff --git a/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/DefaultInfluxMetric.java b/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/DefaultInfluxMetric.java
index ab8f31c..f3ce81a 100644
--- a/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/DefaultInfluxMetric.java
+++ b/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/DefaultInfluxMetric.java
@@ -15,22 +15,20 @@
*/
package org.onosproject.influxdbmetrics;
-import org.apache.commons.lang.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
import static com.google.common.base.Preconditions.checkNotNull;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+
/**
* Default implementation of influx metric.
*/
public final class DefaultInfluxMetric implements InfluxMetric {
private double oneMinRate;
- private DateTime time;
+ private Instant time;
- private DefaultInfluxMetric(double oneMinRate, DateTime time) {
+ private DefaultInfluxMetric(double oneMinRate, Instant time) {
this.oneMinRate = oneMinRate;
this.time = time;
}
@@ -41,7 +39,7 @@
}
@Override
- public DateTime time() {
+ public Instant time() {
return time;
}
@@ -75,10 +73,8 @@
return new DefaultInfluxMetric(oneMinRate, parseTime(timestamp));
}
- private DateTime parseTime(String time) {
- String reformatTime = StringUtils.replace(StringUtils.replace(time, "T", " "), "Z", "");
- DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
- return formatter.parseDateTime(reformatTime);
+ private Instant parseTime(String time) {
+ return DateTimeFormatter.ISO_DATE_TIME.parse(time, Instant::from);
}
}
}
diff --git a/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/InfluxMetric.java b/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/InfluxMetric.java
index e0d16ef..35756f3 100644
--- a/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/InfluxMetric.java
+++ b/apps/influxdbmetrics/src/main/java/org/onosproject/influxdbmetrics/InfluxMetric.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.influxdbmetrics;
-import org.joda.time.DateTime;
+import java.time.Instant;
/**
* Metric that represents all values queried from influx database.
@@ -35,7 +35,7 @@
*
* @return collected timestamp of the given metric
*/
- DateTime time();
+ Instant time();
/**
* A builder of InfluxMetric.
diff --git a/apps/iptopology-api/BUCK b/apps/iptopology-api/BUCK
index 9661e11..3cc9301 100644
--- a/apps/iptopology-api/BUCK
+++ b/apps/iptopology-api/BUCK
@@ -1,6 +1,5 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
- '//lib:joda-time',
]
osgi_jar_with_tests (
diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceEvent.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceEvent.java
index 602d72e..26aaf31 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceEvent.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceEvent.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.iptopology.api.device;
-import org.joda.time.LocalDateTime;
+import org.onlab.util.Tools;
import org.onosproject.event.AbstractEvent;
import org.onosproject.iptopology.api.DeviceIntf;
import org.onosproject.iptopology.api.DevicePrefix;
@@ -173,7 +173,7 @@
return super.toString();
}
return toStringHelper(this)
- .add("time", new LocalDateTime(time()))
+ .add("time", Tools.defaultOffsetDataTime(time()))
.add("type", type())
.add("subject", subject())
.add("interface", devInterface)
diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK
index 60ebc1f..4a5d19c 100644
--- a/apps/openstacknetworking/BUCK
+++ b/apps/openstacknetworking/BUCK
@@ -9,7 +9,6 @@
'//cli:onos-cli',
'//apps/openstacknode/api:onos-apps-openstacknode-api',
'//lib:openstack4j-core',
- '//lib:joda-time',
]
TEST_DEPS = [
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackNetworkEvent.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackNetworkEvent.java
index c4aad23..4f4892f 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackNetworkEvent.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackNetworkEvent.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.openstacknetworking.api;
-import org.joda.time.LocalDateTime;
+import org.onlab.util.Tools;
import org.onosproject.event.AbstractEvent;
import org.openstack4j.model.network.Network;
import org.openstack4j.model.network.Port;
@@ -178,7 +178,7 @@
return super.toString();
}
return toStringHelper(this)
- .add("time", new LocalDateTime(time()))
+ .add("time", Tools.defaultOffsetDataTime(time()))
.add("type", type())
.add("network", subject())
.add("port", port)
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterEvent.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterEvent.java
index d3a9d77..ba15cd0 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterEvent.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterEvent.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.openstacknetworking.api;
-import org.joda.time.LocalDateTime;
+import org.onlab.util.Tools;
import org.onosproject.event.AbstractEvent;
import org.openstack4j.model.network.ExternalGateway;
import org.openstack4j.model.network.NetFloatingIP;
@@ -228,7 +228,7 @@
return super.toString();
}
return toStringHelper(this)
- .add("time", new LocalDateTime(time()))
+ .add("time", Tools.defaultOffsetDataTime(time()))
.add("type", type())
.add("router", subject())
.add("externalGateway", exGateway)
diff --git a/apps/route-service/api/BUCK b/apps/route-service/api/BUCK
index 05b3eee..3b7812b 100644
--- a/apps/route-service/api/BUCK
+++ b/apps/route-service/api/BUCK
@@ -1,7 +1,6 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:JACKSON',
- '//lib:joda-time',
]
TEST_DEPS = [
diff --git a/apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteEvent.java b/apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteEvent.java
index a7f5d88..b661b40 100644
--- a/apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteEvent.java
+++ b/apps/route-service/api/src/main/java/org/onosproject/routeservice/RouteEvent.java
@@ -16,7 +16,7 @@
package org.onosproject.routeservice;
-import org.joda.time.LocalDateTime;
+import org.onlab.util.Tools;
import org.onosproject.event.AbstractEvent;
import java.util.Collection;
@@ -210,7 +210,7 @@
@Override
public String toString() {
return toStringHelper(this)
- .add("time", new LocalDateTime(time()))
+ .add("time", Tools.defaultOffsetDataTime(time()))
.add("type", type())
.add("subject", subject())
.add("prevSubject", prevSubject)
diff --git a/apps/segmentrouting/BUCK b/apps/segmentrouting/BUCK
index ae72b22..5942871 100644
--- a/apps/segmentrouting/BUCK
+++ b/apps/segmentrouting/BUCK
@@ -9,7 +9,6 @@
'//incubator/api:onos-incubator-api',
'//utils/rest:onlab-rest',
'//apps/route-service/api:onos-apps-route-service-api',
- '//lib:joda-time',
]
BUNDLES = [
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
index 709d05e..5014811 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
@@ -23,7 +23,6 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.joda.time.DateTime;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip6Address;
import org.onlab.packet.IpPrefix;
@@ -41,6 +40,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -79,7 +79,7 @@
private volatile Status populationStatus;
private ScheduledExecutorService executorService
= newScheduledThreadPool(1, groupedThreads("retryftr", "retry-%d", log));
- private DateTime lastRoutingChange;
+ private Instant lastRoutingChange;
/**
* Represents the default routing population status.
@@ -150,8 +150,8 @@
* @return true if stable
*/
public boolean isRoutingStable() {
- long last = (long) (lastRoutingChange.getMillis() / 1000.0);
- long now = (long) (DateTime.now().getMillis() / 1000.0);
+ long last = (long) (lastRoutingChange.toEpochMilli() / 1000.0);
+ long now = (long) (Instant.now().toEpochMilli() / 1000.0);
log.trace("Routing stable since {}s", now - last);
return (now - last) > STABLITY_THRESHOLD;
}
@@ -173,7 +173,7 @@
* startup or after a configuration event.
*/
public void populateAllRoutingRules() {
- lastRoutingChange = DateTime.now();
+ lastRoutingChange = Instant.now();
statusLock.lock();
try {
if (populationStatus == Status.STARTED) {
@@ -249,7 +249,7 @@
return;
}
- lastRoutingChange = DateTime.now();
+ lastRoutingChange = Instant.now();
statusLock.lock();
try {
if (populationStatus == Status.STARTED) {
@@ -374,7 +374,7 @@
log.warn("Only one event can be handled for link status change .. aborting");
return;
}
- lastRoutingChange = DateTime.now();
+ lastRoutingChange = Instant.now();
executorService.schedule(new UpdateMaps(), UPDATE_INTERVAL,
TimeUnit.SECONDS);
statusLock.lock();