/stripe-java

Permalink
Browse files

Plumb request params/options, clean-up, tests for pagination

  • Loading branch information...
@brandur
brandur committed Oct 15, 2015
1 parent 042838a commit 7a970ab260f36721a712321632a24adc8699f10d
Unified Split
Showing with 972 additions and 226 deletions.
  1. +16 −2 src/main/java/com/stripe/model/Account.java
  2. +19 −3 src/main/java/com/stripe/model/ApplicationFee.java
  3. +24 −9 src/main/java/com/stripe/model/BalanceTransaction.java
  4. +22 −7 src/main/java/com/stripe/model/BitcoinReceiver.java
  5. +17 −3 src/main/java/com/stripe/model/BitcoinTransactionCollection.java
  6. +23 −8 src/main/java/com/stripe/model/Charge.java
  7. +20 −4 src/main/java/com/stripe/model/ChargeRefundCollection.java
  8. +18 −3 src/main/java/com/stripe/model/Coupon.java
  9. +25 −8 src/main/java/com/stripe/model/Customer.java
  10. +35 −19 src/main/java/com/stripe/model/CustomerCardCollection.java
  11. +35 −19 src/main/java/com/stripe/model/CustomerSubscriptionCollection.java
  12. +16 −2 src/main/java/com/stripe/model/Dispute.java
  13. +23 −8 src/main/java/com/stripe/model/Event.java
  14. +18 −3 src/main/java/com/stripe/model/ExternalAccountCollection.java
  15. +20 −4 src/main/java/com/stripe/model/FeeRefundCollection.java
  16. +18 −4 src/main/java/com/stripe/model/FileUpload.java
  17. +24 −8 src/main/java/com/stripe/model/Invoice.java
  18. +24 −8 src/main/java/com/stripe/model/InvoiceItem.java
  19. +20 −4 src/main/java/com/stripe/model/InvoiceLineItemCollection.java
  20. +23 −7 src/main/java/com/stripe/model/Order.java
  21. +20 −0 src/main/java/com/stripe/model/PagingIterable.java
  22. +21 −17 src/main/java/com/stripe/model/{StripeCollectionIterator.java → PagingIterator.java}
  23. +23 −8 src/main/java/com/stripe/model/Plan.java
  24. +22 −7 src/main/java/com/stripe/model/Product.java
  25. +24 −8 src/main/java/com/stripe/model/Recipient.java
  26. +35 −19 src/main/java/com/stripe/model/RecipientCardCollection.java
  27. +21 −7 src/main/java/com/stripe/model/Refund.java
  28. +22 −7 src/main/java/com/stripe/model/SKU.java
  29. +56 −4 src/main/java/com/stripe/model/StripeCollection.java
  30. +29 −4 src/main/java/com/stripe/model/StripeCollectionAPIResource.java
  31. +27 −0 src/main/java/com/stripe/model/StripeCollectionInterface.java
  32. +24 −8 src/main/java/com/stripe/model/Transfer.java
  33. +18 −3 src/main/java/com/stripe/model/TransferReversalCollection.java
  34. +24 −0 src/main/java/com/stripe/net/APIResource.java
  35. +18 −1 src/main/java/com/stripe/net/LiveStripeResponseGetter.java
  36. +122 −0 src/test/java/com/stripe/model/PagingIteratorTest.java
  37. +15 −0 src/test/resources/com/stripe/model/pageable_model_page.json
  38. +11 −0 src/test/resources/com/stripe/model/pageable_model_page_last.json
