summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2020-09-08 09:29:46 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2020-09-08 09:29:46 +0200
commite77c60a0bca744937bb674f2fc5b48335352abee (patch)
tree43b69c1ac32de642574a23a8ee7cab7f149aa7a7 /docker-api
parent92494ee6cb4b373c0a3ddf44997dc2a1ec35ef0d (diff)
Rename DockerImpl to DockerEngine
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java2
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerEngine.java (renamed from docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java)8
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java6
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java (renamed from docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java)4
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java2
5 files changed, 11 insertions, 11 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
index ed2c4501110..7f8a2b68741 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
@@ -24,7 +24,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static com.yahoo.vespa.hosted.dockerapi.DockerImpl.LABEL_NAME_MANAGEDBY;
+import static com.yahoo.vespa.hosted.dockerapi.DockerEngine.LABEL_NAME_MANAGEDBY;
class CreateContainerCommandImpl implements ContainerEngine.CreateContainerCommand {
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/DockerEngine.java
index 6125a0ec2d8..6c831cef7d7 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/DockerEngine.java
@@ -43,8 +43,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Stream;
-public class DockerImpl implements ContainerEngine {
- private static final Logger logger = Logger.getLogger(DockerImpl.class.getName());
+public class DockerEngine implements ContainerEngine {
+ private static final Logger logger = Logger.getLogger(DockerEngine.class.getName());
static final String LABEL_NAME_MANAGEDBY = "com.yahoo.vespa.managedby";
private static final String FRAMEWORK_CONTAINER_PREFIX = "/";
@@ -58,11 +58,11 @@ public class DockerImpl implements ContainerEngine {
private final Counter numberOfDockerApiFails;
@Inject
- public DockerImpl(Metrics metrics) {
+ public DockerEngine(Metrics metrics) {
this(createDockerClient(), metrics);
}
- DockerImpl(DockerClient dockerClient, Metrics metrics) {
+ DockerEngine(DockerClient dockerClient, Metrics metrics) {
this.dockerClient = dockerClient;
this.dockerImageGC = new DockerImageGarbageCollector(this);
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java
index e2116f7037e..b0bd1e3c65a 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollector.java
@@ -53,14 +53,14 @@ class DockerImageGarbageCollector {
private static final Logger logger = Logger.getLogger(DockerImageGarbageCollector.class.getName());
private final Map<String, Instant> lastTimeUsedByImageId = new ConcurrentHashMap<>();
- private final DockerImpl docker;
+ private final DockerEngine docker;
private final Clock clock;
- DockerImageGarbageCollector(DockerImpl docker) {
+ DockerImageGarbageCollector(DockerEngine docker) {
this(docker, Clock.systemUTC());
}
- DockerImageGarbageCollector(DockerImpl docker, Clock clock) {
+ DockerImageGarbageCollector(DockerEngine docker, Clock clock) {
this.docker = docker;
this.clock = clock;
}
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
index 1ca6cd5662e..34f6c99a00e 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
@@ -32,11 +32,11 @@ import static org.mockito.Mockito.when;
/**
* @author Tony Vaagenes
*/
-public class DockerImplTest {
+public class DockerEngineTest {
private final DockerClient dockerClient = mock(DockerClient.class);
private final Metrics metrics = new Metrics();
- private final DockerImpl docker = new DockerImpl(dockerClient, metrics);
+ private final DockerEngine docker = new DockerEngine(dockerClient, metrics);
@Test
public void testExecuteCompletes() {
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
index 40c4cb167a2..a5dfd91051f 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
@@ -170,7 +170,7 @@ public class DockerImageGarbageCollectionTest {
}
private class ImageGcTester {
- private final DockerImpl docker = mock(DockerImpl.class);
+ private final DockerEngine docker = mock(DockerEngine.class);
private final ManualClock clock = new ManualClock();
private final DockerImageGarbageCollector imageGC = new DockerImageGarbageCollector(docker, clock);
private final Map<DockerImage, Integer> numDeletes = new HashMap<>();