diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-09-01 09:14:10 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2017-09-01 09:14:10 +0200 |
commit | b0fbae647c7294d648f6cb1787b3af19a08e38e4 (patch) | |
tree | 6e142ac4e8e437b03f2412f09c80388ece4cc5cb | |
parent | 93e617dcd8e5a743aac62b3edb0da1853f4d3b6a (diff) |
Remove unused job report fields
7 files changed, 7 insertions, 35 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java index 02e0d94920e..45a39f5c891 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java @@ -272,32 +272,26 @@ public class DeploymentJobs { private final ApplicationId applicationId; private final JobType jobType; private final long projectId; - private final long buildNumber; private final Optional<JobError> jobError; private final boolean selfTriggering; - private final boolean gitChanges; - public JobReport(ApplicationId applicationId, JobType jobType, long projectId, long buildNumber, Optional<JobError> jobError, boolean selfTriggering, boolean gitChanges) { + public JobReport(ApplicationId applicationId, JobType jobType, long projectId, Optional<JobError> jobError, boolean selfTriggering) { Objects.requireNonNull(applicationId, "ApplicationId can not be null."); Objects.requireNonNull(jobType, "JobType can not be null."); this.applicationId = applicationId; this.projectId = projectId; this.jobType = jobType; - this.buildNumber = buildNumber; this.jobError = jobError; this.selfTriggering = selfTriggering; - this.gitChanges = gitChanges; } public ApplicationId applicationId() { return applicationId; } public JobType jobType() { return jobType; } public long projectId() { return projectId; } - public long buildNumber() { return buildNumber; } public boolean success() { return !jobError.isPresent(); } public Optional<JobError> jobError() { return jobError; } public boolean selfTriggering() { return selfTriggering; } - public boolean gitChanges() { return gitChanges; } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java index a623e880c4c..9a1bdfc3c33 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java @@ -111,10 +111,8 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler { * "instance" : String * "jobName" : String * "projectId" : long - * "buildNumber" : long * "success" : boolean * "selfTriggering": boolean - * "gitChanges" : boolean * "vespaVersion" : String * } * and notify the controller of the report. @@ -123,15 +121,7 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler { * @return 200 */ private HttpResponse handleJobReportPost(HttpRequest request) { - // TODO: buildNumber is unused now -- remove, or use. - // TODO: selfTriggering is unused now -- remove, or use. - // TODO: gitChanges is unused now -- remove, or use. - // Note: gitChanges is probably only useful for the component step, since it check the gir repo directly; - // for other jobs, the last component's git commit is what matters. - // TODO: ApplicationId (tenant, application, instance) is unused now -- remove, or use. - controller.applications().notifyJobCompletion(toJobReport(toSlime(request.getData()).get())); - return new StringResponse("ok"); } @@ -148,8 +138,6 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler { Optional<JobError> jobError = Optional.empty(); if (report.field("jobError").valid()) { jobError = Optional.of(JobError.valueOf(report.field("jobError").asString())); - } else if (report.field("success").valid()) { // TODO: Remove after May 2017 - jobError = JobError.from(report.field("success").asBool()); } return new JobReport( ApplicationId.from( @@ -158,10 +146,8 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler { report.field("instance").asString()), JobType.fromId(report.field("jobName").asString()), report.field("projectId").asLong(), - report.field("buildNumber").asLong(), jobError, - report.field("selfTriggering").asBool(), - report.field("gitChanges").asBool() + report.field("selfTriggering").asBool() ); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 29b34747573..8b5dad1fa9a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -499,10 +499,8 @@ public class ControllerTest { application.id(), jobType, application.deploymentJobs().projectId().get(), - 1L, jobError, - selfTriggering, - true + selfTriggering ); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java index 9b05101b5eb..8ed1bda1e57 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java @@ -193,10 +193,8 @@ public class DeploymentTester { application.id(), jobType, application.deploymentJobs().projectId().get(), - 1L, jobError, - false, - true + false ); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java index 6346d1cbdb6..7d792c9f038 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/MockBuildService.java @@ -160,9 +160,7 @@ public class MockBuildService implements BuildService { applicationId, jobType, projectId, - 1L, JobError.from(success), - false, false )); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java index 348b9c92614..1b4851d4a78 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java @@ -74,9 +74,9 @@ public class ContainerControllerTester { } public void notifyJobCompletion(ApplicationId applicationId, long projectId, boolean success, DeploymentJobs.JobType job) { - controller().applications().notifyJobCompletion(new DeploymentJobs.JobReport(applicationId, job, projectId, 1L, + controller().applications().notifyJobCompletion(new DeploymentJobs.JobReport(applicationId, job, projectId, success ? Optional.empty() : Optional.of(DeploymentJobs.JobError.unknown), - false, false)); + false)); } public AthensDomain addTenantAthensDomain(String domainName, String userName) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java index 11e55edb5a5..79ee96c309d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java @@ -273,10 +273,8 @@ public class VersionStatusTest { application.id(), jobType, application.deploymentJobs().projectId().get(), - 1L, JobError.from(success), - false, - true + false ); } |