From 2c737b6e2e1ae50159da81c6d74b11a013290c6d Mon Sep 17 00:00:00 2001 From: Ola Aunrønning Date: Tue, 30 Jun 2020 15:22:53 +0200 Subject: Propagate error message when setting plan fails --- .../hosted/controller/api/integration/billing/BillingController.java | 4 ++-- .../controller/api/integration/billing/MockBillingController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'controller-api/src') 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 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 setPlan(TenantName tenant, PlanId planId, boolean hasApplications) { plans.put(tenant, planId); - return true; + return Optional.empty(); } @Override -- cgit v1.2.3