diff options
author | smorgrav <smorgrav@verizonmedia.com> | 2020-11-06 08:46:09 +0100 |
---|---|---|
committer | smorgrav <smorgrav@verizonmedia.com> | 2020-11-06 08:48:03 +0100 |
commit | 971e52985057176d9b6feee29872861b969b1150 (patch) | |
tree | ae2915194b289b419c441c96807a90c7998419ce | |
parent | a65780d57302eaf5a5791068e233f781e35d4401 (diff) |
Add collection method enumerations - change default
4 files changed, 6 insertions, 5 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 2f05c99ab66..ce03dccc86b 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 @@ -52,7 +52,7 @@ public interface BillingController { void deleteBillingInfo(TenantName tenant, Set<User> users, boolean isPrivileged); default CollectionMethod getCollectionMethod(TenantName tenant) { - return CollectionMethod.AUTO; + return CollectionMethod.NONE; } default CollectionResult setCollectionMethod(TenantName tenant, CollectionMethod method) { diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/CollectionMethod.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/CollectionMethod.java index 010ce56d1d7..fd586b0faf0 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/CollectionMethod.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/CollectionMethod.java @@ -1,6 +1,8 @@ package com.yahoo.vespa.hosted.controller.api.integration.billing; public enum CollectionMethod { - AUTO, - INVOICE + NONE, + EPAY, + INVOICE, + AUTO // Deprecated - this has never been serialized and can be removed in subsequent release } 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 4b09c744537..6ad621a385e 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 @@ -24,7 +24,7 @@ public class MockBillingController implements BillingController { Map<TenantName, List<Invoice>> committedInvoices = new HashMap<>(); Map<TenantName, Invoice> uncommittedInvoices = new HashMap<>(); Map<TenantName, List<Invoice.LineItem>> unusedLineItems = new HashMap<>(); - CollectionMethod collectionMethod = CollectionMethod.AUTO; + CollectionMethod collectionMethod = CollectionMethod.NONE; @Override public PlanId getPlan(TenantName tenant) { 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 0dce968960f..dfef5b85e40 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 @@ -51,7 +51,6 @@ public class BillingApiHandler extends LoggingRequestHandler { private static final String OPTIONAL_PREFIX = "/api"; private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - private final BillingController billingController; private final ApplicationController applicationController; |