diff --git a/src/main/java/com/stripe/model/Account.java b/src/main/java/com/stripe/model/Account.java index 7c761a3342e..51e5b6516f6 100644 --- a/src/main/java/com/stripe/model/Account.java +++ b/src/main/java/com/stripe/model/Account.java @@ -176,9 +176,9 @@ public CapabilityCollection capabilities(Map params) throws Stri public CapabilityCollection capabilities(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/capabilities", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, CapabilityCollection.class, options); } @@ -199,9 +199,9 @@ public CapabilityCollection capabilities(AccountCapabilitiesParams params) public CapabilityCollection capabilities(AccountCapabilitiesParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/capabilities", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, CapabilityCollection.class, options); } @@ -222,7 +222,7 @@ public static Account create(Map params) throws StripeException */ public static Account create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/accounts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/accounts"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Account.class, options); } @@ -242,7 +242,7 @@ public static Account create(AccountCreateParams params) throws StripeException */ public static Account create(AccountCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/accounts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/accounts"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Account.class, options); } @@ -304,9 +304,9 @@ public Account delete(Map params) throws StripeException { */ public Account delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Account.class, options); @@ -328,7 +328,7 @@ public static AccountCollection list(Map params) throws StripeEx */ public static AccountCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/accounts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/accounts"); return ApiResource.requestCollection(url, params, AccountCollection.class, options); } @@ -348,7 +348,7 @@ public static AccountCollection list(AccountListParams params) throws StripeExce */ public static AccountCollection list(AccountListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/accounts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/accounts"); return ApiResource.requestCollection(url, params, AccountCollection.class, options); } @@ -375,9 +375,9 @@ public PersonCollection persons(Map params) throws StripeExcepti public PersonCollection persons(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/persons", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, PersonCollection.class, options); } @@ -397,9 +397,9 @@ public PersonCollection persons(AccountPersonsParams params) throws StripeExcept public PersonCollection persons(AccountPersonsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/persons", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, PersonCollection.class, options); } @@ -424,9 +424,9 @@ public Account reject(Map params) throws StripeException { */ public Account reject(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/reject", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Account.class, options); } @@ -451,9 +451,9 @@ public Account reject(AccountRejectParams params) throws StripeException { */ public Account reject(AccountRejectParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/reject", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Account.class, options); } @@ -471,14 +471,14 @@ public static Account retrieve(RequestOptions options) throws StripeException { /** Retrieves the details of an account. */ public static Account retrieve(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/account"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/account"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Account.class, options); } /** Retrieves the details of an account. */ public static Account retrieve(AccountRetrieveParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/account"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/account"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Account.class, options); } @@ -496,9 +496,9 @@ public static Account retrieve(String account, RequestOptions options) throws St public static Account retrieve(String account, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s", ApiResource.urlEncodeId(account))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Account.class, options); } @@ -507,9 +507,9 @@ public static Account retrieve(String account, Map params, Reque public static Account retrieve( String account, AccountRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s", ApiResource.urlEncodeId(account))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Account.class, options); } @@ -546,9 +546,9 @@ public Account update(Map params) throws StripeException { @Override public Account update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Account.class, options); } @@ -583,9 +583,9 @@ public Account update(AccountUpdateParams params) throws StripeException { */ public Account update(AccountUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Account.class, options); } diff --git a/src/main/java/com/stripe/model/AccountLink.java b/src/main/java/com/stripe/model/AccountLink.java index b6c89926284..1747dc0ff2f 100644 --- a/src/main/java/com/stripe/model/AccountLink.java +++ b/src/main/java/com/stripe/model/AccountLink.java @@ -57,7 +57,7 @@ public static AccountLink create(Map params) throws StripeExcept */ public static AccountLink create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/account_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/account_links"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, AccountLink.class, options); } @@ -76,7 +76,7 @@ public static AccountLink create(AccountLinkCreateParams params) throws StripeEx */ public static AccountLink create(AccountLinkCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/account_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/account_links"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, AccountLink.class, options); } diff --git a/src/main/java/com/stripe/model/ApplePayDomain.java b/src/main/java/com/stripe/model/ApplePayDomain.java index d80fd050754..a96cf4c47a8 100644 --- a/src/main/java/com/stripe/model/ApplePayDomain.java +++ b/src/main/java/com/stripe/model/ApplePayDomain.java @@ -57,7 +57,7 @@ public static ApplePayDomain create(Map params) throws StripeExc /** Create an apple pay domain. */ public static ApplePayDomain create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apple_pay/domains"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apple_pay/domains"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ApplePayDomain.class, options); } @@ -70,7 +70,7 @@ public static ApplePayDomain create(ApplePayDomainCreateParams params) throws St /** Create an apple pay domain. */ public static ApplePayDomain create(ApplePayDomainCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apple_pay/domains"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apple_pay/domains"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ApplePayDomain.class, options); } @@ -94,9 +94,9 @@ public ApplePayDomain delete(Map params) throws StripeException public ApplePayDomain delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/apple_pay/domains/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, ApplePayDomain.class, options); @@ -110,7 +110,7 @@ public static ApplePayDomainCollection list(Map params) throws S /** List apple pay domains. */ public static ApplePayDomainCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apple_pay/domains"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apple_pay/domains"); return ApiResource.requestCollection(url, params, ApplePayDomainCollection.class, options); } @@ -123,7 +123,7 @@ public static ApplePayDomainCollection list(ApplePayDomainListParams params) /** List apple pay domains. */ public static ApplePayDomainCollection list( ApplePayDomainListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apple_pay/domains"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apple_pay/domains"); return ApiResource.requestCollection(url, params, ApplePayDomainCollection.class, options); } @@ -142,9 +142,9 @@ public static ApplePayDomain retrieve(String domain, RequestOptions options) public static ApplePayDomain retrieve( String domain, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/apple_pay/domains/%s", ApiResource.urlEncodeId(domain))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ApplePayDomain.class, options); @@ -155,9 +155,9 @@ public static ApplePayDomain retrieve( String domain, ApplePayDomainRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/apple_pay/domains/%s", ApiResource.urlEncodeId(domain))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ApplePayDomain.class, options); diff --git a/src/main/java/com/stripe/model/ApplicationFee.java b/src/main/java/com/stripe/model/ApplicationFee.java index ea096cd3ccf..fb51c8b7187 100644 --- a/src/main/java/com/stripe/model/ApplicationFee.java +++ b/src/main/java/com/stripe/model/ApplicationFee.java @@ -212,7 +212,7 @@ public static ApplicationFeeCollection list(Map params) throws S */ public static ApplicationFeeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/application_fees"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/application_fees"); return ApiResource.requestCollection(url, params, ApplicationFeeCollection.class, options); } @@ -231,7 +231,7 @@ public static ApplicationFeeCollection list(ApplicationFeeListParams params) */ public static ApplicationFeeCollection list( ApplicationFeeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/application_fees"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/application_fees"); return ApiResource.requestCollection(url, params, ApplicationFeeCollection.class, options); } @@ -258,9 +258,9 @@ public static ApplicationFee retrieve(String id, RequestOptions options) throws public static ApplicationFee retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/application_fees/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ApplicationFee.class, options); @@ -274,9 +274,9 @@ public static ApplicationFee retrieve( String id, ApplicationFeeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/application_fees/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ApplicationFee.class, options); diff --git a/src/main/java/com/stripe/model/Balance.java b/src/main/java/com/stripe/model/Balance.java index 77b1c7559a0..63407dfa6ef 100644 --- a/src/main/java/com/stripe/model/Balance.java +++ b/src/main/java/com/stripe/model/Balance.java @@ -105,7 +105,7 @@ public static Balance retrieve(RequestOptions options) throws StripeException { */ public static Balance retrieve(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/balance"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/balance"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Balance.class, options); } @@ -117,7 +117,7 @@ public static Balance retrieve(Map params, RequestOptions option */ public static Balance retrieve(BalanceRetrieveParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/balance"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/balance"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Balance.class, options); } diff --git a/src/main/java/com/stripe/model/BalanceTransaction.java b/src/main/java/com/stripe/model/BalanceTransaction.java index 13e13cb9206..063984fe50c 100644 --- a/src/main/java/com/stripe/model/BalanceTransaction.java +++ b/src/main/java/com/stripe/model/BalanceTransaction.java @@ -178,7 +178,7 @@ public static BalanceTransactionCollection list(Map params) */ public static BalanceTransactionCollection list( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/balance_transactions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/balance_transactions"); return ApiResource.requestCollection(url, params, BalanceTransactionCollection.class, options); } @@ -205,7 +205,7 @@ public static BalanceTransactionCollection list(BalanceTransactionListParams par */ public static BalanceTransactionCollection list( BalanceTransactionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/balance_transactions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/balance_transactions"); return ApiResource.requestCollection(url, params, BalanceTransactionCollection.class, options); } @@ -236,9 +236,9 @@ public static BalanceTransaction retrieve(String id, RequestOptions options) public static BalanceTransaction retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/balance_transactions/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, BalanceTransaction.class, options); @@ -253,9 +253,9 @@ public static BalanceTransaction retrieve( String id, BalanceTransactionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/balance_transactions/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, BalanceTransaction.class, options); diff --git a/src/main/java/com/stripe/model/BankAccount.java b/src/main/java/com/stripe/model/BankAccount.java index 116b4612309..26867e83bae 100644 --- a/src/main/java/com/stripe/model/BankAccount.java +++ b/src/main/java/com/stripe/model/BankAccount.java @@ -203,9 +203,9 @@ public BankAccount verify(Map params) throws StripeException { public BankAccount verify(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s/verify", ApiResource.urlEncodeId(this.getCustomer()), @@ -223,9 +223,9 @@ public BankAccount verify(BankAccountVerifyParams params) throws StripeException public BankAccount verify(BankAccountVerifyParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s/verify", ApiResource.urlEncodeId(this.getCustomer()), @@ -271,18 +271,18 @@ public BankAccount update(Map params, RequestOptions options) String url; if (this.getAccount() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/external_accounts/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); } else if (this.getCustomer() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -334,9 +334,9 @@ public BankAccount update(BankAccountUpdateOnAccountParams params, RequestOption String url; if (this.getAccount() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/external_accounts/%s", ApiResource.urlEncodeId(this.getAccount()), @@ -388,9 +388,9 @@ public BankAccount update(BankAccountUpdateOnCustomerParams params, RequestOptio String url; if (this.getCustomer() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -448,18 +448,18 @@ public BankAccount delete(Map params, RequestOptions options) String url; if (this.getAccount() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/external_accounts/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); } else if (this.getCustomer() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), diff --git a/src/main/java/com/stripe/model/Capability.java b/src/main/java/com/stripe/model/Capability.java index 07e162fc2f4..c366c138899 100644 --- a/src/main/java/com/stripe/model/Capability.java +++ b/src/main/java/com/stripe/model/Capability.java @@ -90,9 +90,9 @@ public Capability update(Map params) throws StripeException { public Capability update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/capabilities/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); @@ -109,9 +109,9 @@ public Capability update(CapabilityUpdateParams params) throws StripeException { public Capability update(CapabilityUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/capabilities/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/CapabilityCollection.java b/src/main/java/com/stripe/model/CapabilityCollection.java index 25d45966b2a..f54d40ad57d 100644 --- a/src/main/java/com/stripe/model/CapabilityCollection.java +++ b/src/main/java/com/stripe/model/CapabilityCollection.java @@ -24,7 +24,7 @@ public CapabilityCollection list(Map params) throws StripeExcept */ public CapabilityCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, CapabilityCollection.class, options); } @@ -42,7 +42,7 @@ public CapabilityCollection list(CapabilityCollectionListParams params) throws S */ public CapabilityCollection list(CapabilityCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, CapabilityCollection.class, options); } @@ -60,9 +60,9 @@ public Capability retrieve(String id, RequestOptions options) throws StripeExcep public Capability retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Capability.class, options); @@ -73,9 +73,9 @@ public Capability retrieve( String id, CapabilityCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Capability.class, options); diff --git a/src/main/java/com/stripe/model/Card.java b/src/main/java/com/stripe/model/Card.java index 72a92276fec..dd77345fb20 100644 --- a/src/main/java/com/stripe/model/Card.java +++ b/src/main/java/com/stripe/model/Card.java @@ -290,18 +290,18 @@ public Card update(Map params, RequestOptions options) throws St String url; if (this.getAccount() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/external_accounts/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); } else if (this.getCustomer() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -345,9 +345,9 @@ public Card update(CardUpdateOnAccountParams params, RequestOptions options) String url; if (this.getAccount() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/external_accounts/%s", ApiResource.urlEncodeId(this.getAccount()), @@ -391,9 +391,9 @@ public Card update(CardUpdateOnCustomerParams params, RequestOptions options) String url; if (this.getCustomer() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -450,18 +450,18 @@ public Card delete(Map params, RequestOptions options) throws St String url; if (this.getAccount() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/external_accounts/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); } else if (this.getCustomer() != null) { url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), diff --git a/src/main/java/com/stripe/model/CashBalance.java b/src/main/java/com/stripe/model/CashBalance.java index 164018a36e3..ccd9b4578f3 100644 --- a/src/main/java/com/stripe/model/CashBalance.java +++ b/src/main/java/com/stripe/model/CashBalance.java @@ -67,9 +67,9 @@ public static CashBalance retrieve(String customer, RequestOptions options) public static CashBalance retrieve( String customer, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s/cash_balance", ApiResource.urlEncodeId(customer))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CashBalance.class, options); @@ -80,9 +80,9 @@ public static CashBalance retrieve( String customer, CashBalanceRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s/cash_balance", ApiResource.urlEncodeId(customer))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CashBalance.class, options); @@ -97,9 +97,9 @@ public CashBalance update(Map params) throws StripeException { public CashBalance update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/cash_balance", ApiResource.urlEncodeId(this.getCustomer()))); return ApiResource.request( @@ -115,9 +115,9 @@ public CashBalance update(CashBalanceUpdateParams params) throws StripeException public CashBalance update(CashBalanceUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/cash_balance", ApiResource.urlEncodeId(this.getCustomer()))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/Charge.java b/src/main/java/com/stripe/model/Charge.java index b46a32cf310..4a01588c235 100644 --- a/src/main/java/com/stripe/model/Charge.java +++ b/src/main/java/com/stripe/model/Charge.java @@ -660,9 +660,9 @@ public Charge capture(Map params) throws StripeException { */ public Charge capture(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/charges/%s/capture", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Charge.class, options); } @@ -693,9 +693,9 @@ public Charge capture(ChargeCaptureParams params) throws StripeException { */ public Charge capture(ChargeCaptureParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/charges/%s/capture", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Charge.class, options); } @@ -718,7 +718,7 @@ public static Charge create(Map params) throws StripeException { */ public static Charge create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/charges"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/charges"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Charge.class, options); } @@ -740,7 +740,7 @@ public static Charge create(ChargeCreateParams params) throws StripeException { */ public static Charge create(ChargeCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/charges"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/charges"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Charge.class, options); } @@ -758,7 +758,7 @@ public static ChargeCollection list(Map params) throws StripeExc */ public static ChargeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/charges"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/charges"); return ApiResource.requestCollection(url, params, ChargeCollection.class, options); } @@ -776,7 +776,7 @@ public static ChargeCollection list(ChargeListParams params) throws StripeExcept */ public static ChargeCollection list(ChargeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/charges"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/charges"); return ApiResource.requestCollection(url, params, ChargeCollection.class, options); } @@ -806,9 +806,10 @@ public static Charge retrieve(String charge, RequestOptions options) throws Stri public static Charge retrieve(String charge, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/charges/%s", ApiResource.urlEncodeId(charge))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/charges/%s", ApiResource.urlEncodeId(charge))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Charge.class, options); } @@ -820,9 +821,10 @@ public static Charge retrieve(String charge, Map params, Request public static Charge retrieve(String charge, ChargeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/charges/%s", ApiResource.urlEncodeId(charge))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/charges/%s", ApiResource.urlEncodeId(charge))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Charge.class, options); } @@ -848,7 +850,7 @@ public static ChargeSearchResult search(Map params) throws Strip */ public static ChargeSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/charges/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/charges/search"); return ApiResource.requestSearchResult(url, params, ChargeSearchResult.class, options); } @@ -874,7 +876,7 @@ public static ChargeSearchResult search(ChargeSearchParams params) throws Stripe */ public static ChargeSearchResult search(ChargeSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/charges/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/charges/search"); return ApiResource.requestSearchResult(url, params, ChargeSearchResult.class, options); } @@ -894,9 +896,9 @@ public Charge update(Map params) throws StripeException { @Override public Charge update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/charges/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Charge.class, options); } @@ -915,9 +917,9 @@ public Charge update(ChargeUpdateParams params) throws StripeException { */ public Charge update(ChargeUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/charges/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Charge.class, options); } diff --git a/src/main/java/com/stripe/model/CountrySpec.java b/src/main/java/com/stripe/model/CountrySpec.java index 3d1ecccc290..eaa4ad157b1 100644 --- a/src/main/java/com/stripe/model/CountrySpec.java +++ b/src/main/java/com/stripe/model/CountrySpec.java @@ -77,7 +77,7 @@ public static CountrySpecCollection list(Map params) throws Stri /** Lists all Country Spec objects available in the API. */ public static CountrySpecCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/country_specs"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/country_specs"); return ApiResource.requestCollection(url, params, CountrySpecCollection.class, options); } @@ -89,7 +89,7 @@ public static CountrySpecCollection list(CountrySpecListParams params) throws St /** Lists all Country Spec objects available in the API. */ public static CountrySpecCollection list(CountrySpecListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/country_specs"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/country_specs"); return ApiResource.requestCollection(url, params, CountrySpecCollection.class, options); } @@ -108,9 +108,9 @@ public static CountrySpec retrieve(String country, RequestOptions options) public static CountrySpec retrieve( String country, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/country_specs/%s", ApiResource.urlEncodeId(country))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CountrySpec.class, options); @@ -121,9 +121,9 @@ public static CountrySpec retrieve( String country, CountrySpecRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/country_specs/%s", ApiResource.urlEncodeId(country))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CountrySpec.class, options); diff --git a/src/main/java/com/stripe/model/Coupon.java b/src/main/java/com/stripe/model/Coupon.java index 605feebbbd8..858d472f628 100644 --- a/src/main/java/com/stripe/model/Coupon.java +++ b/src/main/java/com/stripe/model/Coupon.java @@ -171,7 +171,7 @@ public static Coupon create(Map params) throws StripeException { */ public static Coupon create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/coupons"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/coupons"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Coupon.class, options); } @@ -205,7 +205,7 @@ public static Coupon create(CouponCreateParams params) throws StripeException { */ public static Coupon create(CouponCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/coupons"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/coupons"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Coupon.class, options); } @@ -247,9 +247,9 @@ public Coupon delete(Map params) throws StripeException { */ public Coupon delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/coupons/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Coupon.class, options); @@ -263,7 +263,7 @@ public static CouponCollection list(Map params) throws StripeExc /** Returns a list of your coupons. */ public static CouponCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/coupons"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/coupons"); return ApiResource.requestCollection(url, params, CouponCollection.class, options); } @@ -275,7 +275,7 @@ public static CouponCollection list(CouponListParams params) throws StripeExcept /** Returns a list of your coupons. */ public static CouponCollection list(CouponListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/coupons"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/coupons"); return ApiResource.requestCollection(url, params, CouponCollection.class, options); } @@ -293,9 +293,10 @@ public static Coupon retrieve(String coupon, RequestOptions options) throws Stri public static Coupon retrieve(String coupon, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/coupons/%s", ApiResource.urlEncodeId(coupon))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/coupons/%s", ApiResource.urlEncodeId(coupon))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Coupon.class, options); } @@ -303,9 +304,10 @@ public static Coupon retrieve(String coupon, Map params, Request public static Coupon retrieve(String coupon, CouponRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/coupons/%s", ApiResource.urlEncodeId(coupon))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/coupons/%s", ApiResource.urlEncodeId(coupon))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Coupon.class, options); } @@ -325,9 +327,9 @@ public Coupon update(Map params) throws StripeException { @Override public Coupon update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/coupons/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Coupon.class, options); } @@ -346,9 +348,9 @@ public Coupon update(CouponUpdateParams params) throws StripeException { */ public Coupon update(CouponUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/coupons/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Coupon.class, options); } diff --git a/src/main/java/com/stripe/model/CreditNote.java b/src/main/java/com/stripe/model/CreditNote.java index c0d208b2d00..799b31d6e98 100644 --- a/src/main/java/com/stripe/model/CreditNote.java +++ b/src/main/java/com/stripe/model/CreditNote.java @@ -315,7 +315,7 @@ public static CreditNote create(Map params) throws StripeExcepti */ public static CreditNote create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/credit_notes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/credit_notes"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditNote.class, options); } @@ -372,7 +372,7 @@ public static CreditNote create(CreditNoteCreateParams params) throws StripeExce */ public static CreditNote create(CreditNoteCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/credit_notes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/credit_notes"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditNote.class, options); } @@ -385,7 +385,7 @@ public static CreditNoteCollection list(Map params) throws Strip /** Returns a list of credit notes. */ public static CreditNoteCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/credit_notes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/credit_notes"); return ApiResource.requestCollection(url, params, CreditNoteCollection.class, options); } @@ -397,7 +397,7 @@ public static CreditNoteCollection list(CreditNoteListParams params) throws Stri /** Returns a list of credit notes. */ public static CreditNoteCollection list(CreditNoteListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/credit_notes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/credit_notes"); return ApiResource.requestCollection(url, params, CreditNoteCollection.class, options); } @@ -409,7 +409,7 @@ public static CreditNote preview(Map params) throws StripeExcept /** Get a preview of a credit note without creating it. */ public static CreditNote preview(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/credit_notes/preview"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/credit_notes/preview"); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CreditNote.class, options); } @@ -422,7 +422,7 @@ public static CreditNote preview(CreditNotePreviewParams params) throws StripeEx /** Get a preview of a credit note without creating it. */ public static CreditNote preview(CreditNotePreviewParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/credit_notes/preview"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/credit_notes/preview"); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CreditNote.class, options); } @@ -441,9 +441,10 @@ public static CreditNote retrieve(String id, RequestOptions options) throws Stri public static CreditNote retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/credit_notes/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/credit_notes/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CreditNote.class, options); } @@ -452,9 +453,10 @@ public static CreditNote retrieve(String id, Map params, Request public static CreditNote retrieve( String id, CreditNoteRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/credit_notes/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/credit_notes/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CreditNote.class, options); } @@ -470,9 +472,9 @@ public CreditNote update(Map params) throws StripeException { public CreditNote update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/credit_notes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditNote.class, options); @@ -487,9 +489,9 @@ public CreditNote update(CreditNoteUpdateParams params) throws StripeException { public CreditNote update(CreditNoteUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/credit_notes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditNote.class, options); @@ -526,9 +528,9 @@ public CreditNote voidCreditNote(Map params) throws StripeExcept public CreditNote voidCreditNote(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/credit_notes/%s/void", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditNote.class, options); @@ -549,9 +551,9 @@ public CreditNote voidCreditNote(CreditNoteVoidCreditNoteParams params) throws S public CreditNote voidCreditNote(CreditNoteVoidCreditNoteParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/credit_notes/%s/void", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditNote.class, options); diff --git a/src/main/java/com/stripe/model/CreditNoteLineItemCollection.java b/src/main/java/com/stripe/model/CreditNoteLineItemCollection.java index 372d740e3ee..97cfe1ae7bf 100644 --- a/src/main/java/com/stripe/model/CreditNoteLineItemCollection.java +++ b/src/main/java/com/stripe/model/CreditNoteLineItemCollection.java @@ -25,7 +25,7 @@ public CreditNoteLineItemCollection list(Map params) throws Stri */ public CreditNoteLineItemCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, CreditNoteLineItemCollection.class, options); } @@ -47,7 +47,7 @@ public CreditNoteLineItemCollection list(CreditNoteLineItemCollectionListParams public CreditNoteLineItemCollection list( CreditNoteLineItemCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, CreditNoteLineItemCollection.class, options); } } diff --git a/src/main/java/com/stripe/model/Customer.java b/src/main/java/com/stripe/model/Customer.java index 825702f23f6..b69fa27cbfc 100644 --- a/src/main/java/com/stripe/model/Customer.java +++ b/src/main/java/com/stripe/model/Customer.java @@ -268,9 +268,9 @@ public CustomerBalanceTransactionCollection balanceTransactions(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/balance_transactions", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection( @@ -293,9 +293,9 @@ public CustomerBalanceTransactionCollection balanceTransactions( public CustomerBalanceTransactionCollection balanceTransactions( CustomerBalanceTransactionsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/balance_transactions", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection( @@ -310,7 +310,7 @@ public static Customer create(Map params) throws StripeException /** Creates a new customer object. */ public static Customer create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/customers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/customers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Customer.class, options); } @@ -323,7 +323,7 @@ public static Customer create(CustomerCreateParams params) throws StripeExceptio /** Creates a new customer object. */ public static Customer create(CustomerCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/customers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/customers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Customer.class, options); } @@ -348,9 +348,9 @@ public FundingInstructions createFundingInstructions(Map params) public FundingInstructions createFundingInstructions( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/funding_instructions", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -378,9 +378,9 @@ public FundingInstructions createFundingInstructions( CustomerCreateFundingInstructionsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/funding_instructions", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -418,9 +418,9 @@ public Customer delete(Map params) throws StripeException { public Customer delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Customer.class, options); @@ -440,9 +440,9 @@ public Discount deleteDiscount(Map params) throws StripeExceptio public Discount deleteDiscount(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s/discount", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Discount.class, options); @@ -462,7 +462,7 @@ public static CustomerCollection list(Map params) throws StripeE */ public static CustomerCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/customers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/customers"); return ApiResource.requestCollection(url, params, CustomerCollection.class, options); } @@ -480,7 +480,7 @@ public static CustomerCollection list(CustomerListParams params) throws StripeEx */ public static CustomerCollection list(CustomerListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/customers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/customers"); return ApiResource.requestCollection(url, params, CustomerCollection.class, options); } @@ -499,9 +499,9 @@ public PaymentMethodCollection listPaymentMethods(Map params) public PaymentMethodCollection listPaymentMethods( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/payment_methods", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, PaymentMethodCollection.class, options); @@ -517,9 +517,9 @@ public PaymentMethodCollection listPaymentMethods(CustomerListPaymentMethodsPara public PaymentMethodCollection listPaymentMethods( CustomerListPaymentMethodsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/payment_methods", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, PaymentMethodCollection.class, options); @@ -539,9 +539,9 @@ public static Customer retrieve(String customer, RequestOptions options) throws public static Customer retrieve( String customer, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s", ApiResource.urlEncodeId(customer))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Customer.class, options); } @@ -551,9 +551,9 @@ public static Customer retrieve( String customer, CustomerRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s", ApiResource.urlEncodeId(customer))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Customer.class, options); } @@ -562,9 +562,9 @@ public static Customer retrieve( public PaymentMethod retrievePaymentMethod( String customer, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/payment_methods/%s", ApiResource.urlEncodeId(customer), ApiResource.urlEncodeId(this.getId()))); @@ -577,9 +577,9 @@ public PaymentMethod retrievePaymentMethod( String customer, CustomerRetrievePaymentMethodParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/payment_methods/%s", ApiResource.urlEncodeId(customer), ApiResource.urlEncodeId(this.getId()))); @@ -609,7 +609,7 @@ public static CustomerSearchResult search(Map params) throws Str */ public static CustomerSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/customers/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/customers/search"); return ApiResource.requestSearchResult(url, params, CustomerSearchResult.class, options); } @@ -635,7 +635,7 @@ public static CustomerSearchResult search(CustomerSearchParams params) throws St */ public static CustomerSearchResult search(CustomerSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/customers/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/customers/search"); return ApiResource.requestSearchResult(url, params, CustomerSearchResult.class, options); } @@ -676,9 +676,9 @@ public Customer update(Map params) throws StripeException { public Customer update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Customer.class, options); @@ -719,9 +719,9 @@ public Customer update(CustomerUpdateParams params) throws StripeException { public Customer update(CustomerUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/customers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Customer.class, options); @@ -860,9 +860,9 @@ public CustomerCashBalanceTransaction fundCashBalance(Map params public CustomerCashBalanceTransaction fundCashBalance( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/customers/%s/fund_cash_balance", ApiResource.urlEncodeId(this.resource.getId()))); @@ -884,9 +884,9 @@ public CustomerCashBalanceTransaction fundCashBalance(CustomerFundCashBalancePar public CustomerCashBalanceTransaction fundCashBalance( CustomerFundCashBalanceParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/customers/%s/fund_cash_balance", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/CustomerBalanceTransaction.java b/src/main/java/com/stripe/model/CustomerBalanceTransaction.java index b3aae1bd247..2d99b90ae5b 100644 --- a/src/main/java/com/stripe/model/CustomerBalanceTransaction.java +++ b/src/main/java/com/stripe/model/CustomerBalanceTransaction.java @@ -191,9 +191,9 @@ public CustomerBalanceTransaction update(Map params) throws Stri public CustomerBalanceTransaction update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/balance_transactions/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -219,9 +219,9 @@ public CustomerBalanceTransaction update( CustomerBalanceTransactionUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/balance_transactions/%s", ApiResource.urlEncodeId(this.getCustomer()), diff --git a/src/main/java/com/stripe/model/CustomerBalanceTransactionCollection.java b/src/main/java/com/stripe/model/CustomerBalanceTransactionCollection.java index 63c3b69b587..2f479863cc4 100644 --- a/src/main/java/com/stripe/model/CustomerBalanceTransactionCollection.java +++ b/src/main/java/com/stripe/model/CustomerBalanceTransactionCollection.java @@ -26,7 +26,7 @@ public CustomerBalanceTransaction create(Map params) throws Stri */ public CustomerBalanceTransaction create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CustomerBalanceTransaction.class, options); } @@ -47,7 +47,7 @@ public CustomerBalanceTransaction create(CustomerBalanceTransactionCollectionCre public CustomerBalanceTransaction create( CustomerBalanceTransactionCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CustomerBalanceTransaction.class, options); } @@ -67,7 +67,7 @@ public CustomerBalanceTransactionCollection list(Map params) */ public CustomerBalanceTransactionCollection list( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection( url, params, CustomerBalanceTransactionCollection.class, options); } @@ -88,7 +88,7 @@ public CustomerBalanceTransactionCollection list( public CustomerBalanceTransactionCollection list( CustomerBalanceTransactionCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection( url, params, CustomerBalanceTransactionCollection.class, options); } @@ -117,9 +117,9 @@ public CustomerBalanceTransaction retrieve(String id, RequestOptions options) public CustomerBalanceTransaction retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CustomerBalanceTransaction.class, options); @@ -133,9 +133,9 @@ public CustomerBalanceTransaction retrieve( String id, CustomerBalanceTransactionCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CustomerBalanceTransaction.class, options); diff --git a/src/main/java/com/stripe/model/CustomerCashBalanceTransactionCollection.java b/src/main/java/com/stripe/model/CustomerCashBalanceTransactionCollection.java index e54e03ba8d9..5cbb514bde7 100644 --- a/src/main/java/com/stripe/model/CustomerCashBalanceTransactionCollection.java +++ b/src/main/java/com/stripe/model/CustomerCashBalanceTransactionCollection.java @@ -26,7 +26,7 @@ public CustomerCashBalanceTransactionCollection list(Map params) */ public CustomerCashBalanceTransactionCollection list( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection( url, params, CustomerCashBalanceTransactionCollection.class, options); } @@ -47,7 +47,7 @@ public CustomerCashBalanceTransactionCollection list( public CustomerCashBalanceTransactionCollection list( CustomerCashBalanceTransactionCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection( url, params, CustomerCashBalanceTransactionCollection.class, options); } @@ -76,9 +76,9 @@ public CustomerCashBalanceTransaction retrieve(String id, RequestOptions options public CustomerCashBalanceTransaction retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CustomerCashBalanceTransaction.class, options); @@ -94,9 +94,9 @@ public CustomerCashBalanceTransaction retrieve( RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, CustomerCashBalanceTransaction.class, options); diff --git a/src/main/java/com/stripe/model/Dispute.java b/src/main/java/com/stripe/model/Dispute.java index b61ea7bc863..cb91de43cb2 100644 --- a/src/main/java/com/stripe/model/Dispute.java +++ b/src/main/java/com/stripe/model/Dispute.java @@ -215,9 +215,9 @@ public Dispute close(Map params) throws StripeException { */ public Dispute close(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/disputes/%s/close", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -242,9 +242,9 @@ public Dispute close(DisputeCloseParams params) throws StripeException { */ public Dispute close(DisputeCloseParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/disputes/%s/close", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -257,7 +257,7 @@ public static DisputeCollection list(Map params) throws StripeEx /** Returns a list of your disputes. */ public static DisputeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/disputes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/disputes"); return ApiResource.requestCollection(url, params, DisputeCollection.class, options); } @@ -269,7 +269,7 @@ public static DisputeCollection list(DisputeListParams params) throws StripeExce /** Returns a list of your disputes. */ public static DisputeCollection list(DisputeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/disputes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/disputes"); return ApiResource.requestCollection(url, params, DisputeCollection.class, options); } @@ -287,9 +287,9 @@ public static Dispute retrieve(String dispute, RequestOptions options) throws St public static Dispute retrieve(String dispute, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/disputes/%s", ApiResource.urlEncodeId(dispute))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Dispute.class, options); } @@ -298,9 +298,9 @@ public static Dispute retrieve(String dispute, Map params, Reque public static Dispute retrieve( String dispute, DisputeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/disputes/%s", ApiResource.urlEncodeId(dispute))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Dispute.class, options); } @@ -333,9 +333,9 @@ public Dispute update(Map params) throws StripeException { @Override public Dispute update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/disputes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -366,9 +366,9 @@ public Dispute update(DisputeUpdateParams params) throws StripeException { */ public Dispute update(DisputeUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/disputes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } diff --git a/src/main/java/com/stripe/model/EphemeralKey.java b/src/main/java/com/stripe/model/EphemeralKey.java index c133347c7cc..8700b5917fa 100644 --- a/src/main/java/com/stripe/model/EphemeralKey.java +++ b/src/main/java/com/stripe/model/EphemeralKey.java @@ -80,9 +80,9 @@ public EphemeralKey delete(Map params) throws StripeException { public EphemeralKey delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/ephemeral_keys/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, EphemeralKey.class, options); @@ -97,9 +97,9 @@ public EphemeralKey delete(EphemeralKeyDeleteParams params) throws StripeExcepti public EphemeralKey delete(EphemeralKeyDeleteParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/ephemeral_keys/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, EphemeralKey.class, options); @@ -134,7 +134,7 @@ public static EphemeralKey create(Map params, RequestOptions opt // request body. final Map overriddenParams = new java.util.HashMap(params); overriddenParams.remove("stripe-version"); - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/ephemeral_keys"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), overriddenOptions, "/v1/ephemeral_keys"); return ApiResource.request( ApiResource.RequestMethod.POST, url, diff --git a/src/main/java/com/stripe/model/Event.java b/src/main/java/com/stripe/model/Event.java index e096d8ecd23..1fbbc803f0b 100644 --- a/src/main/java/com/stripe/model/Event.java +++ b/src/main/java/com/stripe/model/Event.java @@ -120,7 +120,7 @@ public static EventCollection list(Map params) throws StripeExce */ public static EventCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/events"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/events"); return ApiResource.requestCollection(url, params, EventCollection.class, options); } @@ -144,7 +144,7 @@ public static EventCollection list(EventListParams params) throws StripeExceptio */ public static EventCollection list(EventListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/events"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/events"); return ApiResource.requestCollection(url, params, EventCollection.class, options); } @@ -171,9 +171,10 @@ public static Event retrieve(String id, RequestOptions options) throws StripeExc public static Event retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/events/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/events/%s", ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Event.class, options); } @@ -184,9 +185,10 @@ public static Event retrieve(String id, Map params, RequestOptio public static Event retrieve(String id, EventRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/events/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/events/%s", ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Event.class, options); } diff --git a/src/main/java/com/stripe/model/ExchangeRate.java b/src/main/java/com/stripe/model/ExchangeRate.java index 94a78dd2b72..b720fb68dc1 100644 --- a/src/main/java/com/stripe/model/ExchangeRate.java +++ b/src/main/java/com/stripe/model/ExchangeRate.java @@ -66,7 +66,7 @@ public static ExchangeRateCollection list(Map params) throws Str */ public static ExchangeRateCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/exchange_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/exchange_rates"); return ApiResource.requestCollection(url, params, ExchangeRateCollection.class, options); } @@ -84,7 +84,7 @@ public static ExchangeRateCollection list(ExchangeRateListParams params) throws */ public static ExchangeRateCollection list(ExchangeRateListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/exchange_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/exchange_rates"); return ApiResource.requestCollection(url, params, ExchangeRateCollection.class, options); } @@ -103,9 +103,9 @@ public static ExchangeRate retrieve(String rateId, RequestOptions options) public static ExchangeRate retrieve( String rateId, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/exchange_rates/%s", ApiResource.urlEncodeId(rateId))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ExchangeRate.class, options); @@ -116,9 +116,9 @@ public static ExchangeRate retrieve( String rateId, ExchangeRateRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/exchange_rates/%s", ApiResource.urlEncodeId(rateId))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ExchangeRate.class, options); diff --git a/src/main/java/com/stripe/model/ExternalAccountCollection.java b/src/main/java/com/stripe/model/ExternalAccountCollection.java index 7369625969e..9e581fe0abd 100644 --- a/src/main/java/com/stripe/model/ExternalAccountCollection.java +++ b/src/main/java/com/stripe/model/ExternalAccountCollection.java @@ -19,7 +19,7 @@ public ExternalAccount create(Map params) throws StripeException /** Create an external account for a given account. */ public ExternalAccount create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ExternalAccount.class, options); } @@ -33,7 +33,7 @@ public ExternalAccount create(ExternalAccountCollectionCreateParams params) /** Create an external account for a given account. */ public ExternalAccount create( ExternalAccountCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ExternalAccount.class, options); } @@ -46,7 +46,7 @@ public ExternalAccountCollection list(Map params) throws StripeE /** List external accounts for an account. */ public ExternalAccountCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, ExternalAccountCollection.class, options); } @@ -59,7 +59,7 @@ public ExternalAccountCollection list(ExternalAccountCollectionListParams params /** List external accounts for an account. */ public ExternalAccountCollection list( ExternalAccountCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, ExternalAccountCollection.class, options); } @@ -77,9 +77,9 @@ public ExternalAccount retrieve(String id, RequestOptions options) throws Stripe public ExternalAccount retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ExternalAccount.class, options); @@ -90,9 +90,9 @@ public ExternalAccount retrieve( String id, ExternalAccountCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ExternalAccount.class, options); diff --git a/src/main/java/com/stripe/model/FeeRefund.java b/src/main/java/com/stripe/model/FeeRefund.java index a750ce8c92c..1c24cb99488 100644 --- a/src/main/java/com/stripe/model/FeeRefund.java +++ b/src/main/java/com/stripe/model/FeeRefund.java @@ -133,9 +133,9 @@ public FeeRefund update(Map params) throws StripeException { public FeeRefund update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/application_fees/%s/refunds/%s", ApiResource.urlEncodeId(this.getFee()), ApiResource.urlEncodeId(this.getId()))); @@ -162,9 +162,9 @@ public FeeRefund update(FeeRefundUpdateParams params) throws StripeException { public FeeRefund update(FeeRefundUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/application_fees/%s/refunds/%s", ApiResource.urlEncodeId(this.getFee()), ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/FeeRefundCollection.java b/src/main/java/com/stripe/model/FeeRefundCollection.java index 998d99a89f8..0fba0c97958 100644 --- a/src/main/java/com/stripe/model/FeeRefundCollection.java +++ b/src/main/java/com/stripe/model/FeeRefundCollection.java @@ -39,7 +39,7 @@ public FeeRefund create(Map params) throws StripeException { */ public FeeRefund create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FeeRefund.class, options); } @@ -72,7 +72,7 @@ public FeeRefund create(FeeRefundCollectionCreateParams params) throws StripeExc */ public FeeRefund create(FeeRefundCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FeeRefund.class, options); } @@ -95,7 +95,7 @@ public FeeRefundCollection list(Map params) throws StripeExcepti */ public FeeRefundCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, FeeRefundCollection.class, options); } @@ -117,7 +117,7 @@ public FeeRefundCollection list(FeeRefundCollectionListParams params) throws Str */ public FeeRefundCollection list(FeeRefundCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, FeeRefundCollection.class, options); } @@ -147,9 +147,9 @@ public FeeRefund retrieve(String id, RequestOptions options) throws StripeExcept public FeeRefund retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, FeeRefund.class, options); @@ -164,9 +164,9 @@ public FeeRefund retrieve( String id, FeeRefundCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, FeeRefund.class, options); diff --git a/src/main/java/com/stripe/model/FileLink.java b/src/main/java/com/stripe/model/FileLink.java index 249c79803f8..f546022b4ff 100644 --- a/src/main/java/com/stripe/model/FileLink.java +++ b/src/main/java/com/stripe/model/FileLink.java @@ -101,7 +101,7 @@ public static FileLink create(Map params) throws StripeException /** Creates a new file link object. */ public static FileLink create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/file_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/file_links"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FileLink.class, options); } @@ -114,7 +114,7 @@ public static FileLink create(FileLinkCreateParams params) throws StripeExceptio /** Creates a new file link object. */ public static FileLink create(FileLinkCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/file_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/file_links"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FileLink.class, options); } @@ -127,7 +127,7 @@ public static FileLinkCollection list(Map params) throws StripeE /** Returns a list of file links. */ public static FileLinkCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/file_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/file_links"); return ApiResource.requestCollection(url, params, FileLinkCollection.class, options); } @@ -139,7 +139,7 @@ public static FileLinkCollection list(FileLinkListParams params) throws StripeEx /** Returns a list of file links. */ public static FileLinkCollection list(FileLinkListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/file_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/file_links"); return ApiResource.requestCollection(url, params, FileLinkCollection.class, options); } @@ -157,9 +157,10 @@ public static FileLink retrieve(String link, RequestOptions options) throws Stri public static FileLink retrieve(String link, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/file_links/%s", ApiResource.urlEncodeId(link))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/file_links/%s", ApiResource.urlEncodeId(link))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, FileLink.class, options); } @@ -167,9 +168,10 @@ public static FileLink retrieve(String link, Map params, Request public static FileLink retrieve( String link, FileLinkRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/file_links/%s", ApiResource.urlEncodeId(link))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/file_links/%s", ApiResource.urlEncodeId(link))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, FileLink.class, options); } @@ -184,9 +186,9 @@ public FileLink update(Map params) throws StripeException { public FileLink update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/file_links/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FileLink.class, options); @@ -201,9 +203,9 @@ public FileLink update(FileLinkUpdateParams params) throws StripeException { public FileLink update(FileLinkUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/file_links/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FileLink.class, options); diff --git a/src/main/java/com/stripe/model/Invoice.java b/src/main/java/com/stripe/model/Invoice.java index 1e59552dcae..dee18369ee8 100644 --- a/src/main/java/com/stripe/model/Invoice.java +++ b/src/main/java/com/stripe/model/Invoice.java @@ -877,7 +877,7 @@ public static Invoice create(Map params) throws StripeException */ public static Invoice create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -899,7 +899,7 @@ public static Invoice create(InvoiceCreateParams params) throws StripeException */ public static Invoice create(InvoiceCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -941,9 +941,9 @@ public Invoice delete(Map params) throws StripeException { */ public Invoice delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Invoice.class, options); @@ -980,9 +980,9 @@ public Invoice finalizeInvoice(Map params) throws StripeExceptio public Invoice finalizeInvoice(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/finalize", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1002,9 +1002,9 @@ public Invoice finalizeInvoice(InvoiceFinalizeInvoiceParams params) throws Strip public Invoice finalizeInvoice(InvoiceFinalizeInvoiceParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/finalize", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1023,7 +1023,7 @@ public static InvoiceCollection list(Map params) throws StripeEx */ public static InvoiceCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices"); return ApiResource.requestCollection(url, params, InvoiceCollection.class, options); } @@ -1041,7 +1041,7 @@ public static InvoiceCollection list(InvoiceListParams params) throws StripeExce */ public static InvoiceCollection list(InvoiceListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices"); return ApiResource.requestCollection(url, params, InvoiceCollection.class, options); } @@ -1076,9 +1076,9 @@ public Invoice markUncollectible(Map params) throws StripeExcept public Invoice markUncollectible(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/invoices/%s/mark_uncollectible", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); @@ -1099,9 +1099,9 @@ public Invoice markUncollectible(InvoiceMarkUncollectibleParams params) throws S public Invoice markUncollectible(InvoiceMarkUncollectibleParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/invoices/%s/mark_uncollectible", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); @@ -1149,9 +1149,9 @@ public Invoice pay(Map params) throws StripeException { */ public Invoice pay(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/pay", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1176,9 +1176,9 @@ public Invoice pay(InvoicePayParams params) throws StripeException { */ public Invoice pay(InvoicePayParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/pay", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1197,9 +1197,9 @@ public static Invoice retrieve(String invoice, RequestOptions options) throws St public static Invoice retrieve(String invoice, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s", ApiResource.urlEncodeId(invoice))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Invoice.class, options); } @@ -1208,9 +1208,9 @@ public static Invoice retrieve(String invoice, Map params, Reque public static Invoice retrieve( String invoice, InvoiceRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s", ApiResource.urlEncodeId(invoice))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Invoice.class, options); } @@ -1237,7 +1237,7 @@ public static InvoiceSearchResult search(Map params) throws Stri */ public static InvoiceSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices/search"); return ApiResource.requestSearchResult(url, params, InvoiceSearchResult.class, options); } @@ -1263,7 +1263,7 @@ public static InvoiceSearchResult search(InvoiceSearchParams params) throws Stri */ public static InvoiceSearchResult search(InvoiceSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices/search"); return ApiResource.requestSearchResult(url, params, InvoiceSearchResult.class, options); } @@ -1322,9 +1322,9 @@ public Invoice sendInvoice(Map params) throws StripeException { public Invoice sendInvoice(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/send", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1356,9 +1356,9 @@ public Invoice sendInvoice(InvoiceSendInvoiceParams params) throws StripeExcepti public Invoice sendInvoice(InvoiceSendInvoiceParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/send", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1433,7 +1433,7 @@ public static Invoice upcoming(Map params) throws StripeExceptio */ public static Invoice upcoming(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices/upcoming"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices/upcoming"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Invoice.class, options); } @@ -1483,7 +1483,7 @@ public static Invoice upcoming(InvoiceUpcomingParams params) throws StripeExcept */ public static Invoice upcoming(InvoiceUpcomingParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices/upcoming"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices/upcoming"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Invoice.class, options); } @@ -1513,7 +1513,7 @@ public static InvoiceLineItemCollection upcomingLines(Map params */ public static InvoiceLineItemCollection upcomingLines( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices/upcoming/lines"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices/upcoming/lines"); return ApiResource.requestCollection(url, params, InvoiceLineItemCollection.class, options); } @@ -1534,7 +1534,7 @@ public static InvoiceLineItemCollection upcomingLines(InvoiceUpcomingLinesParams */ public static InvoiceLineItemCollection upcomingLines( InvoiceUpcomingLinesParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoices/upcoming/lines"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoices/upcoming/lines"); return ApiResource.requestCollection(url, params, InvoiceLineItemCollection.class, options); } @@ -1566,9 +1566,9 @@ public Invoice update(Map params) throws StripeException { @Override public Invoice update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1599,9 +1599,9 @@ public Invoice update(InvoiceUpdateParams params) throws StripeException { */ public Invoice update(InvoiceUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1641,9 +1641,9 @@ public Invoice voidInvoice(Map params) throws StripeException { public Invoice voidInvoice(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/void", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } @@ -1665,9 +1665,9 @@ public Invoice voidInvoice(InvoiceVoidInvoiceParams params) throws StripeExcepti public Invoice voidInvoice(InvoiceVoidInvoiceParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoices/%s/void", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Invoice.class, options); } diff --git a/src/main/java/com/stripe/model/InvoiceItem.java b/src/main/java/com/stripe/model/InvoiceItem.java index 943a6c0ef2f..27c7c1baa19 100644 --- a/src/main/java/com/stripe/model/InvoiceItem.java +++ b/src/main/java/com/stripe/model/InvoiceItem.java @@ -298,7 +298,7 @@ public static InvoiceItem create(Map params) throws StripeExcept */ public static InvoiceItem create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoiceitems"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoiceitems"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, InvoiceItem.class, options); } @@ -317,7 +317,7 @@ public static InvoiceItem create(InvoiceItemCreateParams params) throws StripeEx */ public static InvoiceItem create(InvoiceItemCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoiceitems"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoiceitems"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, InvoiceItem.class, options); } @@ -353,9 +353,9 @@ public InvoiceItem delete(Map params) throws StripeException { public InvoiceItem delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoiceitems/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, InvoiceItem.class, options); @@ -375,7 +375,7 @@ public static InvoiceItemCollection list(Map params) throws Stri */ public static InvoiceItemCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoiceitems"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoiceitems"); return ApiResource.requestCollection(url, params, InvoiceItemCollection.class, options); } @@ -393,7 +393,7 @@ public static InvoiceItemCollection list(InvoiceItemListParams params) throws St */ public static InvoiceItemCollection list(InvoiceItemListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/invoiceitems"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/invoiceitems"); return ApiResource.requestCollection(url, params, InvoiceItemCollection.class, options); } @@ -413,9 +413,9 @@ public static InvoiceItem retrieve( String invoiceitem, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoiceitems/%s", ApiResource.urlEncodeId(invoiceitem))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, InvoiceItem.class, options); @@ -426,9 +426,9 @@ public static InvoiceItem retrieve( String invoiceitem, InvoiceItemRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoiceitems/%s", ApiResource.urlEncodeId(invoiceitem))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, InvoiceItem.class, options); @@ -451,9 +451,9 @@ public InvoiceItem update(Map params) throws StripeException { public InvoiceItem update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoiceitems/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, InvoiceItem.class, options); @@ -474,9 +474,9 @@ public InvoiceItem update(InvoiceItemUpdateParams params) throws StripeException public InvoiceItem update(InvoiceItemUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/invoiceitems/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, InvoiceItem.class, options); diff --git a/src/main/java/com/stripe/model/InvoiceLineItemCollection.java b/src/main/java/com/stripe/model/InvoiceLineItemCollection.java index 2a0489096d6..111d8fe7e2a 100644 --- a/src/main/java/com/stripe/model/InvoiceLineItemCollection.java +++ b/src/main/java/com/stripe/model/InvoiceLineItemCollection.java @@ -25,7 +25,7 @@ public InvoiceLineItemCollection list(Map params) throws StripeE */ public InvoiceLineItemCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, InvoiceLineItemCollection.class, options); } @@ -46,7 +46,7 @@ public InvoiceLineItemCollection list(InvoiceLineItemCollectionListParams params */ public InvoiceLineItemCollection list( InvoiceLineItemCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, InvoiceLineItemCollection.class, options); } } diff --git a/src/main/java/com/stripe/model/LoginLink.java b/src/main/java/com/stripe/model/LoginLink.java index 826fe2d69fd..5676aa187b4 100644 --- a/src/main/java/com/stripe/model/LoginLink.java +++ b/src/main/java/com/stripe/model/LoginLink.java @@ -42,9 +42,9 @@ public class LoginLink extends ApiResource { public static LoginLink createOnAccount( String account, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/login_links", ApiResource.urlEncodeId(account))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, LoginLink.class, options); @@ -61,9 +61,9 @@ public static LoginLink createOnAccount( String account, LoginLinkCreateOnAccountParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/accounts/%s/login_links", ApiResource.urlEncodeId(account))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, LoginLink.class, options); diff --git a/src/main/java/com/stripe/model/Mandate.java b/src/main/java/com/stripe/model/Mandate.java index fd77cf54010..f61edb33766 100644 --- a/src/main/java/com/stripe/model/Mandate.java +++ b/src/main/java/com/stripe/model/Mandate.java @@ -107,9 +107,9 @@ public static Mandate retrieve(String mandate, RequestOptions options) throws St public static Mandate retrieve(String mandate, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/mandates/%s", ApiResource.urlEncodeId(mandate))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Mandate.class, options); } @@ -118,9 +118,9 @@ public static Mandate retrieve(String mandate, Map params, Reque public static Mandate retrieve( String mandate, MandateRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/mandates/%s", ApiResource.urlEncodeId(mandate))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Mandate.class, options); } diff --git a/src/main/java/com/stripe/model/PaymentIntent.java b/src/main/java/com/stripe/model/PaymentIntent.java index 333f15d43c8..74636267701 100644 --- a/src/main/java/com/stripe/model/PaymentIntent.java +++ b/src/main/java/com/stripe/model/PaymentIntent.java @@ -495,9 +495,9 @@ public PaymentIntent applyCustomerBalance(Map params) throws Str public PaymentIntent applyCustomerBalance(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_intents/%s/apply_customer_balance", ApiResource.urlEncodeId(this.getId()))); @@ -516,9 +516,9 @@ public PaymentIntent applyCustomerBalance( PaymentIntentApplyCustomerBalanceParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_intents/%s/apply_customer_balance", ApiResource.urlEncodeId(this.getId()))); @@ -601,9 +601,9 @@ public PaymentIntent cancel(Map params) throws StripeException { public PaymentIntent cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -646,9 +646,9 @@ public PaymentIntent cancel(PaymentIntentCancelParams params) throws StripeExcep public PaymentIntent cancel(PaymentIntentCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -709,9 +709,9 @@ public PaymentIntent capture(Map params) throws StripeException public PaymentIntent capture(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s/capture", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -744,9 +744,9 @@ public PaymentIntent capture(PaymentIntentCaptureParams params) throws StripeExc public PaymentIntent capture(PaymentIntentCaptureParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s/capture", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -855,9 +855,9 @@ public PaymentIntent confirm(Map params) throws StripeException public PaymentIntent confirm(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s/confirm", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -914,9 +914,9 @@ public PaymentIntent confirm(PaymentIntentConfirmParams params) throws StripeExc public PaymentIntent confirm(PaymentIntentConfirmParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s/confirm", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -954,7 +954,7 @@ public static PaymentIntent create(Map params) throws StripeExce */ public static PaymentIntent create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_intents"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); } @@ -991,7 +991,7 @@ public static PaymentIntent create(PaymentIntentCreateParams params) throws Stri */ public static PaymentIntent create(PaymentIntentCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_intents"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); } @@ -1057,9 +1057,9 @@ public PaymentIntent incrementAuthorization(Map params) throws S public PaymentIntent incrementAuthorization(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_intents/%s/increment_authorization", ApiResource.urlEncodeId(this.getId()))); @@ -1130,9 +1130,9 @@ public PaymentIntent incrementAuthorization( PaymentIntentIncrementAuthorizationParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_intents/%s/increment_authorization", ApiResource.urlEncodeId(this.getId()))); @@ -1148,7 +1148,7 @@ public static PaymentIntentCollection list(Map params) throws St /** Returns a list of PaymentIntents. */ public static PaymentIntentCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_intents"); return ApiResource.requestCollection(url, params, PaymentIntentCollection.class, options); } @@ -1161,7 +1161,7 @@ public static PaymentIntentCollection list(PaymentIntentListParams params) /** Returns a list of PaymentIntents. */ public static PaymentIntentCollection list(PaymentIntentListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_intents"); return ApiResource.requestCollection(url, params, PaymentIntentCollection.class, options); } @@ -1207,9 +1207,9 @@ public static PaymentIntent retrieve(String intent, RequestOptions options) public static PaymentIntent retrieve( String intent, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s", ApiResource.urlEncodeId(intent))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentIntent.class, options); @@ -1229,9 +1229,9 @@ public static PaymentIntent retrieve( String intent, PaymentIntentRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s", ApiResource.urlEncodeId(intent))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentIntent.class, options); @@ -1260,7 +1260,7 @@ public static PaymentIntentSearchResult search(Map params) */ public static PaymentIntentSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_intents/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_intents/search"); return ApiResource.requestSearchResult(url, params, PaymentIntentSearchResult.class, options); } @@ -1287,7 +1287,7 @@ public static PaymentIntentSearchResult search(PaymentIntentSearchParams params) */ public static PaymentIntentSearchResult search( PaymentIntentSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_intents/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_intents/search"); return ApiResource.requestSearchResult(url, params, PaymentIntentSearchResult.class, options); } @@ -1318,9 +1318,9 @@ public PaymentIntent update(Map params) throws StripeException { public PaymentIntent update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -1351,9 +1351,9 @@ public PaymentIntent update(PaymentIntentUpdateParams params) throws StripeExcep public PaymentIntent update(PaymentIntentUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_intents/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentIntent.class, options); @@ -1378,9 +1378,9 @@ public PaymentIntent verifyMicrodeposits(Map params) throws Stri public PaymentIntent verifyMicrodeposits(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_intents/%s/verify_microdeposits", ApiResource.urlEncodeId(this.getId()))); @@ -1399,9 +1399,9 @@ public PaymentIntent verifyMicrodeposits( PaymentIntentVerifyMicrodepositsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_intents/%s/verify_microdeposits", ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/PaymentLink.java b/src/main/java/com/stripe/model/PaymentLink.java index dbbbddbeb3d..60ec11347d5 100644 --- a/src/main/java/com/stripe/model/PaymentLink.java +++ b/src/main/java/com/stripe/model/PaymentLink.java @@ -226,7 +226,7 @@ public static PaymentLink create(Map params) throws StripeExcept /** Creates a payment link. */ public static PaymentLink create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_links"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentLink.class, options); } @@ -239,7 +239,7 @@ public static PaymentLink create(PaymentLinkCreateParams params) throws StripeEx /** Creates a payment link. */ public static PaymentLink create(PaymentLinkCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_links"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentLink.class, options); } @@ -252,7 +252,7 @@ public static PaymentLinkCollection list(Map params) throws Stri /** Returns a list of your payment links. */ public static PaymentLinkCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_links"); return ApiResource.requestCollection(url, params, PaymentLinkCollection.class, options); } @@ -264,7 +264,7 @@ public static PaymentLinkCollection list(PaymentLinkListParams params) throws St /** Returns a list of your payment links. */ public static PaymentLinkCollection list(PaymentLinkListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_links"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_links"); return ApiResource.requestCollection(url, params, PaymentLinkCollection.class, options); } @@ -294,9 +294,9 @@ public LineItemCollection listLineItems(Map params) throws Strip public LineItemCollection listLineItems(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_links/%s/line_items", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, LineItemCollection.class, options); @@ -320,9 +320,9 @@ public LineItemCollection listLineItems(PaymentLinkListLineItemsParams params) public LineItemCollection listLineItems( PaymentLinkListLineItemsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/payment_links/%s/line_items", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, LineItemCollection.class, options); @@ -344,9 +344,9 @@ public static PaymentLink retrieve( String paymentLink, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_links/%s", ApiResource.urlEncodeId(paymentLink))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentLink.class, options); @@ -357,9 +357,9 @@ public static PaymentLink retrieve( String paymentLink, PaymentLinkRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_links/%s", ApiResource.urlEncodeId(paymentLink))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentLink.class, options); @@ -376,9 +376,9 @@ public PaymentLink update(Map params) throws StripeException { public PaymentLink update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_links/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentLink.class, options); @@ -393,9 +393,9 @@ public PaymentLink update(PaymentLinkUpdateParams params) throws StripeException public PaymentLink update(PaymentLinkUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_links/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentLink.class, options); diff --git a/src/main/java/com/stripe/model/PaymentMethod.java b/src/main/java/com/stripe/model/PaymentMethod.java index b9ff04e410c..7afd7399479 100644 --- a/src/main/java/com/stripe/model/PaymentMethod.java +++ b/src/main/java/com/stripe/model/PaymentMethod.java @@ -247,9 +247,9 @@ public PaymentMethod attach(Map params) throws StripeException { public PaymentMethod attach(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s/attach", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); @@ -298,9 +298,9 @@ public PaymentMethod attach(PaymentMethodAttachParams params) throws StripeExcep public PaymentMethod attach(PaymentMethodAttachParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s/attach", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); @@ -334,7 +334,7 @@ public static PaymentMethod create(Map params) throws StripeExce */ public static PaymentMethod create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_methods"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_methods"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); } @@ -367,7 +367,7 @@ public static PaymentMethod create(PaymentMethodCreateParams params) throws Stri */ public static PaymentMethod create(PaymentMethodCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_methods"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_methods"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); } @@ -403,9 +403,9 @@ public PaymentMethod detach(Map params) throws StripeException { public PaymentMethod detach(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s/detach", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); @@ -426,9 +426,9 @@ public PaymentMethod detach(PaymentMethodDetachParams params) throws StripeExcep public PaymentMethod detach(PaymentMethodDetachParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s/detach", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); @@ -452,7 +452,7 @@ public static PaymentMethodCollection list(Map params) throws St */ public static PaymentMethodCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_methods"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_methods"); return ApiResource.requestCollection(url, params, PaymentMethodCollection.class, options); } @@ -475,7 +475,7 @@ public static PaymentMethodCollection list(PaymentMethodListParams params) */ public static PaymentMethodCollection list(PaymentMethodListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payment_methods"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payment_methods"); return ApiResource.requestCollection(url, params, PaymentMethodCollection.class, options); } @@ -510,9 +510,9 @@ public static PaymentMethod retrieve( String paymentMethod, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s", ApiResource.urlEncodeId(paymentMethod))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentMethod.class, options); @@ -528,9 +528,9 @@ public static PaymentMethod retrieve( String paymentMethod, PaymentMethodRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s", ApiResource.urlEncodeId(paymentMethod))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentMethod.class, options); @@ -547,9 +547,9 @@ public PaymentMethod update(Map params) throws StripeException { public PaymentMethod update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); @@ -564,9 +564,9 @@ public PaymentMethod update(PaymentMethodUpdateParams params) throws StripeExcep public PaymentMethod update(PaymentMethodUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payment_methods/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentMethod.class, options); diff --git a/src/main/java/com/stripe/model/PaymentSourceCollection.java b/src/main/java/com/stripe/model/PaymentSourceCollection.java index 1a1d31d0e7d..eb53f2425ea 100644 --- a/src/main/java/com/stripe/model/PaymentSourceCollection.java +++ b/src/main/java/com/stripe/model/PaymentSourceCollection.java @@ -35,7 +35,7 @@ public PaymentSource create(Map params) throws StripeException { */ public PaymentSource create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentSource.class, options); } @@ -64,7 +64,7 @@ public PaymentSource create(PaymentSourceCollectionCreateParams params) throws S */ public PaymentSource create(PaymentSourceCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PaymentSource.class, options); } @@ -77,7 +77,7 @@ public PaymentSourceCollection list(Map params) throws StripeExc /** List sources for a specified customer. */ public PaymentSourceCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, PaymentSourceCollection.class, options); } @@ -90,7 +90,7 @@ public PaymentSourceCollection list(PaymentSourceCollectionListParams params) /** List sources for a specified customer. */ public PaymentSourceCollection list( PaymentSourceCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, PaymentSourceCollection.class, options); } @@ -108,9 +108,9 @@ public PaymentSource retrieve(String id, RequestOptions options) throws StripeEx public PaymentSource retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentSource.class, options); @@ -121,9 +121,9 @@ public PaymentSource retrieve( String id, PaymentSourceCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PaymentSource.class, options); diff --git a/src/main/java/com/stripe/model/Payout.java b/src/main/java/com/stripe/model/Payout.java index 5d921e61284..e962a07bec3 100644 --- a/src/main/java/com/stripe/model/Payout.java +++ b/src/main/java/com/stripe/model/Payout.java @@ -303,9 +303,9 @@ public Payout cancel(Map params) throws StripeException { */ public Payout cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payouts/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -324,9 +324,9 @@ public Payout cancel(PayoutCancelParams params) throws StripeException { */ public Payout cancel(PayoutCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payouts/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -363,7 +363,7 @@ public static Payout create(Map params) throws StripeException { */ public static Payout create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payouts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payouts"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -399,7 +399,7 @@ public static Payout create(PayoutCreateParams params) throws StripeException { */ public static Payout create(PayoutCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payouts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payouts"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -419,7 +419,7 @@ public static PayoutCollection list(Map params) throws StripeExc */ public static PayoutCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payouts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payouts"); return ApiResource.requestCollection(url, params, PayoutCollection.class, options); } @@ -439,7 +439,7 @@ public static PayoutCollection list(PayoutListParams params) throws StripeExcept */ public static PayoutCollection list(PayoutListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/payouts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/payouts"); return ApiResource.requestCollection(url, params, PayoutCollection.class, options); } @@ -469,9 +469,10 @@ public static Payout retrieve(String payout, RequestOptions options) throws Stri public static Payout retrieve(String payout, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/payouts/%s", ApiResource.urlEncodeId(payout))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/payouts/%s", ApiResource.urlEncodeId(payout))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Payout.class, options); } @@ -483,9 +484,10 @@ public static Payout retrieve(String payout, Map params, Request public static Payout retrieve(String payout, PayoutRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/payouts/%s", ApiResource.urlEncodeId(payout))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/payouts/%s", ApiResource.urlEncodeId(payout))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Payout.class, options); } @@ -539,9 +541,9 @@ public Payout reverse(Map params) throws StripeException { */ public Payout reverse(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payouts/%s/reverse", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -570,9 +572,9 @@ public Payout reverse(PayoutReverseParams params) throws StripeException { */ public Payout reverse(PayoutReverseParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payouts/%s/reverse", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -593,9 +595,9 @@ public Payout update(Map params) throws StripeException { @Override public Payout update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payouts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } @@ -614,9 +616,9 @@ public Payout update(PayoutUpdateParams params) throws StripeException { */ public Payout update(PayoutUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/payouts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Payout.class, options); } diff --git a/src/main/java/com/stripe/model/Person.java b/src/main/java/com/stripe/model/Person.java index ab89d964f26..70542fe8744 100644 --- a/src/main/java/com/stripe/model/Person.java +++ b/src/main/java/com/stripe/model/Person.java @@ -216,9 +216,9 @@ public Person delete(Map params) throws StripeException { */ public Person delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/persons/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); @@ -236,9 +236,9 @@ public Person update(Map params) throws StripeException { @Override public Person update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/persons/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); @@ -253,9 +253,9 @@ public Person update(PersonUpdateParams params) throws StripeException { /** Updates an existing person. */ public Person update(PersonUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/accounts/%s/persons/%s", ApiResource.urlEncodeId(this.getAccount()), ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/PersonCollection.java b/src/main/java/com/stripe/model/PersonCollection.java index fcd93242fe8..fe2404ab8e9 100644 --- a/src/main/java/com/stripe/model/PersonCollection.java +++ b/src/main/java/com/stripe/model/PersonCollection.java @@ -18,7 +18,7 @@ public Person create(Map params) throws StripeException { /** Creates a new person. */ public Person create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Person.class, options); } @@ -30,7 +30,7 @@ public Person create(PersonCollectionCreateParams params) throws StripeException /** Creates a new person. */ public Person create(PersonCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Person.class, options); } @@ -48,7 +48,7 @@ public PersonCollection list(Map params) throws StripeException */ public PersonCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, PersonCollection.class, options); } @@ -66,7 +66,7 @@ public PersonCollection list(PersonCollectionListParams params) throws StripeExc */ public PersonCollection list(PersonCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, PersonCollection.class, options); } @@ -84,9 +84,9 @@ public Person retrieve(String id, RequestOptions options) throws StripeException public Person retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Person.class, options); } @@ -95,9 +95,9 @@ public Person retrieve(String id, Map params, RequestOptions opt public Person retrieve(String id, PersonCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Person.class, options); } diff --git a/src/main/java/com/stripe/model/Plan.java b/src/main/java/com/stripe/model/Plan.java index 8647503b058..4a928d64c44 100644 --- a/src/main/java/com/stripe/model/Plan.java +++ b/src/main/java/com/stripe/model/Plan.java @@ -227,7 +227,7 @@ public static Plan create(Map params) throws StripeException { */ public static Plan create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/plans"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/plans"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Plan.class, options); } @@ -247,7 +247,7 @@ public static Plan create(PlanCreateParams params) throws StripeException { */ public static Plan create(PlanCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/plans"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/plans"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Plan.class, options); } @@ -269,9 +269,9 @@ public Plan delete(Map params) throws StripeException { /** Deleting plans means new subscribers can’t be added. Existing subscribers aren’t affected. */ public Plan delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/plans/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.DELETE, url, params, Plan.class, options); } @@ -284,7 +284,7 @@ public static PlanCollection list(Map params) throws StripeExcep /** Returns a list of your plans. */ public static PlanCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/plans"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/plans"); return ApiResource.requestCollection(url, params, PlanCollection.class, options); } @@ -296,7 +296,7 @@ public static PlanCollection list(PlanListParams params) throws StripeException /** Returns a list of your plans. */ public static PlanCollection list(PlanListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/plans"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/plans"); return ApiResource.requestCollection(url, params, PlanCollection.class, options); } @@ -314,9 +314,10 @@ public static Plan retrieve(String plan, RequestOptions options) throws StripeEx public static Plan retrieve(String plan, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/plans/%s", ApiResource.urlEncodeId(plan))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/plans/%s", ApiResource.urlEncodeId(plan))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Plan.class, options); } @@ -324,9 +325,10 @@ public static Plan retrieve(String plan, Map params, RequestOpti public static Plan retrieve(String plan, PlanRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/plans/%s", ApiResource.urlEncodeId(plan))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/plans/%s", ApiResource.urlEncodeId(plan))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Plan.class, options); } @@ -348,9 +350,9 @@ public Plan update(Map params) throws StripeException { @Override public Plan update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/plans/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Plan.class, options); } @@ -371,9 +373,9 @@ public Plan update(PlanUpdateParams params) throws StripeException { */ public Plan update(PlanUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/plans/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Plan.class, options); } diff --git a/src/main/java/com/stripe/model/Price.java b/src/main/java/com/stripe/model/Price.java index 92bfcc9f9d3..422d96941c1 100644 --- a/src/main/java/com/stripe/model/Price.java +++ b/src/main/java/com/stripe/model/Price.java @@ -215,7 +215,7 @@ public static Price create(Map params) throws StripeException { /** Creates a new price for an existing product. The price can be recurring or one-time. */ public static Price create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/prices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/prices"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Price.class, options); } @@ -227,7 +227,7 @@ public static Price create(PriceCreateParams params) throws StripeException { /** Creates a new price for an existing product. The price can be recurring or one-time. */ public static Price create(PriceCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/prices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/prices"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Price.class, options); } @@ -239,7 +239,7 @@ public static PriceCollection list(Map params) throws StripeExce /** Returns a list of your prices. */ public static PriceCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/prices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/prices"); return ApiResource.requestCollection(url, params, PriceCollection.class, options); } @@ -251,7 +251,7 @@ public static PriceCollection list(PriceListParams params) throws StripeExceptio /** Returns a list of your prices. */ public static PriceCollection list(PriceListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/prices"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/prices"); return ApiResource.requestCollection(url, params, PriceCollection.class, options); } @@ -269,9 +269,10 @@ public static Price retrieve(String price, RequestOptions options) throws Stripe public static Price retrieve(String price, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/prices/%s", ApiResource.urlEncodeId(price))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/prices/%s", ApiResource.urlEncodeId(price))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Price.class, options); } @@ -279,9 +280,10 @@ public static Price retrieve(String price, Map params, RequestOp public static Price retrieve(String price, PriceRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/prices/%s", ApiResource.urlEncodeId(price))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/prices/%s", ApiResource.urlEncodeId(price))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Price.class, options); } @@ -307,7 +309,7 @@ public static PriceSearchResult search(Map params) throws Stripe */ public static PriceSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/prices/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/prices/search"); return ApiResource.requestSearchResult(url, params, PriceSearchResult.class, options); } @@ -333,7 +335,7 @@ public static PriceSearchResult search(PriceSearchParams params) throws StripeEx */ public static PriceSearchResult search(PriceSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/prices/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/prices/search"); return ApiResource.requestSearchResult(url, params, PriceSearchResult.class, options); } @@ -353,9 +355,9 @@ public Price update(Map params) throws StripeException { @Override public Price update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/prices/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Price.class, options); } @@ -374,9 +376,9 @@ public Price update(PriceUpdateParams params) throws StripeException { */ public Price update(PriceUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/prices/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Price.class, options); } diff --git a/src/main/java/com/stripe/model/Product.java b/src/main/java/com/stripe/model/Product.java index bf67713f748..a7514820e15 100644 --- a/src/main/java/com/stripe/model/Product.java +++ b/src/main/java/com/stripe/model/Product.java @@ -215,7 +215,7 @@ public static Product create(Map params) throws StripeException /** Creates a new product object. */ public static Product create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/products"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/products"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Product.class, options); } @@ -227,7 +227,7 @@ public static Product create(ProductCreateParams params) throws StripeException /** Creates a new product object. */ public static Product create(ProductCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/products"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/products"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Product.class, options); } @@ -265,9 +265,9 @@ public Product delete(Map params) throws StripeException { */ public Product delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/products/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Product.class, options); @@ -287,7 +287,7 @@ public static ProductCollection list(Map params) throws StripeEx */ public static ProductCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/products"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/products"); return ApiResource.requestCollection(url, params, ProductCollection.class, options); } @@ -305,7 +305,7 @@ public static ProductCollection list(ProductListParams params) throws StripeExce */ public static ProductCollection list(ProductListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/products"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/products"); return ApiResource.requestCollection(url, params, ProductCollection.class, options); } @@ -335,9 +335,10 @@ public static Product retrieve(String id, RequestOptions options) throws StripeE public static Product retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/products/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/products/%s", ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Product.class, options); } @@ -349,9 +350,10 @@ public static Product retrieve(String id, Map params, RequestOpt public static Product retrieve(String id, ProductRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/products/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/products/%s", ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Product.class, options); } @@ -377,7 +379,7 @@ public static ProductSearchResult search(Map params) throws Stri */ public static ProductSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/products/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/products/search"); return ApiResource.requestSearchResult(url, params, ProductSearchResult.class, options); } @@ -403,7 +405,7 @@ public static ProductSearchResult search(ProductSearchParams params) throws Stri */ public static ProductSearchResult search(ProductSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/products/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/products/search"); return ApiResource.requestSearchResult(url, params, ProductSearchResult.class, options); } @@ -423,9 +425,9 @@ public Product update(Map params) throws StripeException { @Override public Product update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/products/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Product.class, options); } @@ -444,9 +446,9 @@ public Product update(ProductUpdateParams params) throws StripeException { */ public Product update(ProductUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/products/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Product.class, options); } diff --git a/src/main/java/com/stripe/model/PromotionCode.java b/src/main/java/com/stripe/model/PromotionCode.java index 3cdab300efa..298610c2b37 100644 --- a/src/main/java/com/stripe/model/PromotionCode.java +++ b/src/main/java/com/stripe/model/PromotionCode.java @@ -137,7 +137,7 @@ public static PromotionCode create(Map params) throws StripeExce */ public static PromotionCode create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/promotion_codes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/promotion_codes"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PromotionCode.class, options); } @@ -156,7 +156,7 @@ public static PromotionCode create(PromotionCodeCreateParams params) throws Stri */ public static PromotionCode create(PromotionCodeCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/promotion_codes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/promotion_codes"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PromotionCode.class, options); } @@ -169,7 +169,7 @@ public static PromotionCodeCollection list(Map params) throws St /** Returns a list of your promotion codes. */ public static PromotionCodeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/promotion_codes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/promotion_codes"); return ApiResource.requestCollection(url, params, PromotionCodeCollection.class, options); } @@ -182,7 +182,7 @@ public static PromotionCodeCollection list(PromotionCodeListParams params) /** Returns a list of your promotion codes. */ public static PromotionCodeCollection list(PromotionCodeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/promotion_codes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/promotion_codes"); return ApiResource.requestCollection(url, params, PromotionCodeCollection.class, options); } @@ -217,9 +217,9 @@ public static PromotionCode retrieve( String promotionCode, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/promotion_codes/%s", ApiResource.urlEncodeId(promotionCode))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PromotionCode.class, options); @@ -235,9 +235,9 @@ public static PromotionCode retrieve( String promotionCode, PromotionCodeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/promotion_codes/%s", ApiResource.urlEncodeId(promotionCode))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, PromotionCode.class, options); @@ -260,9 +260,9 @@ public PromotionCode update(Map params) throws StripeException { public PromotionCode update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/promotion_codes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PromotionCode.class, options); @@ -283,9 +283,9 @@ public PromotionCode update(PromotionCodeUpdateParams params) throws StripeExcep public PromotionCode update(PromotionCodeUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/promotion_codes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, PromotionCode.class, options); diff --git a/src/main/java/com/stripe/model/Quote.java b/src/main/java/com/stripe/model/Quote.java index 8735ba3f268..d99a8946405 100644 --- a/src/main/java/com/stripe/model/Quote.java +++ b/src/main/java/com/stripe/model/Quote.java @@ -470,9 +470,9 @@ public Quote accept(Map params) throws StripeException { /** Accepts the specified quote. */ public Quote accept(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/accept", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -485,9 +485,9 @@ public Quote accept(QuoteAcceptParams params) throws StripeException { /** Accepts the specified quote. */ public Quote accept(QuoteAcceptParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/accept", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -510,9 +510,9 @@ public Quote cancel(Map params) throws StripeException { /** Cancels the quote. */ public Quote cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -525,9 +525,9 @@ public Quote cancel(QuoteCancelParams params) throws StripeException { /** Cancels the quote. */ public Quote cancel(QuoteCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -550,7 +550,7 @@ public static Quote create(Map params) throws StripeException { */ public static Quote create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/quotes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/quotes"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -572,7 +572,7 @@ public static Quote create(QuoteCreateParams params) throws StripeException { */ public static Quote create(QuoteCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/quotes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/quotes"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -595,9 +595,9 @@ public Quote finalizeQuote(Map params) throws StripeException { public Quote finalizeQuote(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/finalize", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -611,9 +611,9 @@ public Quote finalizeQuote(QuoteFinalizeQuoteParams params) throws StripeExcepti public Quote finalizeQuote(QuoteFinalizeQuoteParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/finalize", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -626,7 +626,7 @@ public static QuoteCollection list(Map params) throws StripeExce /** Returns a list of your quotes. */ public static QuoteCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/quotes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/quotes"); return ApiResource.requestCollection(url, params, QuoteCollection.class, options); } @@ -638,7 +638,7 @@ public static QuoteCollection list(QuoteListParams params) throws StripeExceptio /** Returns a list of your quotes. */ public static QuoteCollection list(QuoteListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/quotes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/quotes"); return ApiResource.requestCollection(url, params, QuoteCollection.class, options); } @@ -672,9 +672,9 @@ public LineItemCollection listComputedUpfrontLineItems(Map param public LineItemCollection listComputedUpfrontLineItems( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/quotes/%s/computed_upfront_line_items", ApiResource.urlEncodeId(this.getId()))); @@ -702,9 +702,9 @@ public LineItemCollection listComputedUpfrontLineItems( QuoteListComputedUpfrontLineItemsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/quotes/%s/computed_upfront_line_items", ApiResource.urlEncodeId(this.getId()))); @@ -737,9 +737,9 @@ public LineItemCollection listLineItems(Map params) throws Strip public LineItemCollection listLineItems(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/line_items", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, LineItemCollection.class, options); } @@ -761,9 +761,9 @@ public LineItemCollection listLineItems(QuoteListLineItemsParams params) throws public LineItemCollection listLineItems(QuoteListLineItemsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s/line_items", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, LineItemCollection.class, options); } @@ -782,9 +782,9 @@ public InputStream pdf(Map params) throws StripeException { public InputStream pdf(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getUploadBase(), + options, String.format("/v1/quotes/%s/pdf", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestStream(ApiResource.RequestMethod.GET, url, params, options); } @@ -797,9 +797,9 @@ public InputStream pdf(QuotePdfParams params) throws StripeException { /** Download the PDF for a finalized quote. */ public InputStream pdf(QuotePdfParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getUploadBase(), + options, String.format("/v1/quotes/%s/pdf", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestStream(ApiResource.RequestMethod.GET, url, params, options); } @@ -818,9 +818,10 @@ public static Quote retrieve(String quote, RequestOptions options) throws Stripe public static Quote retrieve(String quote, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/quotes/%s", ApiResource.urlEncodeId(quote))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/quotes/%s", ApiResource.urlEncodeId(quote))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Quote.class, options); } @@ -828,9 +829,10 @@ public static Quote retrieve(String quote, Map params, RequestOp public static Quote retrieve(String quote, QuoteRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/quotes/%s", ApiResource.urlEncodeId(quote))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/quotes/%s", ApiResource.urlEncodeId(quote))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Quote.class, options); } @@ -844,9 +846,9 @@ public Quote update(Map params) throws StripeException { @Override public Quote update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } @@ -859,9 +861,9 @@ public Quote update(QuoteUpdateParams params) throws StripeException { /** A quote models prices and services for a customer. */ public Quote update(QuoteUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/quotes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Quote.class, options); } diff --git a/src/main/java/com/stripe/model/Refund.java b/src/main/java/com/stripe/model/Refund.java index 6ac891f14f1..a5a0103da67 100644 --- a/src/main/java/com/stripe/model/Refund.java +++ b/src/main/java/com/stripe/model/Refund.java @@ -308,9 +308,9 @@ public Refund cancel(Map params) throws StripeException { */ public Refund cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/refunds/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Refund.class, options); } @@ -333,9 +333,9 @@ public Refund cancel(RefundCancelParams params) throws StripeException { */ public Refund cancel(RefundCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/refunds/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Refund.class, options); } @@ -348,7 +348,7 @@ public static Refund create(Map params) throws StripeException { /** Create a refund. */ public static Refund create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/refunds"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/refunds"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Refund.class, options); } @@ -360,7 +360,7 @@ public static Refund create(RefundCreateParams params) throws StripeException { /** Create a refund. */ public static Refund create(RefundCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/refunds"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/refunds"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Refund.class, options); } @@ -380,7 +380,7 @@ public static RefundCollection list(Map params) throws StripeExc */ public static RefundCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/refunds"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/refunds"); return ApiResource.requestCollection(url, params, RefundCollection.class, options); } @@ -400,7 +400,7 @@ public static RefundCollection list(RefundListParams params) throws StripeExcept */ public static RefundCollection list(RefundListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/refunds"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/refunds"); return ApiResource.requestCollection(url, params, RefundCollection.class, options); } @@ -418,9 +418,10 @@ public static Refund retrieve(String refund, RequestOptions options) throws Stri public static Refund retrieve(String refund, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/refunds/%s", ApiResource.urlEncodeId(refund))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/refunds/%s", ApiResource.urlEncodeId(refund))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Refund.class, options); } @@ -428,9 +429,10 @@ public static Refund retrieve(String refund, Map params, Request public static Refund retrieve(String refund, RefundRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/refunds/%s", ApiResource.urlEncodeId(refund))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/refunds/%s", ApiResource.urlEncodeId(refund))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Refund.class, options); } @@ -454,9 +456,9 @@ public Refund update(Map params) throws StripeException { @Override public Refund update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/refunds/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Refund.class, options); } @@ -479,9 +481,9 @@ public Refund update(RefundUpdateParams params) throws StripeException { */ public Refund update(RefundUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/refunds/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Refund.class, options); } @@ -554,9 +556,9 @@ public Refund expire(Map params) throws StripeException { public Refund expire(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/refunds/%s/expire", ApiResource.urlEncodeId(this.resource.getId()))); @@ -572,9 +574,9 @@ public Refund expire(RefundExpireParams params) throws StripeException { /** Expire a refund with a status of requires_action. */ public Refund expire(RefundExpireParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/refunds/%s/expire", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/RefundCollection.java b/src/main/java/com/stripe/model/RefundCollection.java index 7fa54f2d023..2a83c35668b 100644 --- a/src/main/java/com/stripe/model/RefundCollection.java +++ b/src/main/java/com/stripe/model/RefundCollection.java @@ -28,7 +28,7 @@ public RefundCollection list(Map params) throws StripeException */ public RefundCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, RefundCollection.class, options); } @@ -50,7 +50,7 @@ public RefundCollection list(RefundCollectionListParams params) throws StripeExc */ public RefundCollection list(RefundCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, RefundCollection.class, options); } @@ -68,9 +68,9 @@ public Refund retrieve(String id, RequestOptions options) throws StripeException public Refund retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Refund.class, options); } @@ -79,9 +79,9 @@ public Refund retrieve(String id, Map params, RequestOptions opt public Refund retrieve(String id, RefundCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Refund.class, options); } diff --git a/src/main/java/com/stripe/model/Review.java b/src/main/java/com/stripe/model/Review.java index 6daf8ba89f2..bc6f6cc0c52 100644 --- a/src/main/java/com/stripe/model/Review.java +++ b/src/main/java/com/stripe/model/Review.java @@ -158,9 +158,9 @@ public Review approve(Map params) throws StripeException { /** Approves a Review object, closing it and removing it from the list of reviews. */ public Review approve(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/reviews/%s/approve", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Review.class, options); } @@ -173,9 +173,9 @@ public Review approve(ReviewApproveParams params) throws StripeException { /** Approves a Review object, closing it and removing it from the list of reviews. */ public Review approve(ReviewApproveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/reviews/%s/approve", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Review.class, options); } @@ -196,7 +196,7 @@ public static ReviewCollection list(Map params) throws StripeExc */ public static ReviewCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reviews"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reviews"); return ApiResource.requestCollection(url, params, ReviewCollection.class, options); } @@ -216,7 +216,7 @@ public static ReviewCollection list(ReviewListParams params) throws StripeExcept */ public static ReviewCollection list(ReviewListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reviews"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reviews"); return ApiResource.requestCollection(url, params, ReviewCollection.class, options); } @@ -234,9 +234,10 @@ public static Review retrieve(String review, RequestOptions options) throws Stri public static Review retrieve(String review, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/reviews/%s", ApiResource.urlEncodeId(review))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/reviews/%s", ApiResource.urlEncodeId(review))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Review.class, options); } @@ -244,9 +245,10 @@ public static Review retrieve(String review, Map params, Request public static Review retrieve(String review, ReviewRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/reviews/%s", ApiResource.urlEncodeId(review))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/reviews/%s", ApiResource.urlEncodeId(review))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Review.class, options); } diff --git a/src/main/java/com/stripe/model/SetupAttempt.java b/src/main/java/com/stripe/model/SetupAttempt.java index ddbb10dced2..d71adb184b2 100644 --- a/src/main/java/com/stripe/model/SetupAttempt.java +++ b/src/main/java/com/stripe/model/SetupAttempt.java @@ -231,7 +231,7 @@ public static SetupAttemptCollection list(Map params) throws Str /** Returns a list of SetupAttempts associated with a provided SetupIntent. */ public static SetupAttemptCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/setup_attempts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/setup_attempts"); return ApiResource.requestCollection(url, params, SetupAttemptCollection.class, options); } @@ -243,7 +243,7 @@ public static SetupAttemptCollection list(SetupAttemptListParams params) throws /** Returns a list of SetupAttempts associated with a provided SetupIntent. */ public static SetupAttemptCollection list(SetupAttemptListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/setup_attempts"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/setup_attempts"); return ApiResource.requestCollection(url, params, SetupAttemptCollection.class, options); } diff --git a/src/main/java/com/stripe/model/SetupIntent.java b/src/main/java/com/stripe/model/SetupIntent.java index 361b99a589d..b3cad9207ea 100644 --- a/src/main/java/com/stripe/model/SetupIntent.java +++ b/src/main/java/com/stripe/model/SetupIntent.java @@ -389,9 +389,9 @@ public SetupIntent cancel(Map params) throws StripeException { public SetupIntent cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); @@ -420,9 +420,9 @@ public SetupIntent cancel(SetupIntentCancelParams params) throws StripeException public SetupIntent cancel(SetupIntentCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); @@ -491,9 +491,9 @@ public SetupIntent confirm(Map params) throws StripeException { public SetupIntent confirm(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s/confirm", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); @@ -530,9 +530,9 @@ public SetupIntent confirm(SetupIntentConfirmParams params) throws StripeExcepti public SetupIntent confirm(SetupIntentConfirmParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s/confirm", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); @@ -558,7 +558,7 @@ public static SetupIntent create(Map params) throws StripeExcept */ public static SetupIntent create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/setup_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/setup_intents"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); } @@ -583,7 +583,7 @@ public static SetupIntent create(SetupIntentCreateParams params) throws StripeEx */ public static SetupIntent create(SetupIntentCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/setup_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/setup_intents"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); } @@ -596,7 +596,7 @@ public static SetupIntentCollection list(Map params) throws Stri /** Returns a list of SetupIntents. */ public static SetupIntentCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/setup_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/setup_intents"); return ApiResource.requestCollection(url, params, SetupIntentCollection.class, options); } @@ -608,7 +608,7 @@ public static SetupIntentCollection list(SetupIntentListParams params) throws St /** Returns a list of SetupIntents. */ public static SetupIntentCollection list(SetupIntentListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/setup_intents"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/setup_intents"); return ApiResource.requestCollection(url, params, SetupIntentCollection.class, options); } @@ -653,9 +653,9 @@ public static SetupIntent retrieve(String intent, RequestOptions options) throws public static SetupIntent retrieve( String intent, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s", ApiResource.urlEncodeId(intent))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, SetupIntent.class, options); @@ -675,9 +675,9 @@ public static SetupIntent retrieve( String intent, SetupIntentRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s", ApiResource.urlEncodeId(intent))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, SetupIntent.class, options); @@ -694,9 +694,9 @@ public SetupIntent update(Map params) throws StripeException { public SetupIntent update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); @@ -711,9 +711,9 @@ public SetupIntent update(SetupIntentUpdateParams params) throws StripeException public SetupIntent update(SetupIntentUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/setup_intents/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SetupIntent.class, options); @@ -738,9 +738,9 @@ public SetupIntent verifyMicrodeposits(Map params) throws Stripe public SetupIntent verifyMicrodeposits(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/setup_intents/%s/verify_microdeposits", ApiResource.urlEncodeId(this.getId()))); @@ -758,9 +758,9 @@ public SetupIntent verifyMicrodeposits(SetupIntentVerifyMicrodepositsParams para public SetupIntent verifyMicrodeposits( SetupIntentVerifyMicrodepositsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/setup_intents/%s/verify_microdeposits", ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/ShippingRate.java b/src/main/java/com/stripe/model/ShippingRate.java index 6aa794cca5d..100e3ac663c 100644 --- a/src/main/java/com/stripe/model/ShippingRate.java +++ b/src/main/java/com/stripe/model/ShippingRate.java @@ -128,7 +128,7 @@ public static ShippingRate create(Map params) throws StripeExcep /** Creates a new shipping rate object. */ public static ShippingRate create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/shipping_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/shipping_rates"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ShippingRate.class, options); } @@ -141,7 +141,7 @@ public static ShippingRate create(ShippingRateCreateParams params) throws Stripe /** Creates a new shipping rate object. */ public static ShippingRate create(ShippingRateCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/shipping_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/shipping_rates"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ShippingRate.class, options); } @@ -154,7 +154,7 @@ public static ShippingRateCollection list(Map params) throws Str /** Returns a list of your shipping rates. */ public static ShippingRateCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/shipping_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/shipping_rates"); return ApiResource.requestCollection(url, params, ShippingRateCollection.class, options); } @@ -166,7 +166,7 @@ public static ShippingRateCollection list(ShippingRateListParams params) throws /** Returns a list of your shipping rates. */ public static ShippingRateCollection list(ShippingRateListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/shipping_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/shipping_rates"); return ApiResource.requestCollection(url, params, ShippingRateCollection.class, options); } @@ -186,9 +186,9 @@ public static ShippingRate retrieve( String shippingRateToken, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/shipping_rates/%s", ApiResource.urlEncodeId(shippingRateToken))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ShippingRate.class, options); @@ -199,9 +199,9 @@ public static ShippingRate retrieve( String shippingRateToken, ShippingRateRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/shipping_rates/%s", ApiResource.urlEncodeId(shippingRateToken))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ShippingRate.class, options); @@ -218,9 +218,9 @@ public ShippingRate update(Map params) throws StripeException { public ShippingRate update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/shipping_rates/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ShippingRate.class, options); @@ -235,9 +235,9 @@ public ShippingRate update(ShippingRateUpdateParams params) throws StripeExcepti public ShippingRate update(ShippingRateUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/shipping_rates/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ShippingRate.class, options); diff --git a/src/main/java/com/stripe/model/Source.java b/src/main/java/com/stripe/model/Source.java index 2f381b11cef..c222fcb6a58 100644 --- a/src/main/java/com/stripe/model/Source.java +++ b/src/main/java/com/stripe/model/Source.java @@ -221,7 +221,7 @@ public static Source create(Map params) throws StripeException { /** Creates a new source object. */ public static Source create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/sources"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/sources"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Source.class, options); } @@ -233,7 +233,7 @@ public static Source create(SourceCreateParams params) throws StripeException { /** Creates a new source object. */ public static Source create(SourceCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/sources"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/sources"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Source.class, options); } @@ -250,9 +250,9 @@ public Source detach(Map params) throws StripeException { /** Delete a specified source for a given customer. */ public Source detach(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -269,9 +269,9 @@ public Source detach(SourceDetachParams params) throws StripeException { /** Delete a specified source for a given customer. */ public Source detach(SourceDetachParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/sources/%s", ApiResource.urlEncodeId(this.getCustomer()), @@ -303,9 +303,10 @@ public static Source retrieve(String source, RequestOptions options) throws Stri public static Source retrieve(String source, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/sources/%s", ApiResource.urlEncodeId(source))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/sources/%s", ApiResource.urlEncodeId(source))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Source.class, options); } @@ -316,9 +317,10 @@ public static Source retrieve(String source, Map params, Request public static Source retrieve(String source, SourceRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/sources/%s", ApiResource.urlEncodeId(source))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/sources/%s", ApiResource.urlEncodeId(source))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Source.class, options); } @@ -337,9 +339,9 @@ public SourceTransactionCollection sourceTransactions(Map params public SourceTransactionCollection sourceTransactions( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/sources/%s/source_transactions", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, SourceTransactionCollection.class, options); @@ -355,9 +357,9 @@ public SourceTransactionCollection sourceTransactions(SourceSourceTransactionsPa public SourceTransactionCollection sourceTransactions( SourceSourceTransactionsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/sources/%s/source_transactions", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, SourceTransactionCollection.class, options); @@ -387,9 +389,9 @@ public Source update(Map params) throws StripeException { @Override public Source update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/sources/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Source.class, options); } @@ -416,9 +418,9 @@ public Source update(SourceUpdateParams params) throws StripeException { */ public Source update(SourceUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/sources/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Source.class, options); } @@ -431,9 +433,9 @@ public Source verify(Map params) throws StripeException { /** Verify a given source. */ public Source verify(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/sources/%s/verify", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Source.class, options); } @@ -446,9 +448,9 @@ public Source verify(SourceVerifyParams params) throws StripeException { /** Verify a given source. */ public Source verify(SourceVerifyParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/sources/%s/verify", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Source.class, options); } diff --git a/src/main/java/com/stripe/model/Subscription.java b/src/main/java/com/stripe/model/Subscription.java index 60f49646650..d0d68e06c5f 100644 --- a/src/main/java/com/stripe/model/Subscription.java +++ b/src/main/java/com/stripe/model/Subscription.java @@ -567,9 +567,9 @@ public Subscription cancel(Map params) throws StripeException { public Subscription cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Subscription.class, options); @@ -616,9 +616,9 @@ public Subscription cancel(SubscriptionCancelParams params) throws StripeExcepti public Subscription cancel(SubscriptionCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Subscription.class, options); @@ -658,7 +658,7 @@ public static Subscription create(Map params) throws StripeExcep */ public static Subscription create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscriptions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscriptions"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Subscription.class, options); } @@ -697,7 +697,7 @@ public static Subscription create(SubscriptionCreateParams params) throws Stripe */ public static Subscription create(SubscriptionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscriptions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscriptions"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Subscription.class, options); } @@ -716,9 +716,9 @@ public Discount deleteDiscount(Map params) throws StripeExceptio public Discount deleteDiscount(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s/discount", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Discount.class, options); @@ -738,7 +738,7 @@ public static SubscriptionCollection list(Map params) throws Str */ public static SubscriptionCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscriptions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscriptions"); return ApiResource.requestCollection(url, params, SubscriptionCollection.class, options); } @@ -756,7 +756,7 @@ public static SubscriptionCollection list(SubscriptionListParams params) throws */ public static SubscriptionCollection list(SubscriptionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscriptions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscriptions"); return ApiResource.requestCollection(url, params, SubscriptionCollection.class, options); } @@ -776,9 +776,9 @@ public static Subscription retrieve( String subscriptionExposedId, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s", ApiResource.urlEncodeId(subscriptionExposedId))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Subscription.class, options); @@ -789,9 +789,9 @@ public static Subscription retrieve( String subscriptionExposedId, SubscriptionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s", ApiResource.urlEncodeId(subscriptionExposedId))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Subscription.class, options); @@ -819,7 +819,7 @@ public static SubscriptionSearchResult search(Map params) throws */ public static SubscriptionSearchResult search(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscriptions/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscriptions/search"); return ApiResource.requestSearchResult(url, params, SubscriptionSearchResult.class, options); } @@ -846,7 +846,7 @@ public static SubscriptionSearchResult search(SubscriptionSearchParams params) */ public static SubscriptionSearchResult search( SubscriptionSearchParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscriptions/search"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscriptions/search"); return ApiResource.requestSearchResult(url, params, SubscriptionSearchResult.class, options); } @@ -871,9 +871,9 @@ public Subscription update(Map params) throws StripeException { public Subscription update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Subscription.class, options); @@ -898,9 +898,9 @@ public Subscription update(SubscriptionUpdateParams params) throws StripeExcepti public Subscription update(SubscriptionUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscriptions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Subscription.class, options); diff --git a/src/main/java/com/stripe/model/SubscriptionItem.java b/src/main/java/com/stripe/model/SubscriptionItem.java index baeaaa6071b..dc0639f0394 100644 --- a/src/main/java/com/stripe/model/SubscriptionItem.java +++ b/src/main/java/com/stripe/model/SubscriptionItem.java @@ -132,7 +132,7 @@ public static SubscriptionItem create(Map params) throws StripeE /** Adds a new item to an existing subscription. No existing items will be changed or replaced. */ public static SubscriptionItem create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_items"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionItem.class, options); } @@ -146,7 +146,7 @@ public static SubscriptionItem create(SubscriptionItemCreateParams params) /** Adds a new item to an existing subscription. No existing items will be changed or replaced. */ public static SubscriptionItem create(SubscriptionItemCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_items"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionItem.class, options); } @@ -182,9 +182,9 @@ public SubscriptionItem delete(Map params) throws StripeExceptio public SubscriptionItem delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_items/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, SubscriptionItem.class, options); @@ -205,9 +205,9 @@ public SubscriptionItem delete(SubscriptionItemDeleteParams params) throws Strip public SubscriptionItem delete(SubscriptionItemDeleteParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_items/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, SubscriptionItem.class, options); @@ -221,7 +221,7 @@ public static SubscriptionItemCollection list(Map params) throws /** Returns a list of your subscription items for a given subscription. */ public static SubscriptionItemCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_items"); return ApiResource.requestCollection(url, params, SubscriptionItemCollection.class, options); } @@ -234,7 +234,7 @@ public static SubscriptionItemCollection list(SubscriptionItemListParams params) /** Returns a list of your subscription items for a given subscription. */ public static SubscriptionItemCollection list( SubscriptionItemListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_items"); return ApiResource.requestCollection(url, params, SubscriptionItemCollection.class, options); } @@ -253,9 +253,9 @@ public static SubscriptionItem retrieve(String item, RequestOptions options) public static SubscriptionItem retrieve( String item, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_items/%s", ApiResource.urlEncodeId(item))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, SubscriptionItem.class, options); @@ -266,9 +266,9 @@ public static SubscriptionItem retrieve( String item, SubscriptionItemRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_items/%s", ApiResource.urlEncodeId(item))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, SubscriptionItem.class, options); @@ -285,9 +285,9 @@ public SubscriptionItem update(Map params) throws StripeExceptio public SubscriptionItem update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_items/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionItem.class, options); @@ -302,9 +302,9 @@ public SubscriptionItem update(SubscriptionItemUpdateParams params) throws Strip public SubscriptionItem update(SubscriptionItemUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_items/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionItem.class, options); @@ -352,9 +352,9 @@ public UsageRecordSummaryCollection usageRecordSummaries(Map par public UsageRecordSummaryCollection usageRecordSummaries( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_items/%s/usage_record_summaries", ApiResource.urlEncodeId(this.getId()))); @@ -390,9 +390,9 @@ public UsageRecordSummaryCollection usageRecordSummaries( SubscriptionItemUsageRecordSummariesParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_items/%s/usage_record_summaries", ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/SubscriptionSchedule.java b/src/main/java/com/stripe/model/SubscriptionSchedule.java index 54778d20031..a456e728ade 100644 --- a/src/main/java/com/stripe/model/SubscriptionSchedule.java +++ b/src/main/java/com/stripe/model/SubscriptionSchedule.java @@ -258,9 +258,9 @@ public SubscriptionSchedule cancel(Map params) throws StripeExce public SubscriptionSchedule cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_schedules/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -285,9 +285,9 @@ public SubscriptionSchedule cancel(SubscriptionScheduleCancelParams params) public SubscriptionSchedule cancel( SubscriptionScheduleCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_schedules/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -308,7 +308,7 @@ public static SubscriptionSchedule create(Map params) throws Str */ public static SubscriptionSchedule create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_schedules"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_schedules"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionSchedule.class, options); } @@ -328,7 +328,7 @@ public static SubscriptionSchedule create(SubscriptionScheduleCreateParams param */ public static SubscriptionSchedule create( SubscriptionScheduleCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_schedules"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_schedules"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionSchedule.class, options); } @@ -342,7 +342,7 @@ public static SubscriptionScheduleCollection list(Map params) /** Retrieves the list of your subscription schedules. */ public static SubscriptionScheduleCollection list( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_schedules"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_schedules"); return ApiResource.requestCollection( url, params, SubscriptionScheduleCollection.class, options); } @@ -356,7 +356,7 @@ public static SubscriptionScheduleCollection list(SubscriptionScheduleListParams /** Retrieves the list of your subscription schedules. */ public static SubscriptionScheduleCollection list( SubscriptionScheduleListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/subscription_schedules"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/subscription_schedules"); return ApiResource.requestCollection( url, params, SubscriptionScheduleCollection.class, options); } @@ -404,9 +404,9 @@ public SubscriptionSchedule release(Map params) throws StripeExc public SubscriptionSchedule release(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_schedules/%s/release", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -435,9 +435,9 @@ public SubscriptionSchedule release(SubscriptionScheduleReleaseParams params) public SubscriptionSchedule release( SubscriptionScheduleReleaseParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_schedules/%s/release", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -468,9 +468,9 @@ public static SubscriptionSchedule retrieve(String schedule, RequestOptions opti public static SubscriptionSchedule retrieve( String schedule, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_schedules/%s", ApiResource.urlEncodeId(schedule))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, SubscriptionSchedule.class, options); @@ -484,9 +484,9 @@ public static SubscriptionSchedule retrieve( String schedule, SubscriptionScheduleRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_schedules/%s", ApiResource.urlEncodeId(schedule))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, SubscriptionSchedule.class, options); @@ -503,9 +503,9 @@ public SubscriptionSchedule update(Map params) throws StripeExce public SubscriptionSchedule update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_schedules/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionSchedule.class, options); @@ -521,9 +521,9 @@ public SubscriptionSchedule update(SubscriptionScheduleUpdateParams params) public SubscriptionSchedule update( SubscriptionScheduleUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/subscription_schedules/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, SubscriptionSchedule.class, options); diff --git a/src/main/java/com/stripe/model/TaxCode.java b/src/main/java/com/stripe/model/TaxCode.java index 540e9625b68..5545e814efa 100644 --- a/src/main/java/com/stripe/model/TaxCode.java +++ b/src/main/java/com/stripe/model/TaxCode.java @@ -56,7 +56,7 @@ public static TaxCodeCollection list(Map params) throws StripeEx */ public static TaxCodeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tax_codes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tax_codes"); return ApiResource.requestCollection(url, params, TaxCodeCollection.class, options); } @@ -74,7 +74,7 @@ public static TaxCodeCollection list(TaxCodeListParams params) throws StripeExce */ public static TaxCodeCollection list(TaxCodeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tax_codes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tax_codes"); return ApiResource.requestCollection(url, params, TaxCodeCollection.class, options); } @@ -101,9 +101,10 @@ public static TaxCode retrieve(String id, RequestOptions options) throws StripeE public static TaxCode retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/tax_codes/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/tax_codes/%s", ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, TaxCode.class, options); } @@ -114,9 +115,10 @@ public static TaxCode retrieve(String id, Map params, RequestOpt public static TaxCode retrieve(String id, TaxCodeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/tax_codes/%s", ApiResource.urlEncodeId(id))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/tax_codes/%s", ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, TaxCode.class, options); } } diff --git a/src/main/java/com/stripe/model/TaxId.java b/src/main/java/com/stripe/model/TaxId.java index d542814366e..f2a76a78354 100644 --- a/src/main/java/com/stripe/model/TaxId.java +++ b/src/main/java/com/stripe/model/TaxId.java @@ -120,9 +120,9 @@ public TaxId delete(Map params) throws StripeException { /** Deletes an existing TaxID object. */ public TaxId delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/customers/%s/tax_ids/%s", ApiResource.urlEncodeId(this.getCustomer()), diff --git a/src/main/java/com/stripe/model/TaxIdCollection.java b/src/main/java/com/stripe/model/TaxIdCollection.java index 5936b098d5e..06770b39f6f 100644 --- a/src/main/java/com/stripe/model/TaxIdCollection.java +++ b/src/main/java/com/stripe/model/TaxIdCollection.java @@ -18,7 +18,7 @@ public TaxId create(Map params) throws StripeException { /** Creates a new TaxID object for a customer. */ public TaxId create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, TaxId.class, options); } @@ -30,7 +30,7 @@ public TaxId create(TaxIdCollectionCreateParams params) throws StripeException { /** Creates a new TaxID object for a customer. */ public TaxId create(TaxIdCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, TaxId.class, options); } @@ -42,7 +42,7 @@ public TaxIdCollection list(Map params) throws StripeException { /** Returns a list of tax IDs for a customer. */ public TaxIdCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, TaxIdCollection.class, options); } @@ -54,7 +54,7 @@ public TaxIdCollection list(TaxIdCollectionListParams params) throws StripeExcep /** Returns a list of tax IDs for a customer. */ public TaxIdCollection list(TaxIdCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, TaxIdCollection.class, options); } @@ -72,9 +72,9 @@ public TaxId retrieve(String id, RequestOptions options) throws StripeException public TaxId retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, TaxId.class, options); } @@ -83,9 +83,9 @@ public TaxId retrieve(String id, Map params, RequestOptions opti public TaxId retrieve(String id, TaxIdCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, TaxId.class, options); } diff --git a/src/main/java/com/stripe/model/TaxRate.java b/src/main/java/com/stripe/model/TaxRate.java index 17bd490ce36..79e3dd52fdb 100644 --- a/src/main/java/com/stripe/model/TaxRate.java +++ b/src/main/java/com/stripe/model/TaxRate.java @@ -130,7 +130,7 @@ public static TaxRate create(Map params) throws StripeException /** Creates a new tax rate. */ public static TaxRate create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tax_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tax_rates"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, TaxRate.class, options); } @@ -142,7 +142,7 @@ public static TaxRate create(TaxRateCreateParams params) throws StripeException /** Creates a new tax rate. */ public static TaxRate create(TaxRateCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tax_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tax_rates"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, TaxRate.class, options); } @@ -160,7 +160,7 @@ public static TaxRateCollection list(Map params) throws StripeEx */ public static TaxRateCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tax_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tax_rates"); return ApiResource.requestCollection(url, params, TaxRateCollection.class, options); } @@ -178,7 +178,7 @@ public static TaxRateCollection list(TaxRateListParams params) throws StripeExce */ public static TaxRateCollection list(TaxRateListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tax_rates"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tax_rates"); return ApiResource.requestCollection(url, params, TaxRateCollection.class, options); } @@ -196,9 +196,9 @@ public static TaxRate retrieve(String taxRate, RequestOptions options) throws St public static TaxRate retrieve(String taxRate, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/tax_rates/%s", ApiResource.urlEncodeId(taxRate))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, TaxRate.class, options); } @@ -207,9 +207,9 @@ public static TaxRate retrieve(String taxRate, Map params, Reque public static TaxRate retrieve( String taxRate, TaxRateRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/tax_rates/%s", ApiResource.urlEncodeId(taxRate))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, TaxRate.class, options); } @@ -224,9 +224,9 @@ public TaxRate update(Map params) throws StripeException { @Override public TaxRate update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/tax_rates/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, TaxRate.class, options); } @@ -239,9 +239,9 @@ public TaxRate update(TaxRateUpdateParams params) throws StripeException { /** Updates an existing tax rate. */ public TaxRate update(TaxRateUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/tax_rates/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, TaxRate.class, options); } diff --git a/src/main/java/com/stripe/model/Token.java b/src/main/java/com/stripe/model/Token.java index fbc4a8ca4ec..d319d66d571 100644 --- a/src/main/java/com/stripe/model/Token.java +++ b/src/main/java/com/stripe/model/Token.java @@ -117,7 +117,7 @@ public static Token create(Map params) throws StripeException { */ public static Token create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tokens"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tokens"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Token.class, options); } @@ -137,7 +137,7 @@ public static Token create(TokenCreateParams params) throws StripeException { */ public static Token create(TokenCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/tokens"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/tokens"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Token.class, options); } @@ -155,9 +155,10 @@ public static Token retrieve(String token, RequestOptions options) throws Stripe public static Token retrieve(String token, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/tokens/%s", ApiResource.urlEncodeId(token))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/tokens/%s", ApiResource.urlEncodeId(token))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Token.class, options); } @@ -165,9 +166,10 @@ public static Token retrieve(String token, Map params, RequestOp public static Token retrieve(String token, TokenRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/tokens/%s", ApiResource.urlEncodeId(token))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/tokens/%s", ApiResource.urlEncodeId(token))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Token.class, options); } } diff --git a/src/main/java/com/stripe/model/Topup.java b/src/main/java/com/stripe/model/Topup.java index d299146b629..98b1010dc6f 100644 --- a/src/main/java/com/stripe/model/Topup.java +++ b/src/main/java/com/stripe/model/Topup.java @@ -168,9 +168,9 @@ public Topup cancel(Map params) throws StripeException { /** Cancels a top-up. Only pending top-ups can be canceled. */ public Topup cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/topups/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Topup.class, options); } @@ -183,9 +183,9 @@ public Topup cancel(TopupCancelParams params) throws StripeException { /** Cancels a top-up. Only pending top-ups can be canceled. */ public Topup cancel(TopupCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/topups/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Topup.class, options); } @@ -198,7 +198,7 @@ public static Topup create(Map params) throws StripeException { /** Top up the balance of an account. */ public static Topup create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/topups"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/topups"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Topup.class, options); } @@ -210,7 +210,7 @@ public static Topup create(TopupCreateParams params) throws StripeException { /** Top up the balance of an account. */ public static Topup create(TopupCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/topups"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/topups"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Topup.class, options); } @@ -222,7 +222,7 @@ public static TopupCollection list(Map params) throws StripeExce /** Returns a list of top-ups. */ public static TopupCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/topups"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/topups"); return ApiResource.requestCollection(url, params, TopupCollection.class, options); } @@ -234,7 +234,7 @@ public static TopupCollection list(TopupListParams params) throws StripeExceptio /** Returns a list of top-ups. */ public static TopupCollection list(TopupListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/topups"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/topups"); return ApiResource.requestCollection(url, params, TopupCollection.class, options); } @@ -264,9 +264,10 @@ public static Topup retrieve(String topup, RequestOptions options) throws Stripe public static Topup retrieve(String topup, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/topups/%s", ApiResource.urlEncodeId(topup))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/topups/%s", ApiResource.urlEncodeId(topup))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Topup.class, options); } @@ -278,9 +279,10 @@ public static Topup retrieve(String topup, Map params, RequestOp public static Topup retrieve(String topup, TopupRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", - Stripe.getApiBase(), String.format("/v1/topups/%s", ApiResource.urlEncodeId(topup))); + ApiResource.fullUrl( + Stripe.getApiBase(), + options, + String.format("/v1/topups/%s", ApiResource.urlEncodeId(topup))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Topup.class, options); } @@ -294,9 +296,9 @@ public Topup update(Map params) throws StripeException { @Override public Topup update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/topups/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Topup.class, options); } @@ -309,9 +311,9 @@ public Topup update(TopupUpdateParams params) throws StripeException { /** Updates the metadata of a top-up. Other top-up details are not editable by design. */ public Topup update(TopupUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/topups/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Topup.class, options); } diff --git a/src/main/java/com/stripe/model/Transfer.java b/src/main/java/com/stripe/model/Transfer.java index ae045cdf9e9..5c90cc28502 100644 --- a/src/main/java/com/stripe/model/Transfer.java +++ b/src/main/java/com/stripe/model/Transfer.java @@ -235,7 +235,7 @@ public static Transfer create(Map params) throws StripeException */ public static Transfer create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/transfers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/transfers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Transfer.class, options); } @@ -256,7 +256,7 @@ public static Transfer create(TransferCreateParams params) throws StripeExceptio */ public static Transfer create(TransferCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/transfers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/transfers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Transfer.class, options); } @@ -275,7 +275,7 @@ public static TransferCollection list(Map params) throws StripeE */ public static TransferCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/transfers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/transfers"); return ApiResource.requestCollection(url, params, TransferCollection.class, options); } @@ -293,7 +293,7 @@ public static TransferCollection list(TransferListParams params) throws StripeEx */ public static TransferCollection list(TransferListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/transfers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/transfers"); return ApiResource.requestCollection(url, params, TransferCollection.class, options); } @@ -323,9 +323,9 @@ public static Transfer retrieve(String transfer, RequestOptions options) throws public static Transfer retrieve( String transfer, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/transfers/%s", ApiResource.urlEncodeId(transfer))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Transfer.class, options); } @@ -339,9 +339,9 @@ public static Transfer retrieve( String transfer, TransferRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/transfers/%s", ApiResource.urlEncodeId(transfer))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Transfer.class, options); } @@ -367,9 +367,9 @@ public Transfer update(Map params) throws StripeException { public Transfer update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/transfers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Transfer.class, options); @@ -394,9 +394,9 @@ public Transfer update(TransferUpdateParams params) throws StripeException { public Transfer update(TransferUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/transfers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Transfer.class, options); diff --git a/src/main/java/com/stripe/model/TransferReversal.java b/src/main/java/com/stripe/model/TransferReversal.java index 94ad9a70107..fda3f6e2857 100644 --- a/src/main/java/com/stripe/model/TransferReversal.java +++ b/src/main/java/com/stripe/model/TransferReversal.java @@ -192,9 +192,9 @@ public TransferReversal update(Map params) throws StripeExceptio public TransferReversal update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/transfers/%s/reversals/%s", ApiResource.urlEncodeId(this.getTransfer()), @@ -222,9 +222,9 @@ public TransferReversal update(TransferReversalUpdateParams params) throws Strip public TransferReversal update(TransferReversalUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/transfers/%s/reversals/%s", ApiResource.urlEncodeId(this.getTransfer()), diff --git a/src/main/java/com/stripe/model/TransferReversalCollection.java b/src/main/java/com/stripe/model/TransferReversalCollection.java index b786dc996cc..dd2bf1dad26 100644 --- a/src/main/java/com/stripe/model/TransferReversalCollection.java +++ b/src/main/java/com/stripe/model/TransferReversalCollection.java @@ -37,7 +37,7 @@ public TransferReversal create(Map params) throws StripeExceptio */ public TransferReversal create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, TransferReversal.class, options); } @@ -70,7 +70,7 @@ public TransferReversal create(TransferReversalCollectionCreateParams params) public TransferReversal create( TransferReversalCollectionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, TransferReversal.class, options); } @@ -93,7 +93,7 @@ public TransferReversalCollection list(Map params) throws Stripe */ public TransferReversalCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, TransferReversalCollection.class, options); } @@ -116,7 +116,7 @@ public TransferReversalCollection list(TransferReversalCollectionListParams para */ public TransferReversalCollection list( TransferReversalCollectionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), this.getUrl()); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, this.getUrl()); return ApiResource.requestCollection(url, params, TransferReversalCollection.class, options); } @@ -143,9 +143,9 @@ public TransferReversal retrieve(String id, RequestOptions options) throws Strip public TransferReversal retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, TransferReversal.class, options); @@ -159,9 +159,9 @@ public TransferReversal retrieve( String id, TransferReversalCollectionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("%s/%s", this.getUrl(), ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, TransferReversal.class, options); diff --git a/src/main/java/com/stripe/model/UsageRecord.java b/src/main/java/com/stripe/model/UsageRecord.java index f951aae8882..d3fb7c032cc 100644 --- a/src/main/java/com/stripe/model/UsageRecord.java +++ b/src/main/java/com/stripe/model/UsageRecord.java @@ -81,9 +81,9 @@ public static UsageRecord createOnSubscriptionItem( String subscriptionItem, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_items/%s/usage_records", ApiResource.urlEncodeId(subscriptionItem))); @@ -119,9 +119,9 @@ public static UsageRecord createOnSubscriptionItem( RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/subscription_items/%s/usage_records", ApiResource.urlEncodeId(subscriptionItem))); diff --git a/src/main/java/com/stripe/model/WebhookEndpoint.java b/src/main/java/com/stripe/model/WebhookEndpoint.java index 7bd18d0e8f0..13355c9a371 100644 --- a/src/main/java/com/stripe/model/WebhookEndpoint.java +++ b/src/main/java/com/stripe/model/WebhookEndpoint.java @@ -126,7 +126,7 @@ public static WebhookEndpoint create(Map params) throws StripeEx */ public static WebhookEndpoint create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/webhook_endpoints"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/webhook_endpoints"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, WebhookEndpoint.class, options); } @@ -155,7 +155,7 @@ public static WebhookEndpoint create(WebhookEndpointCreateParams params) throws */ public static WebhookEndpoint create(WebhookEndpointCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/webhook_endpoints"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/webhook_endpoints"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, WebhookEndpoint.class, options); } @@ -195,9 +195,9 @@ public WebhookEndpoint delete(Map params) throws StripeException public WebhookEndpoint delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/webhook_endpoints/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, WebhookEndpoint.class, options); @@ -211,7 +211,7 @@ public static WebhookEndpointCollection list(Map params) throws /** Returns a list of your webhook endpoints. */ public static WebhookEndpointCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/webhook_endpoints"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/webhook_endpoints"); return ApiResource.requestCollection(url, params, WebhookEndpointCollection.class, options); } @@ -224,7 +224,7 @@ public static WebhookEndpointCollection list(WebhookEndpointListParams params) /** Returns a list of your webhook endpoints. */ public static WebhookEndpointCollection list( WebhookEndpointListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/webhook_endpoints"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/webhook_endpoints"); return ApiResource.requestCollection(url, params, WebhookEndpointCollection.class, options); } @@ -244,9 +244,9 @@ public static WebhookEndpoint retrieve( String webhookEndpoint, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/webhook_endpoints/%s", ApiResource.urlEncodeId(webhookEndpoint))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, WebhookEndpoint.class, options); @@ -257,9 +257,9 @@ public static WebhookEndpoint retrieve( String webhookEndpoint, WebhookEndpointRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/webhook_endpoints/%s", ApiResource.urlEncodeId(webhookEndpoint))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, WebhookEndpoint.class, options); @@ -282,9 +282,9 @@ public WebhookEndpoint update(Map params) throws StripeException public WebhookEndpoint update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/webhook_endpoints/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, WebhookEndpoint.class, options); @@ -305,9 +305,9 @@ public WebhookEndpoint update(WebhookEndpointUpdateParams params) throws StripeE public WebhookEndpoint update(WebhookEndpointUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/webhook_endpoints/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, WebhookEndpoint.class, options); diff --git a/src/main/java/com/stripe/model/apps/Secret.java b/src/main/java/com/stripe/model/apps/Secret.java index 668896342cc..b1c869855e7 100644 --- a/src/main/java/com/stripe/model/apps/Secret.java +++ b/src/main/java/com/stripe/model/apps/Secret.java @@ -90,7 +90,7 @@ public static Secret create(Map params) throws StripeException { /** Create or replace a secret in the secret store. */ public static Secret create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Secret.class, options); } @@ -102,7 +102,7 @@ public static Secret create(SecretCreateParams params) throws StripeException { /** Create or replace a secret in the secret store. */ public static Secret create(SecretCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Secret.class, options); } @@ -114,7 +114,7 @@ public static Secret deleteWhere(Map params) throws StripeExcept /** Deletes a secret from the secret store by name and scope. */ public static Secret deleteWhere(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets/delete"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets/delete"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Secret.class, options); } @@ -126,7 +126,7 @@ public static Secret deleteWhere(SecretDeleteWhereParams params) throws StripeEx /** Deletes a secret from the secret store by name and scope. */ public static Secret deleteWhere(SecretDeleteWhereParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets/delete"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets/delete"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Secret.class, options); } @@ -138,7 +138,7 @@ public static Secret find(Map params) throws StripeException { /** Finds a secret in the secret store by name and scope. */ public static Secret find(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets/find"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets/find"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Secret.class, options); } @@ -150,7 +150,7 @@ public static Secret find(SecretFindParams params) throws StripeException { /** Finds a secret in the secret store by name and scope. */ public static Secret find(SecretFindParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets/find"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets/find"); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Secret.class, options); } @@ -162,7 +162,7 @@ public static SecretCollection list(Map params) throws StripeExc /** List all secrets stored on the given scope. */ public static SecretCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets"); return ApiResource.requestCollection(url, params, SecretCollection.class, options); } @@ -174,7 +174,7 @@ public static SecretCollection list(SecretListParams params) throws StripeExcept /** List all secrets stored on the given scope. */ public static SecretCollection list(SecretListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/apps/secrets"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/apps/secrets"); return ApiResource.requestCollection(url, params, SecretCollection.class, options); } diff --git a/src/main/java/com/stripe/model/billingportal/Configuration.java b/src/main/java/com/stripe/model/billingportal/Configuration.java index 2dbae34999d..65fecce1ee8 100644 --- a/src/main/java/com/stripe/model/billingportal/Configuration.java +++ b/src/main/java/com/stripe/model/billingportal/Configuration.java @@ -125,7 +125,8 @@ public static Configuration create(Map params) throws StripeExce /** Creates a configuration that describes the functionality and behavior of a PortalSession. */ public static Configuration create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/billing_portal/configurations"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/billing_portal/configurations"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Configuration.class, options); } @@ -138,7 +139,8 @@ public static Configuration create(ConfigurationCreateParams params) throws Stri /** Creates a configuration that describes the functionality and behavior of a PortalSession. */ public static Configuration create(ConfigurationCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/billing_portal/configurations"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/billing_portal/configurations"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Configuration.class, options); } @@ -151,7 +153,8 @@ public static ConfigurationCollection list(Map params) throws St /** Returns a list of configurations that describe the functionality of the customer portal. */ public static ConfigurationCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/billing_portal/configurations"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/billing_portal/configurations"); return ApiResource.requestCollection(url, params, ConfigurationCollection.class, options); } @@ -164,7 +167,8 @@ public static ConfigurationCollection list(ConfigurationListParams params) /** Returns a list of configurations that describe the functionality of the customer portal. */ public static ConfigurationCollection list(ConfigurationListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/billing_portal/configurations"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/billing_portal/configurations"); return ApiResource.requestCollection(url, params, ConfigurationCollection.class, options); } @@ -184,9 +188,9 @@ public static Configuration retrieve( String configuration, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/billing_portal/configurations/%s", ApiResource.urlEncodeId(configuration))); return ApiResource.request( @@ -198,9 +202,9 @@ public static Configuration retrieve( String configuration, ConfigurationRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/billing_portal/configurations/%s", ApiResource.urlEncodeId(configuration))); return ApiResource.request( @@ -218,9 +222,9 @@ public Configuration update(Map params) throws StripeException { public Configuration update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/billing_portal/configurations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -236,9 +240,9 @@ public Configuration update(ConfigurationUpdateParams params) throws StripeExcep public Configuration update(ConfigurationUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/billing_portal/configurations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/billingportal/Session.java b/src/main/java/com/stripe/model/billingportal/Session.java index 38f4fc6ceea..8b8ac8d88ed 100644 --- a/src/main/java/com/stripe/model/billingportal/Session.java +++ b/src/main/java/com/stripe/model/billingportal/Session.java @@ -138,7 +138,7 @@ public static Session create(Map params) throws StripeException /** Creates a session of the customer portal. */ public static Session create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/billing_portal/sessions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/billing_portal/sessions"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); } @@ -150,7 +150,7 @@ public static Session create(SessionCreateParams params) throws StripeException /** Creates a session of the customer portal. */ public static Session create(SessionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/billing_portal/sessions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/billing_portal/sessions"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); } diff --git a/src/main/java/com/stripe/model/checkout/Session.java b/src/main/java/com/stripe/model/checkout/Session.java index 1cc32b8ff20..23c8821172c 100644 --- a/src/main/java/com/stripe/model/checkout/Session.java +++ b/src/main/java/com/stripe/model/checkout/Session.java @@ -457,7 +457,7 @@ public static Session create(Map params) throws StripeException /** Creates a Session object. */ public static Session create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/checkout/sessions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/checkout/sessions"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); } @@ -469,7 +469,7 @@ public static Session create(SessionCreateParams params) throws StripeException /** Creates a Session object. */ public static Session create(SessionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/checkout/sessions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/checkout/sessions"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); } @@ -511,9 +511,9 @@ public Session expire(Map params) throws StripeException { */ public Session expire(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/checkout/sessions/%s/expire", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); @@ -537,9 +537,9 @@ public Session expire(SessionExpireParams params) throws StripeException { */ public Session expire(SessionExpireParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/checkout/sessions/%s/expire", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); @@ -553,7 +553,7 @@ public static SessionCollection list(Map params) throws StripeEx /** Returns a list of Checkout Sessions. */ public static SessionCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/checkout/sessions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/checkout/sessions"); return ApiResource.requestCollection(url, params, SessionCollection.class, options); } @@ -565,7 +565,7 @@ public static SessionCollection list(SessionListParams params) throws StripeExce /** Returns a list of Checkout Sessions. */ public static SessionCollection list(SessionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/checkout/sessions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/checkout/sessions"); return ApiResource.requestCollection(url, params, SessionCollection.class, options); } @@ -595,9 +595,9 @@ public LineItemCollection listLineItems(Map params) throws Strip public LineItemCollection listLineItems(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/checkout/sessions/%s/line_items", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, LineItemCollection.class, options); @@ -621,9 +621,9 @@ public LineItemCollection listLineItems(SessionListLineItemsParams params) public LineItemCollection listLineItems(SessionListLineItemsParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/checkout/sessions/%s/line_items", ApiResource.urlEncodeId(this.getId()))); return ApiResource.requestCollection(url, params, LineItemCollection.class, options); @@ -643,9 +643,9 @@ public static Session retrieve(String session, RequestOptions options) throws St public static Session retrieve(String session, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/checkout/sessions/%s", ApiResource.urlEncodeId(session))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Session.class, options); } @@ -654,9 +654,9 @@ public static Session retrieve(String session, Map params, Reque public static Session retrieve( String session, SessionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/checkout/sessions/%s", ApiResource.urlEncodeId(session))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Session.class, options); } diff --git a/src/main/java/com/stripe/model/financialconnections/Account.java b/src/main/java/com/stripe/model/financialconnections/Account.java index c346bbb5a3d..45e79f1f4ab 100644 --- a/src/main/java/com/stripe/model/financialconnections/Account.java +++ b/src/main/java/com/stripe/model/financialconnections/Account.java @@ -184,9 +184,9 @@ public com.stripe.model.financialconnections.Account disconnect(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s/disconnect", ApiResource.urlEncodeId(this.getId()))); @@ -214,9 +214,9 @@ public com.stripe.model.financialconnections.Account disconnect(AccountDisconnec public com.stripe.model.financialconnections.Account disconnect( AccountDisconnectParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s/disconnect", ApiResource.urlEncodeId(this.getId()))); @@ -236,7 +236,8 @@ public static AccountCollection list(Map params) throws StripeEx /** Returns a list of Financial Connections Account objects. */ public static AccountCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/financial_connections/accounts"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/financial_connections/accounts"); return ApiResource.requestCollection(url, params, AccountCollection.class, options); } @@ -248,7 +249,8 @@ public static AccountCollection list(AccountListParams params) throws StripeExce /** Returns a list of Financial Connections Account objects. */ public static AccountCollection list(AccountListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/financial_connections/accounts"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/financial_connections/accounts"); return ApiResource.requestCollection(url, params, AccountCollection.class, options); } @@ -261,9 +263,9 @@ public AccountOwnerCollection listOwners(Map params) throws Stri public AccountOwnerCollection listOwners(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s/owners", ApiResource.urlEncodeId(this.getId()))); @@ -279,9 +281,9 @@ public AccountOwnerCollection listOwners(AccountListOwnersParams params) throws public AccountOwnerCollection listOwners(AccountListOwnersParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s/owners", ApiResource.urlEncodeId(this.getId()))); @@ -298,9 +300,9 @@ public com.stripe.model.financialconnections.Account refresh(Map public com.stripe.model.financialconnections.Account refresh( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s/refresh", ApiResource.urlEncodeId(this.getId()))); @@ -322,9 +324,9 @@ public com.stripe.model.financialconnections.Account refresh(AccountRefreshParam public com.stripe.model.financialconnections.Account refresh( AccountRefreshParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s/refresh", ApiResource.urlEncodeId(this.getId()))); @@ -352,9 +354,9 @@ public static com.stripe.model.financialconnections.Account retrieve( public static com.stripe.model.financialconnections.Account retrieve( String account, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s", ApiResource.urlEncodeId(account))); return ApiResource.request( @@ -369,9 +371,9 @@ public static com.stripe.model.financialconnections.Account retrieve( public static com.stripe.model.financialconnections.Account retrieve( String account, AccountRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/accounts/%s", ApiResource.urlEncodeId(account))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/financialconnections/Session.java b/src/main/java/com/stripe/model/financialconnections/Session.java index 98074d9ea51..5efd6f0ae76 100644 --- a/src/main/java/com/stripe/model/financialconnections/Session.java +++ b/src/main/java/com/stripe/model/financialconnections/Session.java @@ -87,7 +87,8 @@ public static Session create(Map params) throws StripeException */ public static Session create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/financial_connections/sessions"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/financial_connections/sessions"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); } @@ -105,7 +106,8 @@ public static Session create(SessionCreateParams params) throws StripeException */ public static Session create(SessionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/financial_connections/sessions"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/financial_connections/sessions"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Session.class, options); } @@ -123,9 +125,9 @@ public static Session retrieve(String session, RequestOptions options) throws St public static Session retrieve(String session, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/sessions/%s", ApiResource.urlEncodeId(session))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Session.class, options); @@ -135,9 +137,9 @@ public static Session retrieve(String session, Map params, Reque public static Session retrieve( String session, SessionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/financial_connections/sessions/%s", ApiResource.urlEncodeId(session))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Session.class, options); diff --git a/src/main/java/com/stripe/model/identity/VerificationReport.java b/src/main/java/com/stripe/model/identity/VerificationReport.java index e91183cf467..b4a1aa57722 100644 --- a/src/main/java/com/stripe/model/identity/VerificationReport.java +++ b/src/main/java/com/stripe/model/identity/VerificationReport.java @@ -97,7 +97,8 @@ public static VerificationReportCollection list(Map params) /** List all verification reports. */ public static VerificationReportCollection list( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/identity/verification_reports"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/identity/verification_reports"); return ApiResource.requestCollection(url, params, VerificationReportCollection.class, options); } @@ -110,7 +111,8 @@ public static VerificationReportCollection list(VerificationReportListParams par /** List all verification reports. */ public static VerificationReportCollection list( VerificationReportListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/identity/verification_reports"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/identity/verification_reports"); return ApiResource.requestCollection(url, params, VerificationReportCollection.class, options); } @@ -129,9 +131,9 @@ public static VerificationReport retrieve(String report, RequestOptions options) public static VerificationReport retrieve( String report, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/identity/verification_reports/%s", ApiResource.urlEncodeId(report))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, VerificationReport.class, options); @@ -142,9 +144,9 @@ public static VerificationReport retrieve( String report, VerificationReportRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/identity/verification_reports/%s", ApiResource.urlEncodeId(report))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, VerificationReport.class, options); diff --git a/src/main/java/com/stripe/model/identity/VerificationSession.java b/src/main/java/com/stripe/model/identity/VerificationSession.java index e4bfe070c31..58cca0e8d45 100644 --- a/src/main/java/com/stripe/model/identity/VerificationSession.java +++ b/src/main/java/com/stripe/model/identity/VerificationSession.java @@ -209,9 +209,9 @@ public VerificationSession cancel(Map params) throws StripeExcep public VerificationSession cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s/cancel", ApiResource.urlEncodeId(this.getId()))); @@ -240,9 +240,9 @@ public VerificationSession cancel(VerificationSessionCancelParams params) throws public VerificationSession cancel(VerificationSessionCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s/cancel", ApiResource.urlEncodeId(this.getId()))); @@ -280,7 +280,8 @@ public static VerificationSession create(Map params) throws Stri */ public static VerificationSession create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/identity/verification_sessions"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/identity/verification_sessions"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, VerificationSession.class, options); } @@ -316,7 +317,8 @@ public static VerificationSession create(VerificationSessionCreateParams params) */ public static VerificationSession create( VerificationSessionCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/identity/verification_sessions"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/identity/verification_sessions"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, VerificationSession.class, options); } @@ -330,7 +332,8 @@ public static VerificationSessionCollection list(Map params) /** Returns a list of VerificationSessions. */ public static VerificationSessionCollection list( Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/identity/verification_sessions"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/identity/verification_sessions"); return ApiResource.requestCollection(url, params, VerificationSessionCollection.class, options); } @@ -343,7 +346,8 @@ public static VerificationSessionCollection list(VerificationSessionListParams p /** Returns a list of VerificationSessions. */ public static VerificationSessionCollection list( VerificationSessionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/identity/verification_sessions"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/identity/verification_sessions"); return ApiResource.requestCollection(url, params, VerificationSessionCollection.class, options); } @@ -450,9 +454,9 @@ public VerificationSession redact(Map params) throws StripeExcep public VerificationSession redact(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s/redact", ApiResource.urlEncodeId(this.getId()))); @@ -511,9 +515,9 @@ public VerificationSession redact(VerificationSessionRedactParams params) throws public VerificationSession redact(VerificationSessionRedactParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s/redact", ApiResource.urlEncodeId(this.getId()))); @@ -551,9 +555,9 @@ public static VerificationSession retrieve(String session, RequestOptions option public static VerificationSession retrieve( String session, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s", ApiResource.urlEncodeId(session))); return ApiResource.request( @@ -570,9 +574,9 @@ public static VerificationSession retrieve( String session, VerificationSessionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s", ApiResource.urlEncodeId(session))); return ApiResource.request( @@ -600,9 +604,9 @@ public VerificationSession update(Map params) throws StripeExcep public VerificationSession update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -628,9 +632,9 @@ public VerificationSession update(VerificationSessionUpdateParams params) throws public VerificationSession update(VerificationSessionUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/identity/verification_sessions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/issuing/Authorization.java b/src/main/java/com/stripe/model/issuing/Authorization.java index 3b039c849d4..83553cceea0 100644 --- a/src/main/java/com/stripe/model/issuing/Authorization.java +++ b/src/main/java/com/stripe/model/issuing/Authorization.java @@ -258,9 +258,9 @@ public Authorization approve(Map params) throws StripeException public Authorization approve(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/issuing/authorizations/%s/approve", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -290,9 +290,9 @@ public Authorization approve(AuthorizationApproveParams params) throws StripeExc public Authorization approve(AuthorizationApproveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/issuing/authorizations/%s/approve", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -346,9 +346,9 @@ public Authorization decline(Map params) throws StripeException public Authorization decline(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/issuing/authorizations/%s/decline", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -378,9 +378,9 @@ public Authorization decline(AuthorizationDeclineParams params) throws StripeExc public Authorization decline(AuthorizationDeclineParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/issuing/authorizations/%s/decline", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -401,7 +401,7 @@ public static AuthorizationCollection list(Map params) throws St */ public static AuthorizationCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/authorizations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/authorizations"); return ApiResource.requestCollection(url, params, AuthorizationCollection.class, options); } @@ -420,7 +420,7 @@ public static AuthorizationCollection list(AuthorizationListParams params) */ public static AuthorizationCollection list(AuthorizationListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/authorizations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/authorizations"); return ApiResource.requestCollection(url, params, AuthorizationCollection.class, options); } @@ -440,9 +440,9 @@ public static Authorization retrieve( String authorization, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/authorizations/%s", ApiResource.urlEncodeId(authorization))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Authorization.class, options); @@ -453,9 +453,9 @@ public static Authorization retrieve( String authorization, AuthorizationRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/authorizations/%s", ApiResource.urlEncodeId(authorization))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Authorization.class, options); @@ -478,9 +478,9 @@ public Authorization update(Map params) throws StripeException { public Authorization update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/authorizations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Authorization.class, options); @@ -501,9 +501,9 @@ public Authorization update(AuthorizationUpdateParams params) throws StripeExcep public Authorization update(AuthorizationUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/authorizations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Authorization.class, options); diff --git a/src/main/java/com/stripe/model/issuing/Card.java b/src/main/java/com/stripe/model/issuing/Card.java index 3c09a3ba65b..b34a887e3d4 100644 --- a/src/main/java/com/stripe/model/issuing/Card.java +++ b/src/main/java/com/stripe/model/issuing/Card.java @@ -225,7 +225,7 @@ public static Card create(Map params) throws StripeException { /** Creates an Issuing Card object. */ public static Card create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cards"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cards"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Card.class, options); } @@ -237,7 +237,7 @@ public static Card create(CardCreateParams params) throws StripeException { /** Creates an Issuing Card object. */ public static Card create(CardCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cards"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cards"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Card.class, options); } @@ -255,7 +255,7 @@ public static CardCollection list(Map params) throws StripeExcep */ public static CardCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cards"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cards"); return ApiResource.requestCollection(url, params, CardCollection.class, options); } @@ -273,7 +273,7 @@ public static CardCollection list(CardListParams params) throws StripeException */ public static CardCollection list(CardListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cards"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cards"); return ApiResource.requestCollection(url, params, CardCollection.class, options); } @@ -291,9 +291,9 @@ public static Card retrieve(String card, RequestOptions options) throws StripeEx public static Card retrieve(String card, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cards/%s", ApiResource.urlEncodeId(card))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Card.class, options); } @@ -302,9 +302,9 @@ public static Card retrieve(String card, Map params, RequestOpti public static Card retrieve(String card, CardRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cards/%s", ApiResource.urlEncodeId(card))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Card.class, options); } @@ -325,9 +325,9 @@ public Card update(Map params) throws StripeException { @Override public Card update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cards/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Card.class, options); } @@ -346,9 +346,9 @@ public Card update(CardUpdateParams params) throws StripeException { */ public Card update(CardUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cards/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Card.class, options); } @@ -604,9 +604,9 @@ public Card deliverCard(Map params) throws StripeException { public Card deliverCard(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/deliver", ApiResource.urlEncodeId(this.resource.getId()))); @@ -628,9 +628,9 @@ public Card deliverCard(CardDeliverCardParams params) throws StripeException { public Card deliverCard(CardDeliverCardParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/deliver", ApiResource.urlEncodeId(this.resource.getId()))); @@ -668,9 +668,9 @@ public Card shipCard(Map params) throws StripeException { public Card shipCard(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/ship", ApiResource.urlEncodeId(this.resource.getId()))); @@ -691,9 +691,9 @@ public Card shipCard(CardShipCardParams params) throws StripeException { */ public Card shipCard(CardShipCardParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/ship", ApiResource.urlEncodeId(this.resource.getId()))); @@ -731,9 +731,9 @@ public Card returnCard(Map params) throws StripeException { public Card returnCard(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/return", ApiResource.urlEncodeId(this.resource.getId()))); @@ -755,9 +755,9 @@ public Card returnCard(CardReturnCardParams params) throws StripeException { public Card returnCard(CardReturnCardParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/return", ApiResource.urlEncodeId(this.resource.getId()))); @@ -795,9 +795,9 @@ public Card failCard(Map params) throws StripeException { public Card failCard(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -818,9 +818,9 @@ public Card failCard(CardFailCardParams params) throws StripeException { */ public Card failCard(CardFailCardParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/issuing/cards/%s/shipping/fail", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/issuing/Cardholder.java b/src/main/java/com/stripe/model/issuing/Cardholder.java index abc2fd9a4b4..4646a07a78f 100644 --- a/src/main/java/com/stripe/model/issuing/Cardholder.java +++ b/src/main/java/com/stripe/model/issuing/Cardholder.java @@ -124,7 +124,7 @@ public static Cardholder create(Map params) throws StripeExcepti /** Creates a new Issuing Cardholder object that can be issued cards. */ public static Cardholder create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cardholders"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cardholders"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Cardholder.class, options); } @@ -137,7 +137,7 @@ public static Cardholder create(CardholderCreateParams params) throws StripeExce /** Creates a new Issuing Cardholder object that can be issued cards. */ public static Cardholder create(CardholderCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cardholders"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cardholders"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Cardholder.class, options); } @@ -156,7 +156,7 @@ public static CardholderCollection list(Map params) throws Strip */ public static CardholderCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cardholders"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cardholders"); return ApiResource.requestCollection(url, params, CardholderCollection.class, options); } @@ -174,7 +174,7 @@ public static CardholderCollection list(CardholderListParams params) throws Stri */ public static CardholderCollection list(CardholderListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/cardholders"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/cardholders"); return ApiResource.requestCollection(url, params, CardholderCollection.class, options); } @@ -194,9 +194,9 @@ public static Cardholder retrieve( String cardholder, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cardholders/%s", ApiResource.urlEncodeId(cardholder))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Cardholder.class, options); @@ -207,9 +207,9 @@ public static Cardholder retrieve( String cardholder, CardholderRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cardholders/%s", ApiResource.urlEncodeId(cardholder))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Cardholder.class, options); @@ -232,9 +232,9 @@ public Cardholder update(Map params) throws StripeException { public Cardholder update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cardholders/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Cardholder.class, options); @@ -255,9 +255,9 @@ public Cardholder update(CardholderUpdateParams params) throws StripeException { public Cardholder update(CardholderUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/cardholders/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Cardholder.class, options); diff --git a/src/main/java/com/stripe/model/issuing/Dispute.java b/src/main/java/com/stripe/model/issuing/Dispute.java index a019b3e01b9..ababed61240 100644 --- a/src/main/java/com/stripe/model/issuing/Dispute.java +++ b/src/main/java/com/stripe/model/issuing/Dispute.java @@ -147,7 +147,7 @@ public static Dispute create(Map params) throws StripeException */ public static Dispute create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/disputes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/disputes"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -171,7 +171,7 @@ public static Dispute create(DisputeCreateParams params) throws StripeException */ public static Dispute create(DisputeCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/disputes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/disputes"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -189,7 +189,7 @@ public static DisputeCollection list(Map params) throws StripeEx */ public static DisputeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/disputes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/disputes"); return ApiResource.requestCollection(url, params, DisputeCollection.class, options); } @@ -207,7 +207,7 @@ public static DisputeCollection list(DisputeListParams params) throws StripeExce */ public static DisputeCollection list(DisputeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/disputes"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/disputes"); return ApiResource.requestCollection(url, params, DisputeCollection.class, options); } @@ -225,9 +225,9 @@ public static Dispute retrieve(String dispute, RequestOptions options) throws St public static Dispute retrieve(String dispute, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/disputes/%s", ApiResource.urlEncodeId(dispute))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Dispute.class, options); } @@ -236,9 +236,9 @@ public static Dispute retrieve(String dispute, Map params, Reque public static Dispute retrieve( String dispute, DisputeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/disputes/%s", ApiResource.urlEncodeId(dispute))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Dispute.class, options); } @@ -281,9 +281,9 @@ public Dispute submit(Map params) throws StripeException { */ public Dispute submit(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/disputes/%s/submit", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -306,9 +306,9 @@ public Dispute submit(DisputeSubmitParams params) throws StripeException { */ public Dispute submit(DisputeSubmitParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/disputes/%s/submit", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -331,9 +331,9 @@ public Dispute update(Map params) throws StripeException { @Override public Dispute update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/disputes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } @@ -354,9 +354,9 @@ public Dispute update(DisputeUpdateParams params) throws StripeException { */ public Dispute update(DisputeUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/disputes/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Dispute.class, options); } diff --git a/src/main/java/com/stripe/model/issuing/Transaction.java b/src/main/java/com/stripe/model/issuing/Transaction.java index 65d76b0effb..68cca0f956f 100644 --- a/src/main/java/com/stripe/model/issuing/Transaction.java +++ b/src/main/java/com/stripe/model/issuing/Transaction.java @@ -269,7 +269,7 @@ public static TransactionCollection list(Map params) throws Stri */ public static TransactionCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/transactions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/transactions"); return ApiResource.requestCollection(url, params, TransactionCollection.class, options); } @@ -287,7 +287,7 @@ public static TransactionCollection list(TransactionListParams params) throws St */ public static TransactionCollection list(TransactionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/issuing/transactions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/issuing/transactions"); return ApiResource.requestCollection(url, params, TransactionCollection.class, options); } @@ -307,9 +307,9 @@ public static Transaction retrieve( String transaction, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/transactions/%s", ApiResource.urlEncodeId(transaction))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Transaction.class, options); @@ -320,9 +320,9 @@ public static Transaction retrieve( String transaction, TransactionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/transactions/%s", ApiResource.urlEncodeId(transaction))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Transaction.class, options); @@ -345,9 +345,9 @@ public Transaction update(Map params) throws StripeException { public Transaction update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/transactions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Transaction.class, options); @@ -368,9 +368,9 @@ public Transaction update(TransactionUpdateParams params) throws StripeException public Transaction update(TransactionUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/issuing/transactions/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Transaction.class, options); diff --git a/src/main/java/com/stripe/model/radar/EarlyFraudWarning.java b/src/main/java/com/stripe/model/radar/EarlyFraudWarning.java index 5eefbfffcbe..08430c772df 100644 --- a/src/main/java/com/stripe/model/radar/EarlyFraudWarning.java +++ b/src/main/java/com/stripe/model/radar/EarlyFraudWarning.java @@ -126,7 +126,8 @@ public static EarlyFraudWarningCollection list(Map params) /** Returns a list of early fraud warnings. */ public static EarlyFraudWarningCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/early_fraud_warnings"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/early_fraud_warnings"); return ApiResource.requestCollection(url, params, EarlyFraudWarningCollection.class, options); } @@ -139,7 +140,8 @@ public static EarlyFraudWarningCollection list(EarlyFraudWarningListParams param /** Returns a list of early fraud warnings. */ public static EarlyFraudWarningCollection list( EarlyFraudWarningListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/early_fraud_warnings"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/early_fraud_warnings"); return ApiResource.requestCollection(url, params, EarlyFraudWarningCollection.class, options); } @@ -174,9 +176,9 @@ public static EarlyFraudWarning retrieve( String earlyFraudWarning, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/radar/early_fraud_warnings/%s", ApiResource.urlEncodeId(earlyFraudWarning))); return ApiResource.request( @@ -193,9 +195,9 @@ public static EarlyFraudWarning retrieve( String earlyFraudWarning, EarlyFraudWarningRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/radar/early_fraud_warnings/%s", ApiResource.urlEncodeId(earlyFraudWarning))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/radar/ValueList.java b/src/main/java/com/stripe/model/radar/ValueList.java index 8d76426d4d3..c5d3d9f24df 100644 --- a/src/main/java/com/stripe/model/radar/ValueList.java +++ b/src/main/java/com/stripe/model/radar/ValueList.java @@ -96,7 +96,7 @@ public static ValueList create(Map params) throws StripeExceptio /** Creates a new ValueList object, which can then be referenced in rules. */ public static ValueList create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_lists"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_lists"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ValueList.class, options); } @@ -109,7 +109,7 @@ public static ValueList create(ValueListCreateParams params) throws StripeExcept /** Creates a new ValueList object, which can then be referenced in rules. */ public static ValueList create(ValueListCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_lists"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_lists"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ValueList.class, options); } @@ -145,9 +145,9 @@ public ValueList delete(Map params) throws StripeException { public ValueList delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_lists/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, ValueList.class, options); @@ -167,7 +167,7 @@ public static ValueListCollection list(Map params) throws Stripe */ public static ValueListCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_lists"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_lists"); return ApiResource.requestCollection(url, params, ValueListCollection.class, options); } @@ -185,7 +185,7 @@ public static ValueListCollection list(ValueListListParams params) throws Stripe */ public static ValueListCollection list(ValueListListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_lists"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_lists"); return ApiResource.requestCollection(url, params, ValueListCollection.class, options); } @@ -204,9 +204,9 @@ public static ValueList retrieve(String valueList, RequestOptions options) public static ValueList retrieve( String valueList, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_lists/%s", ApiResource.urlEncodeId(valueList))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ValueList.class, options); @@ -217,9 +217,9 @@ public static ValueList retrieve( String valueList, ValueListRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_lists/%s", ApiResource.urlEncodeId(valueList))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ValueList.class, options); @@ -242,9 +242,9 @@ public ValueList update(Map params) throws StripeException { public ValueList update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_lists/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ValueList.class, options); @@ -265,9 +265,9 @@ public ValueList update(ValueListUpdateParams params) throws StripeException { public ValueList update(ValueListUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_lists/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ValueList.class, options); diff --git a/src/main/java/com/stripe/model/radar/ValueListItem.java b/src/main/java/com/stripe/model/radar/ValueListItem.java index c963abb40a4..e87b89894cd 100644 --- a/src/main/java/com/stripe/model/radar/ValueListItem.java +++ b/src/main/java/com/stripe/model/radar/ValueListItem.java @@ -80,7 +80,7 @@ public static ValueListItem create(Map params) throws StripeExce */ public static ValueListItem create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_list_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_list_items"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ValueListItem.class, options); } @@ -99,7 +99,7 @@ public static ValueListItem create(ValueListItemCreateParams params) throws Stri */ public static ValueListItem create(ValueListItemCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_list_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_list_items"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ValueListItem.class, options); } @@ -123,9 +123,9 @@ public ValueListItem delete(Map params) throws StripeException { public ValueListItem delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_list_items/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, ValueListItem.class, options); @@ -145,7 +145,7 @@ public static ValueListItemCollection list(Map params) throws St */ public static ValueListItemCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_list_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_list_items"); return ApiResource.requestCollection(url, params, ValueListItemCollection.class, options); } @@ -164,7 +164,7 @@ public static ValueListItemCollection list(ValueListItemListParams params) */ public static ValueListItemCollection list(ValueListItemListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/radar/value_list_items"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/radar/value_list_items"); return ApiResource.requestCollection(url, params, ValueListItemCollection.class, options); } @@ -182,9 +182,9 @@ public static ValueListItem retrieve(String item, RequestOptions options) throws public static ValueListItem retrieve( String item, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_list_items/%s", ApiResource.urlEncodeId(item))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ValueListItem.class, options); @@ -195,9 +195,9 @@ public static ValueListItem retrieve( String item, ValueListItemRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/radar/value_list_items/%s", ApiResource.urlEncodeId(item))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ValueListItem.class, options); diff --git a/src/main/java/com/stripe/model/reporting/ReportRun.java b/src/main/java/com/stripe/model/reporting/ReportRun.java index d66c9cacc7d..f1a72bba6ab 100644 --- a/src/main/java/com/stripe/model/reporting/ReportRun.java +++ b/src/main/java/com/stripe/model/reporting/ReportRun.java @@ -111,7 +111,7 @@ public static ReportRun create(Map params) throws StripeExceptio */ public static ReportRun create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reporting/report_runs"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reporting/report_runs"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ReportRun.class, options); } @@ -130,7 +130,7 @@ public static ReportRun create(ReportRunCreateParams params) throws StripeExcept */ public static ReportRun create(ReportRunCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reporting/report_runs"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reporting/report_runs"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ReportRun.class, options); } @@ -143,7 +143,7 @@ public static ReportRunCollection list(Map params) throws Stripe /** Returns a list of Report Runs, with the most recent appearing first. */ public static ReportRunCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reporting/report_runs"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reporting/report_runs"); return ApiResource.requestCollection(url, params, ReportRunCollection.class, options); } @@ -155,7 +155,7 @@ public static ReportRunCollection list(ReportRunListParams params) throws Stripe /** Returns a list of Report Runs, with the most recent appearing first. */ public static ReportRunCollection list(ReportRunListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reporting/report_runs"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reporting/report_runs"); return ApiResource.requestCollection(url, params, ReportRunCollection.class, options); } @@ -174,9 +174,9 @@ public static ReportRun retrieve(String reportRun, RequestOptions options) public static ReportRun retrieve( String reportRun, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/reporting/report_runs/%s", ApiResource.urlEncodeId(reportRun))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReportRun.class, options); @@ -187,9 +187,9 @@ public static ReportRun retrieve( String reportRun, ReportRunRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/reporting/report_runs/%s", ApiResource.urlEncodeId(reportRun))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReportRun.class, options); diff --git a/src/main/java/com/stripe/model/reporting/ReportType.java b/src/main/java/com/stripe/model/reporting/ReportType.java index b2fd1e69486..df32b018daa 100644 --- a/src/main/java/com/stripe/model/reporting/ReportType.java +++ b/src/main/java/com/stripe/model/reporting/ReportType.java @@ -97,7 +97,7 @@ public static ReportTypeCollection list(Map params) throws Strip /** Returns a full list of Report Types. */ public static ReportTypeCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reporting/report_types"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reporting/report_types"); return ApiResource.requestCollection(url, params, ReportTypeCollection.class, options); } @@ -109,7 +109,7 @@ public static ReportTypeCollection list(ReportTypeListParams params) throws Stri /** Returns a full list of Report Types. */ public static ReportTypeCollection list(ReportTypeListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/reporting/report_types"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/reporting/report_types"); return ApiResource.requestCollection(url, params, ReportTypeCollection.class, options); } @@ -138,9 +138,9 @@ public static ReportType retrieve( String reportType, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/reporting/report_types/%s", ApiResource.urlEncodeId(reportType))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReportType.class, options); @@ -154,9 +154,9 @@ public static ReportType retrieve( String reportType, ReportTypeRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/reporting/report_types/%s", ApiResource.urlEncodeId(reportType))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReportType.class, options); diff --git a/src/main/java/com/stripe/model/sigma/ScheduledQueryRun.java b/src/main/java/com/stripe/model/sigma/ScheduledQueryRun.java index f5e5ae276fd..9b99ff74bab 100644 --- a/src/main/java/com/stripe/model/sigma/ScheduledQueryRun.java +++ b/src/main/java/com/stripe/model/sigma/ScheduledQueryRun.java @@ -89,7 +89,8 @@ public static ScheduledQueryRunCollection list(Map params) /** Returns a list of scheduled query runs. */ public static ScheduledQueryRunCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/sigma/scheduled_query_runs"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/sigma/scheduled_query_runs"); return ApiResource.requestCollection(url, params, ScheduledQueryRunCollection.class, options); } @@ -102,7 +103,8 @@ public static ScheduledQueryRunCollection list(ScheduledQueryRunListParams param /** Returns a list of scheduled query runs. */ public static ScheduledQueryRunCollection list( ScheduledQueryRunListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/sigma/scheduled_query_runs"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/sigma/scheduled_query_runs"); return ApiResource.requestCollection(url, params, ScheduledQueryRunCollection.class, options); } @@ -122,9 +124,9 @@ public static ScheduledQueryRun retrieve( String scheduledQueryRun, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/sigma/scheduled_query_runs/%s", ApiResource.urlEncodeId(scheduledQueryRun))); return ApiResource.request( @@ -136,9 +138,9 @@ public static ScheduledQueryRun retrieve( String scheduledQueryRun, ScheduledQueryRunRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/sigma/scheduled_query_runs/%s", ApiResource.urlEncodeId(scheduledQueryRun))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/terminal/Configuration.java b/src/main/java/com/stripe/model/terminal/Configuration.java index 3b77805622e..225903c0c03 100644 --- a/src/main/java/com/stripe/model/terminal/Configuration.java +++ b/src/main/java/com/stripe/model/terminal/Configuration.java @@ -70,7 +70,7 @@ public static Configuration create(Map params) throws StripeExce /** Creates a new Configuration object. */ public static Configuration create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/configurations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/configurations"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Configuration.class, options); } @@ -83,7 +83,7 @@ public static Configuration create(ConfigurationCreateParams params) throws Stri /** Creates a new Configuration object. */ public static Configuration create(ConfigurationCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/configurations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/configurations"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Configuration.class, options); } @@ -107,9 +107,9 @@ public Configuration delete(Map params) throws StripeException { public Configuration delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/configurations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Configuration.class, options); @@ -123,7 +123,7 @@ public static ConfigurationCollection list(Map params) throws St /** Returns a list of Configuration objects. */ public static ConfigurationCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/configurations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/configurations"); return ApiResource.requestCollection(url, params, ConfigurationCollection.class, options); } @@ -136,7 +136,7 @@ public static ConfigurationCollection list(ConfigurationListParams params) /** Returns a list of Configuration objects. */ public static ConfigurationCollection list(ConfigurationListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/configurations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/configurations"); return ApiResource.requestCollection(url, params, ConfigurationCollection.class, options); } @@ -156,9 +156,9 @@ public static Configuration retrieve( String configuration, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/configurations/%s", ApiResource.urlEncodeId(configuration))); return ApiResource.request( @@ -170,9 +170,9 @@ public static Configuration retrieve( String configuration, ConfigurationRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/configurations/%s", ApiResource.urlEncodeId(configuration))); return ApiResource.request( @@ -188,9 +188,9 @@ public Configuration update(Map params) throws StripeException { public Configuration update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/configurations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Configuration.class, options); @@ -205,9 +205,9 @@ public Configuration update(ConfigurationUpdateParams params) throws StripeExcep public Configuration update(ConfigurationUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/configurations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Configuration.class, options); diff --git a/src/main/java/com/stripe/model/terminal/ConnectionToken.java b/src/main/java/com/stripe/model/terminal/ConnectionToken.java index c9079dae37e..c4ddf90f216 100644 --- a/src/main/java/com/stripe/model/terminal/ConnectionToken.java +++ b/src/main/java/com/stripe/model/terminal/ConnectionToken.java @@ -59,7 +59,8 @@ public static ConnectionToken create(Map params) throws StripeEx */ public static ConnectionToken create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/connection_tokens"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/connection_tokens"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ConnectionToken.class, options); } @@ -80,7 +81,8 @@ public static ConnectionToken create(ConnectionTokenCreateParams params) throws */ public static ConnectionToken create(ConnectionTokenCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/connection_tokens"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/connection_tokens"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ConnectionToken.class, options); } diff --git a/src/main/java/com/stripe/model/terminal/Location.java b/src/main/java/com/stripe/model/terminal/Location.java index a1a362d96b2..62bcc62c69c 100644 --- a/src/main/java/com/stripe/model/terminal/Location.java +++ b/src/main/java/com/stripe/model/terminal/Location.java @@ -88,7 +88,7 @@ public static Location create(Map params) throws StripeException */ public static Location create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/locations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/locations"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Location.class, options); } @@ -109,7 +109,7 @@ public static Location create(LocationCreateParams params) throws StripeExceptio */ public static Location create(LocationCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/locations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/locations"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Location.class, options); } @@ -133,9 +133,9 @@ public Location delete(Map params) throws StripeException { public Location delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/locations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Location.class, options); @@ -149,7 +149,7 @@ public static LocationCollection list(Map params) throws StripeE /** Returns a list of Location objects. */ public static LocationCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/locations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/locations"); return ApiResource.requestCollection(url, params, LocationCollection.class, options); } @@ -161,7 +161,7 @@ public static LocationCollection list(LocationListParams params) throws StripeEx /** Returns a list of Location objects. */ public static LocationCollection list(LocationListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/locations"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/locations"); return ApiResource.requestCollection(url, params, LocationCollection.class, options); } @@ -179,9 +179,9 @@ public static Location retrieve(String location, RequestOptions options) throws public static Location retrieve( String location, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/locations/%s", ApiResource.urlEncodeId(location))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Location.class, options); } @@ -191,9 +191,9 @@ public static Location retrieve( String location, LocationRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/locations/%s", ApiResource.urlEncodeId(location))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Location.class, options); } @@ -215,9 +215,9 @@ public Location update(Map params) throws StripeException { public Location update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/locations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Location.class, options); @@ -238,9 +238,9 @@ public Location update(LocationUpdateParams params) throws StripeException { public Location update(LocationUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/locations/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, Location.class, options); diff --git a/src/main/java/com/stripe/model/terminal/Reader.java b/src/main/java/com/stripe/model/terminal/Reader.java index 819e6c45138..45dc42bda1a 100644 --- a/src/main/java/com/stripe/model/terminal/Reader.java +++ b/src/main/java/com/stripe/model/terminal/Reader.java @@ -144,9 +144,9 @@ public Reader cancelAction(Map params) throws StripeException { public Reader cancelAction(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/cancel_action", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Reader.class, options); @@ -161,9 +161,9 @@ public Reader cancelAction(ReaderCancelActionParams params) throws StripeExcepti public Reader cancelAction(ReaderCancelActionParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/cancel_action", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Reader.class, options); @@ -177,7 +177,7 @@ public static Reader create(Map params) throws StripeException { /** Creates a new Reader object. */ public static Reader create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/readers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/readers"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Reader.class, options); } @@ -189,7 +189,7 @@ public static Reader create(ReaderCreateParams params) throws StripeException { /** Creates a new Reader object. */ public static Reader create(ReaderCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/readers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/readers"); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Reader.class, options); } @@ -211,9 +211,9 @@ public Reader delete(Map params) throws StripeException { /** Deletes a Reader object. */ public Reader delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/readers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( ApiResource.RequestMethod.DELETE, url, params, Reader.class, options); @@ -227,7 +227,7 @@ public static ReaderCollection list(Map params) throws StripeExc /** Returns a list of Reader objects. */ public static ReaderCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/readers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/readers"); return ApiResource.requestCollection(url, params, ReaderCollection.class, options); } @@ -239,7 +239,7 @@ public static ReaderCollection list(ReaderListParams params) throws StripeExcept /** Returns a list of Reader objects. */ public static ReaderCollection list(ReaderListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/terminal/readers"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/terminal/readers"); return ApiResource.requestCollection(url, params, ReaderCollection.class, options); } @@ -252,9 +252,9 @@ public Reader processPaymentIntent(Map params) throws StripeExce public Reader processPaymentIntent(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/process_payment_intent", ApiResource.urlEncodeId(this.getId()))); @@ -271,9 +271,9 @@ public Reader processPaymentIntent(ReaderProcessPaymentIntentParams params) public Reader processPaymentIntent( ReaderProcessPaymentIntentParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/process_payment_intent", ApiResource.urlEncodeId(this.getId()))); @@ -289,9 +289,9 @@ public Reader processSetupIntent(Map params) throws StripeExcept public Reader processSetupIntent(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/process_setup_intent", ApiResource.urlEncodeId(this.getId()))); @@ -307,9 +307,9 @@ public Reader processSetupIntent(ReaderProcessSetupIntentParams params) throws S public Reader processSetupIntent(ReaderProcessSetupIntentParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/process_setup_intent", ApiResource.urlEncodeId(this.getId()))); @@ -330,9 +330,9 @@ public static Reader retrieve(String reader, RequestOptions options) throws Stri public static Reader retrieve(String reader, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/readers/%s", ApiResource.urlEncodeId(reader))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Reader.class, options); } @@ -341,9 +341,9 @@ public static Reader retrieve(String reader, Map params, Request public static Reader retrieve(String reader, ReaderRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/readers/%s", ApiResource.urlEncodeId(reader))); return ApiResource.request(ApiResource.RequestMethod.GET, url, params, Reader.class, options); } @@ -357,9 +357,9 @@ public Reader setReaderDisplay(Map params) throws StripeExceptio public Reader setReaderDisplay(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/set_reader_display", ApiResource.urlEncodeId(this.getId()))); @@ -375,9 +375,9 @@ public Reader setReaderDisplay(ReaderSetReaderDisplayParams params) throws Strip public Reader setReaderDisplay(ReaderSetReaderDisplayParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/terminal/readers/%s/set_reader_display", ApiResource.urlEncodeId(this.getId()))); @@ -400,9 +400,9 @@ public Reader update(Map params) throws StripeException { @Override public Reader update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/readers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Reader.class, options); } @@ -421,9 +421,9 @@ public Reader update(ReaderUpdateParams params) throws StripeException { */ public Reader update(ReaderUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/terminal/readers/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request(ApiResource.RequestMethod.POST, url, params, Reader.class, options); } @@ -686,9 +686,9 @@ public Reader presentPaymentMethod(Map params) throws StripeExce public Reader presentPaymentMethod(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/terminal/readers/%s/present_payment_method", ApiResource.urlEncodeId(this.resource.getId()))); @@ -712,9 +712,9 @@ public Reader presentPaymentMethod(ReaderPresentPaymentMethodParams params) public Reader presentPaymentMethod( ReaderPresentPaymentMethodParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/terminal/readers/%s/present_payment_method", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/testhelpers/TestClock.java b/src/main/java/com/stripe/model/testhelpers/TestClock.java index 29ce66fd9db..aff32ec6db3 100644 --- a/src/main/java/com/stripe/model/testhelpers/TestClock.java +++ b/src/main/java/com/stripe/model/testhelpers/TestClock.java @@ -90,9 +90,9 @@ public TestClock advance(Map params) throws StripeException { public TestClock advance(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/test_clocks/%s/advance", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -114,9 +114,9 @@ public TestClock advance(TestClockAdvanceParams params) throws StripeException { public TestClock advance(TestClockAdvanceParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/test_clocks/%s/advance", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -131,7 +131,7 @@ public static TestClock create(Map params) throws StripeExceptio /** Creates a new test clock that can be attached to new customers and quotes. */ public static TestClock create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/test_clocks"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/test_helpers/test_clocks"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, TestClock.class, options); } @@ -144,7 +144,7 @@ public static TestClock create(TestClockCreateParams params) throws StripeExcept /** Creates a new test clock that can be attached to new customers and quotes. */ public static TestClock create(TestClockCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/test_clocks"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/test_helpers/test_clocks"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, TestClock.class, options); } @@ -168,9 +168,9 @@ public TestClock delete(Map params) throws StripeException { public TestClock delete(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/test_clocks/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -185,7 +185,7 @@ public static TestClockCollection list(Map params) throws Stripe /** Returns a list of your test clocks. */ public static TestClockCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/test_clocks"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/test_helpers/test_clocks"); return ApiResource.requestCollection(url, params, TestClockCollection.class, options); } @@ -197,7 +197,7 @@ public static TestClockCollection list(TestClockListParams params) throws Stripe /** Returns a list of your test clocks. */ public static TestClockCollection list(TestClockListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/test_clocks"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/test_helpers/test_clocks"); return ApiResource.requestCollection(url, params, TestClockCollection.class, options); } @@ -216,9 +216,9 @@ public static TestClock retrieve(String testClock, RequestOptions options) public static TestClock retrieve( String testClock, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/test_helpers/test_clocks/%s", ApiResource.urlEncodeId(testClock))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, TestClock.class, options); @@ -229,9 +229,9 @@ public static TestClock retrieve( String testClock, TestClockRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/test_helpers/test_clocks/%s", ApiResource.urlEncodeId(testClock))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, TestClock.class, options); diff --git a/src/main/java/com/stripe/model/treasury/CreditReversal.java b/src/main/java/com/stripe/model/treasury/CreditReversal.java index 23886a33758..411f331f72d 100644 --- a/src/main/java/com/stripe/model/treasury/CreditReversal.java +++ b/src/main/java/com/stripe/model/treasury/CreditReversal.java @@ -136,7 +136,7 @@ public static CreditReversal create(Map params) throws StripeExc /** Reverses a ReceivedCredit and creates a CreditReversal object. */ public static CreditReversal create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/credit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/credit_reversals"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditReversal.class, options); } @@ -149,7 +149,7 @@ public static CreditReversal create(CreditReversalCreateParams params) throws St /** Reverses a ReceivedCredit and creates a CreditReversal object. */ public static CreditReversal create(CreditReversalCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/credit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/credit_reversals"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, CreditReversal.class, options); } @@ -162,7 +162,7 @@ public static CreditReversalCollection list(Map params) throws S /** Returns a list of CreditReversals. */ public static CreditReversalCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/credit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/credit_reversals"); return ApiResource.requestCollection(url, params, CreditReversalCollection.class, options); } @@ -175,7 +175,7 @@ public static CreditReversalCollection list(CreditReversalListParams params) /** Returns a list of CreditReversals. */ public static CreditReversalCollection list( CreditReversalListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/credit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/credit_reversals"); return ApiResource.requestCollection(url, params, CreditReversalCollection.class, options); } @@ -204,9 +204,9 @@ public static CreditReversal retrieve( String creditReversal, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/credit_reversals/%s", ApiResource.urlEncodeId(creditReversal))); return ApiResource.request( @@ -221,9 +221,9 @@ public static CreditReversal retrieve( String creditReversal, CreditReversalRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/credit_reversals/%s", ApiResource.urlEncodeId(creditReversal))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/treasury/DebitReversal.java b/src/main/java/com/stripe/model/treasury/DebitReversal.java index d239ed14231..b8fff92c897 100644 --- a/src/main/java/com/stripe/model/treasury/DebitReversal.java +++ b/src/main/java/com/stripe/model/treasury/DebitReversal.java @@ -140,7 +140,7 @@ public static DebitReversal create(Map params) throws StripeExce /** Reverses a ReceivedDebit and creates a DebitReversal object. */ public static DebitReversal create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/debit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/debit_reversals"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, DebitReversal.class, options); } @@ -153,7 +153,7 @@ public static DebitReversal create(DebitReversalCreateParams params) throws Stri /** Reverses a ReceivedDebit and creates a DebitReversal object. */ public static DebitReversal create(DebitReversalCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/debit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/debit_reversals"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, DebitReversal.class, options); } @@ -166,7 +166,7 @@ public static DebitReversalCollection list(Map params) throws St /** Returns a list of DebitReversals. */ public static DebitReversalCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/debit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/debit_reversals"); return ApiResource.requestCollection(url, params, DebitReversalCollection.class, options); } @@ -179,7 +179,7 @@ public static DebitReversalCollection list(DebitReversalListParams params) /** Returns a list of DebitReversals. */ public static DebitReversalCollection list(DebitReversalListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/debit_reversals"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/debit_reversals"); return ApiResource.requestCollection(url, params, DebitReversalCollection.class, options); } @@ -199,9 +199,9 @@ public static DebitReversal retrieve( String debitReversal, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/debit_reversals/%s", ApiResource.urlEncodeId(debitReversal))); return ApiResource.request( @@ -213,9 +213,9 @@ public static DebitReversal retrieve( String debitReversal, DebitReversalRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/debit_reversals/%s", ApiResource.urlEncodeId(debitReversal))); return ApiResource.request( diff --git a/src/main/java/com/stripe/model/treasury/FinancialAccount.java b/src/main/java/com/stripe/model/treasury/FinancialAccount.java index 56449cddcc0..bcd8ef685fa 100644 --- a/src/main/java/com/stripe/model/treasury/FinancialAccount.java +++ b/src/main/java/com/stripe/model/treasury/FinancialAccount.java @@ -135,7 +135,8 @@ public static FinancialAccount create(Map params) throws StripeE */ public static FinancialAccount create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/financial_accounts"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/financial_accounts"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FinancialAccount.class, options); } @@ -155,7 +156,8 @@ public static FinancialAccount create(FinancialAccountCreateParams params) */ public static FinancialAccount create(FinancialAccountCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/financial_accounts"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/financial_accounts"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, FinancialAccount.class, options); } @@ -168,7 +170,8 @@ public static FinancialAccountCollection list(Map params) throws /** Returns a list of FinancialAccounts. */ public static FinancialAccountCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/financial_accounts"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/financial_accounts"); return ApiResource.requestCollection(url, params, FinancialAccountCollection.class, options); } @@ -181,7 +184,8 @@ public static FinancialAccountCollection list(FinancialAccountListParams params) /** Returns a list of FinancialAccounts. */ public static FinancialAccountCollection list( FinancialAccountListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/financial_accounts"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/financial_accounts"); return ApiResource.requestCollection(url, params, FinancialAccountCollection.class, options); } @@ -201,9 +205,9 @@ public static FinancialAccount retrieve( String financialAccount, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s", ApiResource.urlEncodeId(financialAccount))); return ApiResource.request( @@ -215,9 +219,9 @@ public static FinancialAccount retrieve( String financialAccount, FinancialAccountRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s", ApiResource.urlEncodeId(financialAccount))); return ApiResource.request( @@ -239,9 +243,9 @@ public FinancialAccountFeatures retrieveFeatures(Map params) public FinancialAccountFeatures retrieveFeatures( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s/features", ApiResource.urlEncodeId(this.getId()))); @@ -260,9 +264,9 @@ public FinancialAccountFeatures retrieveFeatures( FinancialAccountRetrieveFeaturesParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s/features", ApiResource.urlEncodeId(this.getId()))); @@ -281,9 +285,9 @@ public FinancialAccount update(Map params) throws StripeExceptio public FinancialAccount update(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -299,9 +303,9 @@ public FinancialAccount update(FinancialAccountUpdateParams params) throws Strip public FinancialAccount update(FinancialAccountUpdateParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -328,9 +332,9 @@ public FinancialAccountFeatures updateFeatures(Map params) public FinancialAccountFeatures updateFeatures(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s/features", ApiResource.urlEncodeId(this.getId()))); @@ -348,9 +352,9 @@ public FinancialAccountFeatures updateFeatures(FinancialAccountUpdateFeaturesPar public FinancialAccountFeatures updateFeatures( FinancialAccountUpdateFeaturesParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/financial_accounts/%s/features", ApiResource.urlEncodeId(this.getId()))); diff --git a/src/main/java/com/stripe/model/treasury/InboundTransfer.java b/src/main/java/com/stripe/model/treasury/InboundTransfer.java index 8bc51e33024..60e2c709caa 100644 --- a/src/main/java/com/stripe/model/treasury/InboundTransfer.java +++ b/src/main/java/com/stripe/model/treasury/InboundTransfer.java @@ -182,9 +182,9 @@ public InboundTransfer cancel(Map params) throws StripeException public InboundTransfer cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/inbound_transfers/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -200,9 +200,9 @@ public InboundTransfer cancel(InboundTransferCancelParams params) throws StripeE public InboundTransfer cancel(InboundTransferCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/inbound_transfers/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -217,7 +217,8 @@ public static InboundTransfer create(Map params) throws StripeEx /** Creates an InboundTransfer. */ public static InboundTransfer create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/inbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/inbound_transfers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, InboundTransfer.class, options); } @@ -230,7 +231,8 @@ public static InboundTransfer create(InboundTransferCreateParams params) throws /** Creates an InboundTransfer. */ public static InboundTransfer create(InboundTransferCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/inbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/inbound_transfers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, InboundTransfer.class, options); } @@ -243,7 +245,8 @@ public static InboundTransferCollection list(Map params) throws /** Returns a list of InboundTransfers sent from the specified FinancialAccount. */ public static InboundTransferCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/inbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/inbound_transfers"); return ApiResource.requestCollection(url, params, InboundTransferCollection.class, options); } @@ -256,7 +259,8 @@ public static InboundTransferCollection list(InboundTransferListParams params) /** Returns a list of InboundTransfers sent from the specified FinancialAccount. */ public static InboundTransferCollection list( InboundTransferListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/inbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/inbound_transfers"); return ApiResource.requestCollection(url, params, InboundTransferCollection.class, options); } @@ -274,9 +278,9 @@ public static InboundTransfer retrieve(String id, RequestOptions options) throws public static InboundTransfer retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/inbound_transfers/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, InboundTransfer.class, options); @@ -287,9 +291,9 @@ public static InboundTransfer retrieve( String id, InboundTransferRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/inbound_transfers/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, InboundTransfer.class, options); @@ -466,9 +470,9 @@ public InboundTransfer succeed(Map params) throws StripeExceptio public InboundTransfer succeed(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/inbound_transfers/%s/succeed", ApiResource.urlEncodeId(this.resource.getId()))); @@ -491,9 +495,9 @@ public InboundTransfer succeed(InboundTransferSucceedParams params) throws Strip public InboundTransfer succeed(InboundTransferSucceedParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/inbound_transfers/%s/succeed", ApiResource.urlEncodeId(this.resource.getId()))); @@ -532,9 +536,9 @@ public InboundTransfer fail(Map params) throws StripeException { public InboundTransfer fail(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/inbound_transfers/%s/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -557,9 +561,9 @@ public InboundTransfer fail(InboundTransferFailParams params) throws StripeExcep public InboundTransfer fail(InboundTransferFailParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/inbound_transfers/%s/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -599,9 +603,9 @@ public InboundTransfer returnInboundTransfer(Map params) public InboundTransfer returnInboundTransfer(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/inbound_transfers/%s/return", ApiResource.urlEncodeId(this.resource.getId()))); @@ -626,9 +630,9 @@ public InboundTransfer returnInboundTransfer( InboundTransferReturnInboundTransferParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/inbound_transfers/%s/return", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/treasury/OutboundPayment.java b/src/main/java/com/stripe/model/treasury/OutboundPayment.java index 424bbaa9638..cbd4b88675c 100644 --- a/src/main/java/com/stripe/model/treasury/OutboundPayment.java +++ b/src/main/java/com/stripe/model/treasury/OutboundPayment.java @@ -196,9 +196,9 @@ public OutboundPayment cancel(Map params) throws StripeException public OutboundPayment cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/outbound_payments/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -214,9 +214,9 @@ public OutboundPayment cancel(OutboundPaymentCancelParams params) throws StripeE public OutboundPayment cancel(OutboundPaymentCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/outbound_payments/%s/cancel", ApiResource.urlEncodeId(this.getId()))); return ApiResource.request( @@ -231,7 +231,8 @@ public static OutboundPayment create(Map params) throws StripeEx /** Creates an OutboundPayment. */ public static OutboundPayment create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_payments"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_payments"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, OutboundPayment.class, options); } @@ -244,7 +245,8 @@ public static OutboundPayment create(OutboundPaymentCreateParams params) throws /** Creates an OutboundPayment. */ public static OutboundPayment create(OutboundPaymentCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_payments"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_payments"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, OutboundPayment.class, options); } @@ -257,7 +259,8 @@ public static OutboundPaymentCollection list(Map params) throws /** Returns a list of OutboundPayments sent from the specified FinancialAccount. */ public static OutboundPaymentCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_payments"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_payments"); return ApiResource.requestCollection(url, params, OutboundPaymentCollection.class, options); } @@ -270,7 +273,8 @@ public static OutboundPaymentCollection list(OutboundPaymentListParams params) /** Returns a list of OutboundPayments sent from the specified FinancialAccount. */ public static OutboundPaymentCollection list( OutboundPaymentListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_payments"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_payments"); return ApiResource.requestCollection(url, params, OutboundPaymentCollection.class, options); } @@ -297,9 +301,9 @@ public static OutboundPayment retrieve(String id, RequestOptions options) throws public static OutboundPayment retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/outbound_payments/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, OutboundPayment.class, options); @@ -313,9 +317,9 @@ public static OutboundPayment retrieve( String id, OutboundPaymentRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/outbound_payments/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, OutboundPayment.class, options); @@ -549,9 +553,9 @@ public OutboundPayment fail(Map params) throws StripeException { public OutboundPayment fail(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_payments/%s/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -574,9 +578,9 @@ public OutboundPayment fail(OutboundPaymentFailParams params) throws StripeExcep public OutboundPayment fail(OutboundPaymentFailParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_payments/%s/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -615,9 +619,9 @@ public OutboundPayment post(Map params) throws StripeException { public OutboundPayment post(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_payments/%s/post", ApiResource.urlEncodeId(this.resource.getId()))); @@ -640,9 +644,9 @@ public OutboundPayment post(OutboundPaymentPostParams params) throws StripeExcep public OutboundPayment post(OutboundPaymentPostParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_payments/%s/post", ApiResource.urlEncodeId(this.resource.getId()))); @@ -682,9 +686,9 @@ public OutboundPayment returnOutboundPayment(Map params) public OutboundPayment returnOutboundPayment(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_payments/%s/return", ApiResource.urlEncodeId(this.resource.getId()))); @@ -709,9 +713,9 @@ public OutboundPayment returnOutboundPayment( OutboundPaymentReturnOutboundPaymentParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_payments/%s/return", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/treasury/OutboundTransfer.java b/src/main/java/com/stripe/model/treasury/OutboundTransfer.java index 0a63532d180..9200b397e41 100644 --- a/src/main/java/com/stripe/model/treasury/OutboundTransfer.java +++ b/src/main/java/com/stripe/model/treasury/OutboundTransfer.java @@ -179,9 +179,9 @@ public OutboundTransfer cancel(Map params) throws StripeExceptio public OutboundTransfer cancel(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/outbound_transfers/%s/cancel", ApiResource.urlEncodeId(this.getId()))); @@ -198,9 +198,9 @@ public OutboundTransfer cancel(OutboundTransferCancelParams params) throws Strip public OutboundTransfer cancel(OutboundTransferCancelParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/outbound_transfers/%s/cancel", ApiResource.urlEncodeId(this.getId()))); @@ -216,7 +216,8 @@ public static OutboundTransfer create(Map params) throws StripeE /** Creates an OutboundTransfer. */ public static OutboundTransfer create(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_transfers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, OutboundTransfer.class, options); } @@ -230,7 +231,8 @@ public static OutboundTransfer create(OutboundTransferCreateParams params) /** Creates an OutboundTransfer. */ public static OutboundTransfer create(OutboundTransferCreateParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_transfers"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, OutboundTransfer.class, options); } @@ -243,7 +245,8 @@ public static OutboundTransferCollection list(Map params) throws /** Returns a list of OutboundTransfers sent from the specified FinancialAccount. */ public static OutboundTransferCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_transfers"); return ApiResource.requestCollection(url, params, OutboundTransferCollection.class, options); } @@ -256,7 +259,8 @@ public static OutboundTransferCollection list(OutboundTransferListParams params) /** Returns a list of OutboundTransfers sent from the specified FinancialAccount. */ public static OutboundTransferCollection list( OutboundTransferListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/outbound_transfers"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/outbound_transfers"); return ApiResource.requestCollection(url, params, OutboundTransferCollection.class, options); } @@ -285,9 +289,9 @@ public static OutboundTransfer retrieve( String outboundTransfer, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/outbound_transfers/%s", ApiResource.urlEncodeId(outboundTransfer))); return ApiResource.request( @@ -302,9 +306,9 @@ public static OutboundTransfer retrieve( String outboundTransfer, OutboundTransferRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/treasury/outbound_transfers/%s", ApiResource.urlEncodeId(outboundTransfer))); return ApiResource.request( @@ -498,9 +502,9 @@ public OutboundTransfer fail(Map params) throws StripeException public OutboundTransfer fail(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_transfers/%s/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -523,9 +527,9 @@ public OutboundTransfer fail(OutboundTransferFailParams params) throws StripeExc public OutboundTransfer fail(OutboundTransferFailParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_transfers/%s/fail", ApiResource.urlEncodeId(this.resource.getId()))); @@ -564,9 +568,9 @@ public OutboundTransfer post(Map params) throws StripeException public OutboundTransfer post(Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_transfers/%s/post", ApiResource.urlEncodeId(this.resource.getId()))); @@ -589,9 +593,9 @@ public OutboundTransfer post(OutboundTransferPostParams params) throws StripeExc public OutboundTransfer post(OutboundTransferPostParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_transfers/%s/post", ApiResource.urlEncodeId(this.resource.getId()))); @@ -631,9 +635,9 @@ public OutboundTransfer returnOutboundTransfer(Map params) public OutboundTransfer returnOutboundTransfer( Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_transfers/%s/return", ApiResource.urlEncodeId(this.resource.getId()))); @@ -658,9 +662,9 @@ public OutboundTransfer returnOutboundTransfer( OutboundTransferReturnOutboundTransferParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format( "/v1/test_helpers/treasury/outbound_transfers/%s/return", ApiResource.urlEncodeId(this.resource.getId()))); diff --git a/src/main/java/com/stripe/model/treasury/ReceivedCredit.java b/src/main/java/com/stripe/model/treasury/ReceivedCredit.java index ae3c3e8da92..a912abd556e 100644 --- a/src/main/java/com/stripe/model/treasury/ReceivedCredit.java +++ b/src/main/java/com/stripe/model/treasury/ReceivedCredit.java @@ -148,7 +148,7 @@ public static ReceivedCreditCollection list(Map params) throws S /** Returns a list of ReceivedCredits. */ public static ReceivedCreditCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/received_credits"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/received_credits"); return ApiResource.requestCollection(url, params, ReceivedCreditCollection.class, options); } @@ -161,7 +161,7 @@ public static ReceivedCreditCollection list(ReceivedCreditListParams params) /** Returns a list of ReceivedCredits. */ public static ReceivedCreditCollection list( ReceivedCreditListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/received_credits"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/received_credits"); return ApiResource.requestCollection(url, params, ReceivedCreditCollection.class, options); } @@ -188,9 +188,9 @@ public static ReceivedCredit retrieve(String id, RequestOptions options) throws public static ReceivedCredit retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/received_credits/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReceivedCredit.class, options); @@ -204,9 +204,9 @@ public static ReceivedCredit retrieve( String id, ReceivedCreditRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/received_credits/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReceivedCredit.class, options); @@ -429,7 +429,8 @@ public static ReceivedCredit create(Map params) throws StripeExc public static ReceivedCredit create(Map params, RequestOptions options) throws StripeException { String url = - String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/treasury/received_credits"); + ApiResource.fullUrl( + Stripe.getApiBase(), options, "/v1/test_helpers/treasury/received_credits"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ReceivedCredit.class, options); } @@ -449,7 +450,8 @@ public static ReceivedCredit create(ReceivedCreditCreateParams params) throws St public static ReceivedCredit create(ReceivedCreditCreateParams params, RequestOptions options) throws StripeException { String url = - String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/treasury/received_credits"); + ApiResource.fullUrl( + Stripe.getApiBase(), options, "/v1/test_helpers/treasury/received_credits"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ReceivedCredit.class, options); } diff --git a/src/main/java/com/stripe/model/treasury/ReceivedDebit.java b/src/main/java/com/stripe/model/treasury/ReceivedDebit.java index c56a3b3f5dc..270dd94a7d2 100644 --- a/src/main/java/com/stripe/model/treasury/ReceivedDebit.java +++ b/src/main/java/com/stripe/model/treasury/ReceivedDebit.java @@ -148,7 +148,7 @@ public static ReceivedDebitCollection list(Map params) throws St /** Returns a list of ReceivedDebits. */ public static ReceivedDebitCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/received_debits"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/received_debits"); return ApiResource.requestCollection(url, params, ReceivedDebitCollection.class, options); } @@ -161,7 +161,7 @@ public static ReceivedDebitCollection list(ReceivedDebitListParams params) /** Returns a list of ReceivedDebits. */ public static ReceivedDebitCollection list(ReceivedDebitListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/received_debits"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/received_debits"); return ApiResource.requestCollection(url, params, ReceivedDebitCollection.class, options); } @@ -188,9 +188,9 @@ public static ReceivedDebit retrieve(String id, RequestOptions options) throws S public static ReceivedDebit retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/received_debits/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReceivedDebit.class, options); @@ -204,9 +204,9 @@ public static ReceivedDebit retrieve( String id, ReceivedDebitRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/received_debits/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, ReceivedDebit.class, options); @@ -366,7 +366,8 @@ public static ReceivedDebit create(Map params) throws StripeExce public static ReceivedDebit create(Map params, RequestOptions options) throws StripeException { String url = - String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/treasury/received_debits"); + ApiResource.fullUrl( + Stripe.getApiBase(), options, "/v1/test_helpers/treasury/received_debits"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ReceivedDebit.class, options); } @@ -386,7 +387,8 @@ public static ReceivedDebit create(ReceivedDebitCreateParams params) throws Stri public static ReceivedDebit create(ReceivedDebitCreateParams params, RequestOptions options) throws StripeException { String url = - String.format("%s%s", Stripe.getApiBase(), "/v1/test_helpers/treasury/received_debits"); + ApiResource.fullUrl( + Stripe.getApiBase(), options, "/v1/test_helpers/treasury/received_debits"); return ApiResource.request( ApiResource.RequestMethod.POST, url, params, ReceivedDebit.class, options); } diff --git a/src/main/java/com/stripe/model/treasury/Transaction.java b/src/main/java/com/stripe/model/treasury/Transaction.java index 1222e6e55b1..aae02285ab9 100644 --- a/src/main/java/com/stripe/model/treasury/Transaction.java +++ b/src/main/java/com/stripe/model/treasury/Transaction.java @@ -115,7 +115,7 @@ public static TransactionCollection list(Map params) throws Stri /** Retrieves a list of Transaction objects. */ public static TransactionCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/transactions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/transactions"); return ApiResource.requestCollection(url, params, TransactionCollection.class, options); } @@ -127,7 +127,7 @@ public static TransactionCollection list(TransactionListParams params) throws St /** Retrieves a list of Transaction objects. */ public static TransactionCollection list(TransactionListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/transactions"); + String url = ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/transactions"); return ApiResource.requestCollection(url, params, TransactionCollection.class, options); } @@ -145,9 +145,9 @@ public static Transaction retrieve(String id, RequestOptions options) throws Str public static Transaction retrieve(String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/transactions/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Transaction.class, options); @@ -157,9 +157,9 @@ public static Transaction retrieve(String id, Map params, Reques public static Transaction retrieve( String id, TransactionRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/transactions/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, Transaction.class, options); diff --git a/src/main/java/com/stripe/model/treasury/TransactionEntry.java b/src/main/java/com/stripe/model/treasury/TransactionEntry.java index 91bfccd227b..22f0e119dc8 100644 --- a/src/main/java/com/stripe/model/treasury/TransactionEntry.java +++ b/src/main/java/com/stripe/model/treasury/TransactionEntry.java @@ -133,7 +133,8 @@ public static TransactionEntryCollection list(Map params) throws /** Retrieves a list of TransactionEntry objects. */ public static TransactionEntryCollection list(Map params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/transaction_entries"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/transaction_entries"); return ApiResource.requestCollection(url, params, TransactionEntryCollection.class, options); } @@ -146,7 +147,8 @@ public static TransactionEntryCollection list(TransactionEntryListParams params) /** Retrieves a list of TransactionEntry objects. */ public static TransactionEntryCollection list( TransactionEntryListParams params, RequestOptions options) throws StripeException { - String url = String.format("%s%s", Stripe.getApiBase(), "/v1/treasury/transaction_entries"); + String url = + ApiResource.fullUrl(Stripe.getApiBase(), options, "/v1/treasury/transaction_entries"); return ApiResource.requestCollection(url, params, TransactionEntryCollection.class, options); } @@ -165,9 +167,9 @@ public static TransactionEntry retrieve(String id, RequestOptions options) public static TransactionEntry retrieve( String id, Map params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/transaction_entries/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, TransactionEntry.class, options); @@ -178,9 +180,9 @@ public static TransactionEntry retrieve( String id, TransactionEntryRetrieveParams params, RequestOptions options) throws StripeException { String url = - String.format( - "%s%s", + ApiResource.fullUrl( Stripe.getApiBase(), + options, String.format("/v1/treasury/transaction_entries/%s", ApiResource.urlEncodeId(id))); return ApiResource.request( ApiResource.RequestMethod.GET, url, params, TransactionEntry.class, options); diff --git a/src/main/java/com/stripe/net/ApiResource.java b/src/main/java/com/stripe/net/ApiResource.java index 8036237b458..ac24e72e43b 100644 --- a/src/main/java/com/stripe/net/ApiResource.java +++ b/src/main/java/com/stripe/net/ApiResource.java @@ -55,6 +55,14 @@ public ReflectionAccessFilter.FilterResult check(Class rawClass) { return builder.create(); } + public static String fullUrl(String defaultBaseUrl, RequestOptions options, String relativeUrl) { + String baseUrl = defaultBaseUrl; + if (options != null && options.getBaseUrl() != null) { + baseUrl = options.getBaseUrl(); + } + return String.format("%s%s", baseUrl, relativeUrl); + } + @Deprecated private static String className(Class clazz) { // Convert CamelCase to snake_case diff --git a/src/main/java/com/stripe/net/RequestOptions.java b/src/main/java/com/stripe/net/RequestOptions.java index c98eee29fb1..5055a780515 100644 --- a/src/main/java/com/stripe/net/RequestOptions.java +++ b/src/main/java/com/stripe/net/RequestOptions.java @@ -12,6 +12,7 @@ public class RequestOptions { private final String clientId; private final String idempotencyKey; private final String stripeAccount; + private final String baseUrl; /** Stripe version always set at {@link Stripe#API_VERSION}. */ private final String stripeVersion = Stripe.API_VERSION; /** @@ -34,6 +35,7 @@ public static RequestOptions getDefault() { null, null, null, + null, Stripe.getConnectTimeout(), Stripe.getReadTimeout(), Stripe.getMaxNetworkRetries(), @@ -47,6 +49,7 @@ private RequestOptions( String idempotencyKey, String stripeAccount, String stripeVersionOverride, + String baseUrl, int connectTimeout, int readTimeout, int maxNetworkRetries, @@ -57,6 +60,7 @@ private RequestOptions( this.idempotencyKey = idempotencyKey; this.stripeAccount = stripeAccount; this.stripeVersionOverride = stripeVersionOverride; + this.baseUrl = baseUrl; this.connectTimeout = connectTimeout; this.readTimeout = readTimeout; this.maxNetworkRetries = maxNetworkRetries; @@ -108,6 +112,10 @@ public PasswordAuthentication getProxyCredential() { return proxyCredential; } + public String getBaseUrl() { + return baseUrl; + } + public static RequestOptionsBuilder builder() { return new RequestOptionsBuilder(); } @@ -155,6 +163,7 @@ public static final class RequestOptionsBuilder { private int maxNetworkRetries; private Proxy connectionProxy; private PasswordAuthentication proxyCredential; + private String baseUrl; /** * Constructs a request options builder with the global parameters (API key and client ID) as @@ -168,6 +177,7 @@ public RequestOptionsBuilder() { this.maxNetworkRetries = Stripe.getMaxNetworkRetries(); this.connectionProxy = Stripe.getConnectionProxy(); this.proxyCredential = Stripe.getProxyCredential(); + this.baseUrl = Stripe.getApiBase(); } public String getApiKey() { @@ -306,6 +316,11 @@ public static RequestOptionsBuilder unsafeSetStripeVersionOverride( return builder; } + public RequestOptionsBuilder setBaseUrl(final String baseUrl) { + this.baseUrl = baseUrl; + return this; + } + /** Constructs a {@link RequestOptions} with the specified values. */ public RequestOptions build() { return new RequestOptions( @@ -314,6 +329,7 @@ public RequestOptions build() { normalizeIdempotencyKey(this.idempotencyKey), normalizeStripeAccount(this.stripeAccount), normalizeStripeVersion(this.stripeVersionOverride), + normalizeBaseUrl(this.baseUrl), connectTimeout, readTimeout, maxNetworkRetries, @@ -358,6 +374,19 @@ private static String normalizeStripeVersion(String stripeVersion) { return normalized; } + private static String normalizeBaseUrl(String baseUrl) { + // null baseUrl is valid, and will fall back to e.g. Stripe.apiBase or Stripe.connectBase + // (depending on the method) + if (baseUrl == null) { + return null; + } + String normalized = baseUrl.trim(); + if (normalized.isEmpty()) { + throw new InvalidRequestOptionsException("Empty baseUrl specified!"); + } + return normalized; + } + private static String normalizeIdempotencyKey(String idempotencyKey) { if (idempotencyKey == null) { return null;