diff options
author | Jon Bratseth <bratseth@oath.com> | 2019-01-14 14:11:26 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2019-01-14 14:11:26 +0100 |
commit | 63c8d281a84012dbf18b29f069a5c6ca811113d0 (patch) | |
tree | bf2cd151cbd606394f2a2c153e39ee39b76bf57f /controller-server | |
parent | ebfc65452ac5f5a9f0aa100763dc22a80cfd7167 (diff) |
Fix doc typo and remove unnecessary parameter
Diffstat (limited to 'controller-server')
2 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java index 6eb321918e6..6ac62284661 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java @@ -224,7 +224,7 @@ public class LockedApplication { ownershipIssueId, Optional.ofNullable(owner), majorVersion, metrics, rotation, rotationStatus); } - /** Set a major vewrsion for this, or set to null to remove any major version override */ + /** Set a major version for this, or set to null to remove any major version override */ public LockedApplication withMajorVersion(Integer majorVersion) { return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, deploymentJobs, change, outstandingChange, diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index fcf82a79850..a3581334b2a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -353,12 +353,12 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse application(String tenantName, String applicationName, HttpRequest request) { Slime slime = new Slime(); - toSlime(slime.setObject(), getApplication(tenantName, applicationName, request), request); + toSlime(slime.setObject(), getApplication(tenantName, applicationName), request); return new SlimeJsonResponse(slime); } private HttpResponse setMajorVersion(String tenantName, String applicationName, HttpRequest request) { - Application application = getApplication(tenantName, applicationName, request); + Application application = getApplication(tenantName, applicationName); Inspector majorVersionField = toSlime(request.getData()).get().field("majorVersion"); if ( ! majorVersionField.valid()) throw new IllegalArgumentException("Request body must contain a majorVersion field"); @@ -368,7 +368,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { return new MessageResponse("Set major version to " + ( majorVersion == null ? "empty" : majorVersion)); } - private Application getApplication(String tenantName, String applicationName, HttpRequest request) { + private Application getApplication(String tenantName, String applicationName) { ApplicationId applicationId = ApplicationId.from(tenantName, applicationName, "default"); return controller.applications().get(applicationId) .orElseThrow(() -> new NotExistsException(applicationId + " not found")); |