diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-05-04 11:16:22 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-05-04 11:16:22 +0200 |
commit | 2994a77b2df8e3447dd9e3fa0f0eca054fd6f859 (patch) | |
tree | 28d12043fe70e3a2e95881361bf61891941c6042 /controller-server | |
parent | 4d941709222a7ee8ef1bea6cfaddde89f77be605 (diff) |
Restore correctness to method name
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index af8d38842f2..69d847406bb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -292,7 +292,7 @@ public class DeploymentTrigger { Versions versions = versions(application, change, deploymentFor(application, job)); if (isTested(application, versions)) { if (completedAt.isPresent() - && jobStateContains(application, job, idle) + && jobStateIsAmong(application, job, idle) && stepJobs.containsAll(runningProductionJobs(application))) jobs.add(deploymentJob(application, versions, change, job, reason, completedAt.get())); if ( ! alreadyTriggered(application, versions)) @@ -339,10 +339,10 @@ public class DeploymentTrigger { return ! application.deploymentJobs().statusOf(jobType) .flatMap(job -> job.lastCompleted().map(run -> run.at().isAfter(job.lastTriggered().get().at()))) .orElse(false) - && jobStateContains(application, jobType, running, queued); + && jobStateIsAmong(application, jobType, running, queued); } - private boolean jobStateContains(Application application, JobType jobType, JobState... states) { + private boolean jobStateIsAmong(Application application, JobType jobType, JobState... states) { return Arrays.asList(states).contains(buildService.stateOf(BuildJob.of(application.id(), application.deploymentJobs().projectId().getAsLong(), jobType.jobName()))); @@ -449,7 +449,7 @@ public class DeploymentTrigger { for (JobType jobType : jobsOf(testStepsOf(application))) { Optional<JobRun> completion = successOn(application, jobType, versions) .filter(run -> sourcesMatchIfPresent(versions, run) || jobType == systemTest); - if (! completion.isPresent() && jobStateContains(application, jobType, idle)) + if (! completion.isPresent() && jobStateIsAmong(application, jobType, idle)) jobs.add(deploymentJob(application, versions, application.change(), jobType, reason, availableSince)); } return jobs; |