summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-10-11 10:20:39 +0200
committerGitHub <noreply@github.com>2019-10-11 10:20:39 +0200
commit569e881fddd07b86878f18b49bac77b8118d04cc (patch)
tree0e4a8e7ac71808b372aeb4b7809d1eb8bdf199e8 /controller-server
parent9acd6b680d7b55f22a0df1cf3fd350b2dab8a3a8 (diff)
parent193cacbb78224af1da02f2c3de3b8cc2d1f3bad6 (diff)
Merge pull request #10954 from vespa-engine/bratseth/string-bucket-convenience-constructor
Bratseth/string bucket convenience constructor
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
index 627cde28fd0..90fa51fb8f8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
@@ -117,18 +117,15 @@ public class Instance {
}
public Instance withoutDeploymentJob(JobType jobType) {
- return new Instance(id, deployments.values(), deploymentJobs.without(jobType),
- rotations, rotationStatus);
+ return new Instance(id, deployments.values(), deploymentJobs.without(jobType), rotations, rotationStatus);
}
public Instance with(List<AssignedRotation> assignedRotations) {
- return new Instance(id, deployments.values(), deploymentJobs,
- assignedRotations, rotationStatus);
+ return new Instance(id, deployments.values(), deploymentJobs, assignedRotations, rotationStatus);
}
public Instance with(RotationStatus rotationStatus) {
- return new Instance(id, deployments.values(), deploymentJobs,
- rotations, rotationStatus);
+ return new Instance(id, deployments.values(), deploymentJobs, rotations, rotationStatus);
}
private Instance with(Deployment deployment) {
@@ -138,8 +135,7 @@ public class Instance {
}
private Instance with(Map<ZoneId, Deployment> deployments) {
- return new Instance(id, deployments.values(), deploymentJobs,
- rotations, rotationStatus);
+ return new Instance(id, deployments.values(), deploymentJobs, rotations, rotationStatus);
}
public ApplicationId id() { return id; }