diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-11-06 09:20:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-06 09:20:45 +0100 |
commit | 28e6edea2034bcb017a0d97296ca21a9e89d195c (patch) | |
tree | 0986d8e0e69004638d2be4a94c730eceeb316d66 | |
parent | 79d82478a6ed4a297e25368475b92cc72b3b453c (diff) | |
parent | 88a06743bb840bbc7846ed8acfe26360db0992af (diff) |
Merge pull request #15198 from vespa-engine/revert-15197-smorgrav/collection_methods_take_2
Revert "Add collection method enumerations - change default"
4 files changed, 5 insertions, 6 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 ce03dccc86b..2f05c99ab66 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.NONE; + return CollectionMethod.AUTO; } 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 fd586b0faf0..010ce56d1d7 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,8 +1,6 @@ package com.yahoo.vespa.hosted.controller.api.integration.billing; public enum CollectionMethod { - NONE, - EPAY, - INVOICE, - AUTO // Deprecated - this has never been serialized and can be removed in subsequent release + AUTO, + INVOICE } 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 6ad621a385e..4b09c744537 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.NONE; + CollectionMethod collectionMethod = CollectionMethod.AUTO; @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 dfef5b85e40..0dce968960f 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,6 +51,7 @@ 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; |