diff options
| author | Øyvind Grønnesby <ogr@ogr.no> | 2020-11-06 09:20:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 09:20:54 +0100 |
| commit | 3e13058fe8e48b1840b67bf821b33f3f9345edc8 (patch) | |
| tree | 9aeb09de309b99f87a473c329197e1608ebaa2ec /controller-api | |
| parent | 28e6edea2034bcb017a0d97296ca21a9e89d195c (diff) | |
Revert "Revert "Add collection method enumerations - change default""
Diffstat (limited to 'controller-api')
3 files changed, 6 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 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) { |