diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-11-07 16:45:21 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-11-07 16:45:21 +0100 |
commit | 8b133ea876d8673ea016e28bb05f847271cdcc7d (patch) | |
tree | 8cecc03bbf208ca76c350dde5135b757f0fb167e /controller-api | |
parent | 7b013a8fb1ec2157050703661cf4742c0bc286e2 (diff) |
Remove BuildService
Diffstat (limited to 'controller-api')
4 files changed, 1 insertions, 135 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java deleted file mode 100644 index 0f5b7f154e1..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java +++ /dev/null @@ -1,84 +0,0 @@ -// 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.controller.api.integration; - -import com.yahoo.config.provision.ApplicationId; - -import java.util.Objects; - -/** - * @author jonmv - */ -// TODO jonmv: Remove this. -public interface BuildService { - - /** - * Enqueues a job defined by buildJob in an external build system. - * - * Implementations should throw an exception if the triggering fails. - */ - void trigger(BuildJob buildJob); - - /** - * Returns the state of the given job in the build service. - */ - JobState stateOf(BuildJob buildJob); - - enum JobState { - - /** Job is not running, and may be triggered. */ - idle, - - /** Job is already running, and will be queued if triggered now. */ - running, - - /** Job is running and queued and will automatically be started again after it finishes its current run. */ - queued, - - /** Job is disabled, i.e., it can not be triggered. */ - disabled - - } - - - class BuildJob { - - private final ApplicationId applicationId; - private final long projectId; - private final String jobName; - - protected BuildJob(ApplicationId applicationId, long projectId, String jobName) { - this.applicationId = applicationId; - this.projectId = projectId; - this.jobName = jobName; - } - - public static BuildJob of(ApplicationId applicationId, long projectId, String jobName) { - return new BuildJob(applicationId, projectId, jobName); - } - - public ApplicationId applicationId() { return applicationId; } - public long projectId() { return projectId; } - public String jobName() { return jobName; } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof BuildJob)) return false; - BuildJob job = (BuildJob) o; - return Objects.equals(applicationId, job.applicationId) && - Objects.equals(jobName, job.jobName); - } - - @Override - public int hashCode() { - return Objects.hash(applicationId, jobName); - } - - @Override - public String toString() { - return jobName + " for " + applicationId + " with project " + projectId; - } - - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java index 3d04c239798..4eb4f669225 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/ServiceRegistry.java @@ -73,9 +73,6 @@ public interface ServiceRegistry { RunDataStore runDataStore(); - // TODO: No longer used. Remove this once untangled from test code - BuildService buildService(); - TenantCost tenantCost(); ZoneRegistry zoneRegistry(); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RunId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RunId.java index 506c0482bca..ebce77f7e40 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RunId.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/RunId.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.ApplicationId; import java.util.Objects; /** - * Immutable ID of a job run by a {@link com.yahoo.vespa.hosted.controller.api.integration.BuildService}. + * Immutable ID of a deployment job. * * @author jonmv */ diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java deleted file mode 100644 index 2a8b06888b0..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java +++ /dev/null @@ -1,47 +0,0 @@ -// 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.controller.api.integration.stubs; - -import com.yahoo.component.AbstractComponent; -import com.yahoo.config.provision.ApplicationId; -import com.yahoo.vespa.hosted.controller.api.integration.BuildService; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static com.yahoo.vespa.hosted.controller.api.integration.BuildService.JobState.idle; -import static com.yahoo.vespa.hosted.controller.api.integration.BuildService.JobState.running; - -/** - * @author jonmv - */ -public class MockBuildService extends AbstractComponent implements BuildService { - - private final List<BuildJob> jobs = Collections.synchronizedList(new ArrayList<>()); - - @Override - public void trigger(BuildJob buildJob) { - jobs.add(buildJob); - } - - @Override - public JobState stateOf(BuildJob buildJob) { - return jobs.contains(buildJob) ? running : idle; - } - - /** List all running jobs. */ - public List<BuildJob> jobs() { - return new ArrayList<>(jobs); - } - - /** Clears all running jobs. */ - public void clear() { - jobs.clear(); - } - - /** Removes the given job for the given project and returns whether it was found. */ - public boolean remove(BuildJob buildJob) { - return jobs.remove(buildJob); - } - -} |