Revert "Billing refactoring and cleanup"

1 files changed, 0 insertions, 135 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClient.java
deleted file mode 100644
index 4891fe0ffa7..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClient.java
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.billing;
-
-import com.yahoo.config.provision.TenantName;
-
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Interface that talks about bills in the billing API.  It is a layer on top of the SQL
- * database where we store data about bills.
- *
- * @author olaa
- * @author ogronnesby
- */
-public interface BillingDatabaseClient {
-
-    boolean setActivePaymentInstrument(InstrumentOwner paymentInstrument);
-
-    Optional<InstrumentOwner> getDefaultPaymentInstrumentForTenant(TenantName from);
-
-    /**
-     * Create a completely new Bill in the open state with no LineItems.
-     *
-     * @param tenant The name of the tenant the bill is for
-     * @param agent  The agent that created the bill
-     * @return The Id of the new bill
-     */
-    Bill.Id createBill(TenantName tenant, ZonedDateTime startTime, ZonedDateTime endTime, String agent);
-
-    /**
-     * Read the given bill from the data source
-     *
-     * @param billId The Id of the bill to retrieve
-     * @return The Bill if it exists, Optional.empty() if not.
-     */
-    Optional<Bill> readBill(Bill.Id billId);
-
-    /**
-     * Get all bills for a given tenant, ordered by date
-     *
-     * @param tenant The name of the tenant
-     * @return List of all bills ordered by date
-     */
-    List<Bill> readBillsForTenant(TenantName tenant);
-
-    /**
-     * Read all bills, ordered by date
-     * @return List of all bills ordered by date
-     */
-    List<Bill> readBills();
-
-    /**
-     * Add a line item to an open bill
-     *
-     * @param lineItem
-     * @param billId    The optional ID of the bill this line item is for
-     * @return The Id of the new line item
-     * @throws RuntimeException if the bill is not in OPEN state
-     */
-    String addLineItem(TenantName tenantName, Bill.LineItem lineItem, Optional<Bill.Id> billId);
-
-    /**
-     * Set status for the given bill
-     *
-     * @param billId The ID of the bill this status is for
-     * @param agent     The agent that added the status
-     * @param status    The new status of the bill
-     */
-    void setStatus(Bill.Id billId, String agent, String status);
-
-    List<Bill.LineItem> getUnusedLineItems(TenantName tenantName);
-
-    /**
-     * Delete a line item
-     * This is only allowed if the line item has not yet been associated with an bill
-     *
-     * @param lineItemId The ID of the line item
-     * @throws RuntimeException if the line item is associated with an bill
-     */
-    void deleteLineItem(String lineItemId);
-
-    /**
-     * Associate all uncommitted line items to a given bill
-     * This is only allowed if the line item has not already been associated with an bill
-     *
-     * @param tenantName The tenant we want to commit line items for
-     * @param billId  The ID of the line item
-     * @throws RuntimeException if the line item is already associated with an bill
-     */
-    void commitLineItems(TenantName tenantName, Bill.Id billId);
-
-    /**
-     * Return the plan for the given tenant
-     *
-     * @param tenantName The tenant to retrieve the plan for
-     * @return Optional.of the plan if present in DN, else Optional.empty
-     */
-    Optional<Plan> getPlan(TenantName tenantName);
-
-    /**
-     * Return the plan for the given tenants if present.
-     * If the database does not know of the tenant, the tenant is not included in the result.
-     */
-    Map<TenantName, Optional<Plan>> getPlans(List<TenantName> tenants);
-
-    /**
-     * Set the current plan for the given tenant
-     *
-     * @param tenantName The tenant to set the plan for
-     * @param plan The plan to use
-     */
-    void setPlan(TenantName tenantName, Plan plan);
-
-    /**
-     * Deactivates the default payment instrument for a tenant, if it exists.
-     * Used during tenant deletion
-     */
-    void deactivateDefaultPaymentInstrument(TenantName tenant);
-
-    /**
-     * Get the current collection method for the tenant - if one has persisted
-     * @return Optional.empty if no collection method has been persisted for the tenant
-     */
-    Optional<CollectionMethod> getCollectionMethod(TenantName tenantName);
-
-    /**
-     * Set the collection method for the tenant
-     * @param tenantName The name of the tenant to set collection method for
-     * @param collectionMethod The collection method for the tenant
-     */
-    void setCollectionMethod(TenantName tenantName, CollectionMethod collectionMethod);
-}