diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-05 15:12:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 15:12:26 +0100 |
commit | e65ca655fd3b8a6293fba56d031a973874452412 (patch) | |
tree | e7ad98feb133e69f728f4ad856ec43516ed00491 /controller-api | |
parent | c1c186a34500e3eacd9d813eba4138b6cdd3e428 (diff) |
Revert "Jvenstad/pushing build system"
Diffstat (limited to 'controller-api')
2 files changed, 3 insertions, 37 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 index 5e9c8d73b38..7933a23c45f 100644 --- 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 @@ -1,21 +1,18 @@ // 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 java.util.Objects; - /** * @author jvenstad */ public interface BuildService { /** - * Enqueue a job defined by buildJob in an external build system, and return the outcome of the enqueue request. - * This method should return false only when a retry is in order, and true otherwise, e.g., on success, or for + * Enqueue a job defined by "buildJob in an external build system, and return the outcome of the enqueue request. + * This method should return @false only when a retry is in order, and @true otherwise, e.g., on success, or for * invalid jobs. */ boolean trigger(BuildJob buildJob); - class BuildJob { private final long projectId; @@ -30,23 +27,7 @@ public interface BuildService { public String jobName() { return jobName; } @Override - public boolean equals(Object o) { - if (this == o) return true; - if ( ! (o instanceof BuildJob)) return false; - BuildJob buildJob = (BuildJob) o; - return projectId == buildJob.projectId && - Objects.equals(jobName, buildJob.jobName); - } - - @Override - public String toString() { - return jobName + "@" + projectId; - } - - @Override - public int hashCode() { - return Objects.hash(projectId, jobName); - } + public String toString() { return jobName + "@" + projectId; } } 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 786a26a2330..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yahoo.vespa.hosted.controller.api.integration.stubs; - -import com.yahoo.vespa.hosted.controller.api.integration.BuildService; - -/** - * @author jvenstad - */ -public class MockBuildService implements BuildService { - - @Override - public boolean trigger(BuildJob buildJob) { - return true; - } - -} |