diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-06-30 15:22:53 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-06-30 15:32:16 +0200 |
| commit | 2c737b6e2e1ae50159da81c6d74b11a013290c6d (patch) | |
| tree | 437e092ff3f0cd17a6eb6c5f15f89e166302fac1 /controller-api | |
| parent | 087c670cadd94e24106276609d525a69db3972db (diff) | |
Propagate error message when setting plan fails
Diffstat (limited to 'controller-api')
2 files changed, 4 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java index bd9568fe891..d9290b8d685 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java @@ -16,9 +16,9 @@ public interface BillingController { PlanId getPlan(TenantName tenant); /** - * Returns true if plan was changed + * @return String containing error message if something went wrong. Empty otherwise */ - boolean setPlan(TenantName tenant, PlanId planId, boolean hasApplications); + Optional<String> setPlan(TenantName tenant, PlanId planId, boolean hasApplications); Invoice.Id createInvoiceForPeriod(TenantName tenant, ZonedDateTime startTime, ZonedDateTime endTime, String agent); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java index a4c25e301ba..ac6ae7081ab 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java @@ -30,9 +30,9 @@ public class MockBillingController implements BillingController { } @Override - public boolean setPlan(TenantName tenant, PlanId planId, boolean hasApplications) { + public Optional<String> setPlan(TenantName tenant, PlanId planId, boolean hasApplications) { plans.put(tenant, planId); - return true; + return Optional.empty(); } @Override |