From 88a06743bb840bbc7846ed8acfe26360db0992af Mon Sep 17 00:00:00 2001
From: Øyvind Grønnesby <ogr@ogr.no>
Date: Fri, 6 Nov 2020 09:20:27 +0100
Subject: Revert "Add collection method enumerations - change default"

---
 .../controller/api/integration/billing/BillingController.java       | 2 +-
 .../hosted/controller/api/integration/billing/CollectionMethod.java | 6 ++----
 .../controller/api/integration/billing/MockBillingController.java   | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'controller-api')

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) {
-- 
cgit v1.2.3