summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorfreva <valerijf@yahoo-inc.com>2017-02-13 16:24:54 +0100
committerfreva <valerijf@yahoo-inc.com>2017-02-13 16:24:54 +0100
commit471aa2d1d021cdc0e86ead47f524126994bf869e (patch)
tree419c8864778651274dd2033f985e29a88b680885 /docker-api
parenta1ac770b2544f4ccdcf0e7b349fc00fa9595f8b5 (diff)
Use new java.time to parse date string
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
index 48e9d55b89d..38837a4b12b 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java
@@ -1,16 +1,17 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.dockerapi;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
import java.util.Objects;
/**
* @author stiankri
*/
public class Container {
- private static final SimpleDateFormat DOCKER_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSX");
+ private static final DateTimeFormatter DOCKER_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSX");
public final String hostname;
public final DockerImage image;
public final ContainerName name;
@@ -43,8 +44,8 @@ public class Container {
this(hostname, image, containerName, state, pid, "2017-02-13T13:45:12.133713371Z");
}
- public Instant getCreatedAsInstant() throws ParseException {
- return DOCKER_DATE_FORMAT.parse(created).toInstant();
+ public Instant getCreatedAsInstant() {
+ return LocalDateTime.parse(created, DOCKER_DATE_FORMAT).toInstant(ZoneOffset.UTC);
}
@Override