summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-06-19 14:45:07 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-06-19 14:45:07 +0200
commit3045b803c2a85a0655a9116d50876b25d369d6a0 (patch)
tree8d43f802e493b4aa7e2abf696cb804fb51cb4c24 /docker-api
parentf88f6fe359cecc5f09fb809ad92b5954bd1bda72 (diff)
Remove unneeded created field in Container
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Container.java20
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java3
2 files changed, 3 insertions, 20 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 062f0503615..7f47b638dde 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,7 +1,6 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.dockerapi;
-import java.time.Instant;
import java.util.Objects;
/**
@@ -13,31 +12,18 @@ public class Container {
public final ContainerName name;
public final State state;
public final int pid;
- public final Instant created;
public Container(
final String hostname,
final DockerImage image,
final ContainerName containerName,
final State state,
- final int pid,
- final String created) {
+ final int pid) {
this.hostname = hostname;
this.image = image;
this.name = containerName;
this.state = state;
this.pid = pid;
- this.created = Instant.parse(created);
- }
-
- // For testing only
- public Container(
- final String hostname,
- final DockerImage image,
- final ContainerName containerName,
- final State state,
- final int pid) {
- this(hostname, image, containerName, state, pid, "2017-02-13T13:45:12.133713371Z");
}
@Override
@@ -49,8 +35,7 @@ public class Container {
return Objects.equals(hostname, other.hostname)
&& Objects.equals(image, other.image)
&& Objects.equals(name, other.name)
- && Objects.equals(pid, other.pid)
- && Objects.equals(created, other.created);
+ && Objects.equals(pid, other.pid);
}
@Override
@@ -66,7 +51,6 @@ public class Container {
+ " name=" + name
+ " state=" + state
+ " pid=" + pid
- + " created=" + created
+ "}";
}
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index bd06794c733..2f8007f6e91 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -375,8 +375,7 @@ public class DockerImpl implements Docker {
new DockerImage(response.getConfig().getImage()),
new ContainerName(decode(response.getName())),
Container.State.valueOf(response.getState().getStatus().toUpperCase()),
- response.getState().getPid(),
- response.getCreated()
+ response.getState().getPid()
))
.map(Stream::of)
.orElse(Stream.empty());