diff options
8 files changed, 14 insertions, 14 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<>(); diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml index c5dcab34c8c..4647f5201c7 100644 --- a/node-admin/src/main/application/services.xml +++ b/node-admin/src/main/application/services.xml @@ -6,7 +6,7 @@ <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" symlinkName="access.log" /> <accesslog type="json" fileNamePattern="logs/vespa/node-admin/access-json.log.%Y%m%d%H%M%S" symlinkName="access-json.log" compressOnRotation="true" /> - <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/> + <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerEngine" bundle="docker-api"/> <component id="metrics" class="com.yahoo.vespa.hosted.dockerapi.metrics.Metrics" bundle="docker-api"/> <preprocess:include file="variant.xml" required="false"/> diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ContainerEngineMock.java index 310d950c5c3..2ea48ed0e9c 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ContainerEngineMock.java @@ -23,7 +23,7 @@ import java.util.OptionalLong; * * @author freva */ -public class DockerMock implements ContainerEngine { +public class ContainerEngineMock implements ContainerEngine { private final Map<ContainerName, Container> containersByContainerName = new HashMap<>(); private static final Object monitor = new Object(); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java index da6f115463c..e7292d567c6 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java @@ -51,7 +51,7 @@ public class DockerTester implements AutoCloseable { private final Thread loopThread; - final ContainerEngine containerEngine = spy(new DockerMock()); + final ContainerEngine containerEngine = spy(new ContainerEngineMock()); final NodeRepoMock nodeRepository = spy(new NodeRepoMock()); final Orchestrator orchestrator = mock(Orchestrator.class); final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class); |