diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-01 12:33:44 +0200 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-01 12:33:44 +0200 |
commit | 5deb539bdb7a2aef53a0741bdc29cf0ba6b96dc8 (patch) | |
tree | fe8bbcf3eb4678830dfe57312a57e6cdd3f3a164 /controller-server/src | |
parent | 2c737b6e2e1ae50159da81c6d74b11a013290c6d (diff) |
Add PlanResult, wrapping optional error message
Diffstat (limited to 'controller-server/src')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java index e4a0e2af6b3..0e6f856b115 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java @@ -139,9 +139,12 @@ public class BillingApiHandler extends LoggingRequestHandler { var planId = PlanId.from(slime.field("plan").asString()); var hasApplications = applicationController.asList(tenantName).size() > 0; - return billingController.setPlan(tenantName, planId, hasApplications) - .<HttpResponse>map(ErrorResponse::forbidden) - .orElse(new StringResponse("Plan: " + planId.value())); + var result = billingController.setPlan(tenantName, planId, hasApplications); + + if (result.isSuccess()) + return new StringResponse("Plan: " + planId.value()); + + return ErrorResponse.forbidden(result.getErrorMessage().orElse("Invalid plan change")); } private HttpResponse getBillingAllTenants(String until) { |