Removed CreditCardFund (#150)

- removed CreditCardFund class
- Account for VCR on credit card test
- Fix VCR environmental variables

Author: ryannguyen16

src/main/java/com/easypost/model/CreditCard.java

@@ -15,7 +15,7 @@ public class CreditCard extends BaseCreditCard {
      * @return CreditCardFund object.
      * @throws EasyPostException when the request fails.
      */
-    public static CreditCardFund fund(String amount, CreditCardPriority primaryOrSecondary) throws EasyPostException {
+    public static boolean fund(String amount, CreditCardPriority primaryOrSecondary) throws EasyPostException {
         return fund(amount, primaryOrSecondary, null);
     }
 
@@ -28,7 +28,7 @@ public static CreditCardFund fund(String amount, CreditCardPriority primaryOrSec
      * @return CreditCardFund object.
      * @throws EasyPostException when the request fails.
      */
-    public static CreditCardFund fund(String amount, CreditCardPriority primaryOrSecondary, String apiKey)
+    public static boolean fund(String amount, CreditCardPriority primaryOrSecondary, String apiKey)
             throws EasyPostException {
         PaymentMethod paymentMethods = PaymentMethod.all();
         String cardID = null;
@@ -44,16 +44,18 @@ public static CreditCardFund fund(String amount, CreditCardPriority primaryOrSec
                 break;
         }
 
-        if (cardID == null || cardID.isEmpty() || !cardID.startsWith("card_")) {
+        if (cardID == null || !cardID.startsWith("card_")) {
             throw new EasyPostException("The chosen payment method is not a credit card. Please try again.");
         }
 
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("amount", amount);
 
-        return request(RequestMethod.POST,
-                String.format("%s/%s/%s/%s", EasyPost.API_BASE, "credit_cards", cardID, "charges"), params,
-                CreditCardFund.class, apiKey);
+        // will attempt to serialize the empty response to a CreditCard object (doesn't matter)
+        request(RequestMethod.POST, String.format("%s/%s/%s/%s", EasyPost.API_BASE, "credit_cards", cardID, "charges"),
+                params, CreditCard.class, apiKey);
+
+        return true;
     }
 
     /**

src/main/java/com/easypost/model/CreditCardFund.java

@@ -2,7 +2,6 @@
 
 import com.easypost.exception.EasyPostException;
 import com.easypost.model.CreditCard;
-import com.easypost.model.CreditCardFund;
 import com.easypost.model.CreditCardPriority;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
@@ -11,14 +10,16 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public final class CreditCardTest {
+    private static TestUtils.VCR vcr;
+
     /**
      * Setup the testing environment for this file.
      *
      * @throws EasyPostException when the request fails.
      */
     @BeforeAll
     public static void setup() throws EasyPostException {
-        EasyPost.apiKey = System.getenv("EASYPOST_PROD_API_KEY");
+        vcr = new TestUtils.VCR("credit_card", TestUtils.ApiKey.PRODUCTION);
     }
 
     /**
@@ -29,9 +30,8 @@ public static void setup() throws EasyPostException {
     @Test
     @Disabled // Skipping due to the lack of an available real credit card in tests
     public void testFund() throws EasyPostException {
-        CreditCardFund creditCardFund = CreditCard.fund("20", CreditCardPriority.PRIMARY);
-
-        assertTrue(creditCardFund != null);
+        vcr.setUpTest("fund");
+        assertTrue(CreditCard.fund("2000", CreditCardPriority.PRIMARY));
     }
 
     /**
@@ -42,6 +42,7 @@ public void testFund() throws EasyPostException {
     @Test
     @Disabled // Skipping due to the lack of an available real credit card in tests
     public void testDelete() throws EasyPostException {
+        vcr.setUpTest("delete");
         CreditCard.delete("card_123");
     }
 }

src/test/java/com/easypost/CreditCardTest.java

@@ -78,8 +78,9 @@ public static String getApiKey(ApiKey apiKey) {
         }
 
         String value = System.getenv(keyName);
-        return value != null ? value :
+        value = (value != null && !value.isEmpty()) ? value :
                 API_KEY_FAILED_TO_PULL; // if can't pull from environment, will use a fake key. Won't matter on replay.
+        return value;
     }
 
     public static final class VCR {