View
18 src/main/java/com/stripe/model/Account.java
@@ -150,16 +150,30 @@ public static Account create(Map<String, Object> params, RequestOptions options)
return request(RequestMethod.POST, classURL(Account.class), params, Account.class, options);
}
public static AccountCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public static AccountCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return requestCollection(classURL(Account.class), params, AccountCollection.class, options);
}
@Deprecated
public static AccountCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
return list(params, (RequestOptions) null);
}
@Deprecated
public static AccountCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return request(RequestMethod.GET, classURL(Account.class), params, AccountCollection.class, options);
return list(params, options);
}
public static Account retrieve()
View
22 src/main/java/com/stripe/model/ApplicationFee.java
@@ -148,21 +148,37 @@ public static ApplicationFee retrieve(String id, RequestOptions options)
return request(RequestMethod.GET, instanceURL(ApplicationFee.class, id), null, ApplicationFee.class, options);
}
public static ApplicationFeeCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public static ApplicationFeeCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return requestCollection(classURL(ApplicationFee.class), params, ApplicationFeeCollection.class, options);
}
@Deprecated
public static ApplicationFeeCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
return list(params, (RequestOptions) null);
}
@Deprecated
public static ApplicationFeeCollection all(Map<String, Object> params, String apiKey)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, RequestOptions.builder().setApiKey(apiKey).build());
return list(params, RequestOptions.builder().setApiKey(apiKey).build());
}
@Deprecated
public static ApplicationFeeCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return request(RequestMethod.GET, classURL(ApplicationFee.class), params, ApplicationFeeCollection.class, options);
return list(params, options);
}
View
33 src/main/java/com/stripe/model/BalanceTransaction.java
@@ -128,12 +128,6 @@ public static BalanceTransaction retrieve(String id) throws AuthenticationExcept
return retrieve(id, (RequestOptions) null);
}
public static BalanceTransactionCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
}
@Deprecated
public static BalanceTransaction retrieve(String id, String apiKey)
throws AuthenticationException, InvalidRequestException,
@@ -148,16 +142,37 @@ public static BalanceTransaction retrieve(String id, RequestOptions options)
return request(RequestMethod.GET, url, null, BalanceTransaction.class, options);
}
public static BalanceTransactionCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public static BalanceTransactionCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
String url = String.format("%s/%s", Stripe.getApiBase(), "v1/balance/history");
return requestCollection(url, params, BalanceTransactionCollection.class, options);
}
@Deprecated
public static BalanceTransactionCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
@Deprecated
public static BalanceTransactionCollection all(Map<String, Object> params, String apiKey)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, RequestOptions.builder().setApiKey(apiKey).build());
return list(params, RequestOptions.builder().setApiKey(apiKey).build());
}
@Deprecated
public static BalanceTransactionCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
String url = String.format("%s/%s", Stripe.getApiBase(), "v1/balance/history");
return request(RequestMethod.GET, url, params, BalanceTransactionCollection.class, options);
return list(params, options);
}
}
View
29 src/main/java/com/stripe/model/BitcoinReceiver.java
@@ -188,12 +188,6 @@ public static BitcoinReceiver retrieve(String id) throws AuthenticationException
return retrieve(id, (RequestOptions) null);
}
public static BitcoinReceiverCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
}
public static BitcoinReceiver create(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
@@ -206,10 +200,31 @@ public static BitcoinReceiver retrieve(String id, RequestOptions options)
return request(RequestMethod.GET, String.format("%s/%s/%s", Stripe.getApiBase(), "v1/bitcoin/receivers", id), null, BitcoinReceiver.class, options);
}
public static BitcoinReceiverCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public static BitcoinReceiverCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
String url = String.format("%s/%s", Stripe.getApiBase(), "v1/bitcoin/receivers");
return requestCollection(url, params, BitcoinReceiverCollection.class, options);
}
@Deprecated
public static BitcoinReceiverCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
@Deprecated
public static BitcoinReceiverCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return request(RequestMethod.GET, String.format("%s/%s", Stripe.getApiBase(), "v1/bitcoin/receivers"), params, BitcoinReceiverCollection.class, options);
return list(params, options);
}
@Override
View
20 src/main/java/com/stripe/model/BitcoinTransactionCollection.java
@@ -12,16 +12,30 @@
public class BitcoinTransactionCollection extends StripeCollectionAPIResource<BitcoinTransaction> {
public BitcoinTransactionCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public BitcoinTransactionCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
String url = String.format("%s%s", Stripe.getApiBase(), this.getURL());
return requestCollection(url, params, BitcoinTransactionCollection.class, options);
}
@Deprecated
public BitcoinTransactionCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
return list(params, (RequestOptions) null);
}
@Deprecated
public BitcoinTransactionCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
String url = String.format("%s%s", Stripe.getApiBase(), this.getURL());
return request(RequestMethod.GET, url, params, BitcoinTransactionCollection.class, options);
return list(params, options);
}
}
View
31 src/main/java/com/stripe/model/Charge.java
@@ -327,12 +327,6 @@ public Charge update(Map<String, Object> params)
return update(params, (RequestOptions) null);
}
public static ChargeCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
}
public Charge refund() throws AuthenticationException,
InvalidRequestException, APIConnectionException, CardException,
APIException {
@@ -407,16 +401,37 @@ public Charge update(Map<String, Object> params, RequestOptions options)
return request(RequestMethod.POST, instanceURL(Charge.class, id), params, Charge.class, options);
}
public static ChargeCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public static ChargeCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return requestCollection(classURL(Charge.class), params, ChargeCollection.class, options);
}
@Deprecated
public static ChargeCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
@Deprecated
public static ChargeCollection all(Map<String, Object> params, String apiKey)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, RequestOptions.builder().setApiKey(apiKey).build());
return list(params, RequestOptions.builder().setApiKey(apiKey).build());
}
@Deprecated
public static ChargeCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return request(RequestMethod.GET, classURL(Charge.class), params, ChargeCollection.class, options);
return list(params, options);
}
@Deprecated
View
24 src/main/java/com/stripe/model/ChargeRefundCollection.java
@@ -11,25 +11,41 @@
import java.util.Map;
public class ChargeRefundCollection extends StripeCollectionAPIResource<Refund> {
public ChargeRefundCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public ChargeRefundCollection list(Map<String, Object> params,
RequestOptions options) throws AuthenticationException,
InvalidRequestException, APIConnectionException, CardException,
APIException {
String url = String.format("%s%s", Stripe.getApiBase(), this.getURL());
return requestCollection(url, params, ChargeRefundCollection.class, options);
}
@Deprecated
public ChargeRefundCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
return list(params, (RequestOptions) null);
}
@Deprecated
public ChargeRefundCollection all(Map<String, Object> params,
String apiKey) throws AuthenticationException,
InvalidRequestException, APIConnectionException, CardException,
APIException {
return all(params, RequestOptions.builder().setApiKey(apiKey).build());
return list(params, RequestOptions.builder().setApiKey(apiKey).build());
}
@Deprecated
public ChargeRefundCollection all(Map<String, Object> params,
RequestOptions options) throws AuthenticationException,
InvalidRequestException, APIConnectionException, CardException,
APIException {
String url = String.format("%s%s", Stripe.getApiBase(), this.getURL());
return request(RequestMethod.GET, url, params, ChargeRefundCollection.class, options);
return list(params, options);
}
public Refund retrieve(String id)
View
21 src/main/java/com/stripe/model/Coupon.java
@@ -80,22 +80,37 @@ public static Coupon retrieve(String id, RequestOptions options)
return request(RequestMethod.GET, instanceURL(Coupon.class, id), null, Coupon.class, options);
}
public static CouponCollection list(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return list(params, (RequestOptions) null);
}
public static CouponCollection list(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return requestCollection(classURL(Coupon.class), params, CouponCollection.class, options);
}
@Deprecated
public static CouponCollection all(Map<String, Object> params)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, (RequestOptions) null);
return list(params, (RequestOptions) null);
}
@Deprecated
public static CouponCollection all(Map<String, Object> params, String apiKey)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return all(params, RequestOptions.builder().setApiKey(apiKey).build());
return list(params, RequestOptions.builder().setApiKey(apiKey).build());
}
@Deprecated
public static CouponCollection all(Map<String, Object> params, RequestOptions options)
throws AuthenticationException, InvalidRequestException,
APIConnectionException, CardException, APIException {
return request(RequestMethod.GET, classURL(Coupon.class), params, CouponCollection.class, options);
return list(params, options);
}
public DeletedCoupon delete() throws AuthenticationException,
Oops, something went wrong.

0 comments on commit 7a970ab

Please sign in to comment.