Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change StripeResponseGetter to take a single APIRequest object #1702

Merged
merged 6 commits into from
Jan 10, 2024
Merged

Change StripeResponseGetter to take a single APIRequest object #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03fb2d2
Change StripeResponseGetter to take APIRequest
richardm-stripe Dec 2, 2023
c3e4443
Codegen
richardm-stripe Dec 4, 2023
482b5d6
fix test
richardm-stripe Jan 9, 2024
9c8a98a
Merge branch 'master' into richardm-apirequest
richardm-stripe Jan 9, 2024
8c03e55
BaseApiRequest
richardm-stripe Jan 10, 2024
a2262ab
Address codereview (deprecate, fullurl)
richardm-stripe Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 61 additions & 105 deletions src/main/java/com/stripe/model/Account.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.google.gson.annotations.SerializedName;
import com.stripe.exception.StripeException;
import com.stripe.net.ApiMode;
import com.stripe.net.ApiRequest;
import com.stripe.net.ApiRequestParams;
import com.stripe.net.ApiResource;
import com.stripe.net.BaseAddress;
Expand Down Expand Up @@ -185,15 +186,10 @@ public CapabilityCollection capabilities(Map<String, Object> params, RequestOpti
throws StripeException {
String path =
String.format("/v1/accounts/%s/capabilities", ApiResource.urlEncodeId(this.getId()));
return getResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
params,
CapabilityCollection.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.GET, path, params, options, ApiMode.V1);
return getResponseGetter().request(request, CapabilityCollection.class);
}

/**
Expand All @@ -214,15 +210,15 @@ public CapabilityCollection capabilities(AccountCapabilitiesParams params, Reque
String path =
String.format("/v1/accounts/%s/capabilities", ApiResource.urlEncodeId(this.getId()));
ApiResource.checkNullTypedParams(path, params);
return getResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
ApiRequestParams.paramsToMap(params),
CapabilityCollection.class,
options,
ApiMode.V1);
return getResponseGetter().request(request, CapabilityCollection.class);
}

/**
Expand Down Expand Up @@ -252,15 +248,10 @@ public static Account create(Map<String, Object> params) throws StripeException
public static Account create(Map<String, Object> params, RequestOptions options)
throws StripeException {
String path = "/v1/accounts";
return getGlobalResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
params,
Account.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.POST, path, params, options, ApiMode.V1);
return getGlobalResponseGetter().request(request, Account.class);
}

/**
Expand Down Expand Up @@ -291,15 +282,15 @@ public static Account create(AccountCreateParams params, RequestOptions options)
throws StripeException {
String path = "/v1/accounts";
ApiResource.checkNullTypedParams(path, params);
return getGlobalResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
ApiRequestParams.paramsToMap(params),
Account.class,
options,
ApiMode.V1);
return getGlobalResponseGetter().request(request, Account.class);
}

/**
Expand Down Expand Up @@ -360,15 +351,10 @@ public Account delete(Map<String, Object> params) throws StripeException {
*/
public Account delete(Map<String, Object> params, RequestOptions options) throws StripeException {
String path = String.format("/v1/accounts/%s", ApiResource.urlEncodeId(this.getId()));
return getResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.DELETE,
path,
params,
Account.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.DELETE, path, params, options, ApiMode.V1);
return getResponseGetter().request(request, Account.class);
}

/**
Expand All @@ -388,15 +374,10 @@ public static AccountCollection list(Map<String, Object> params) throws StripeEx
public static AccountCollection list(Map<String, Object> params, RequestOptions options)
throws StripeException {
String path = "/v1/accounts";
return getGlobalResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
params,
AccountCollection.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.GET, path, params, options, ApiMode.V1);
return getGlobalResponseGetter().request(request, AccountCollection.class);
}

/**
Expand All @@ -417,15 +398,15 @@ public static AccountCollection list(AccountListParams params, RequestOptions op
throws StripeException {
String path = "/v1/accounts";
ApiResource.checkNullTypedParams(path, params);
return getGlobalResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
ApiRequestParams.paramsToMap(params),
AccountCollection.class,
options,
ApiMode.V1);
return getGlobalResponseGetter().request(request, AccountCollection.class);
}

/**
Expand All @@ -451,15 +432,10 @@ public PersonCollection persons(Map<String, Object> params) throws StripeExcepti
public PersonCollection persons(Map<String, Object> params, RequestOptions options)
throws StripeException {
String path = String.format("/v1/accounts/%s/persons", ApiResource.urlEncodeId(this.getId()));
return getResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
params,
PersonCollection.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.GET, path, params, options, ApiMode.V1);
return getResponseGetter().request(request, PersonCollection.class);
}

/**
Expand All @@ -478,15 +454,15 @@ public PersonCollection persons(AccountPersonsParams params, RequestOptions opti
throws StripeException {
String path = String.format("/v1/accounts/%s/persons", ApiResource.urlEncodeId(this.getId()));
ApiResource.checkNullTypedParams(path, params);
return getResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
ApiRequestParams.paramsToMap(params),
PersonCollection.class,
options,
ApiMode.V1);
return getResponseGetter().request(request, PersonCollection.class);
}

/**
Expand All @@ -509,15 +485,10 @@ public Account reject(Map<String, Object> params) throws StripeException {
*/
public Account reject(Map<String, Object> params, RequestOptions options) throws StripeException {
String path = String.format("/v1/accounts/%s/reject", ApiResource.urlEncodeId(this.getId()));
return getResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
params,
Account.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.POST, path, params, options, ApiMode.V1);
return getResponseGetter().request(request, Account.class);
}

/**
Expand All @@ -541,15 +512,15 @@ public Account reject(AccountRejectParams params) throws StripeException {
public Account reject(AccountRejectParams params, RequestOptions options) throws StripeException {
String path = String.format("/v1/accounts/%s/reject", ApiResource.urlEncodeId(this.getId()));
ApiResource.checkNullTypedParams(path, params);
return getResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
ApiRequestParams.paramsToMap(params),
Account.class,
options,
ApiMode.V1);
return getResponseGetter().request(request, Account.class);
}

/** Retrieves the details of an account. */
Expand All @@ -566,31 +537,26 @@ public static Account retrieve(RequestOptions options) throws StripeException {
public static Account retrieve(Map<String, Object> params, RequestOptions options)
throws StripeException {
String path = "/v1/account";
return getGlobalResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
params,
Account.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.GET, path, params, options, ApiMode.V1);
return getGlobalResponseGetter().request(request, Account.class);
}

/** Retrieves the details of an account. */
public static Account retrieve(AccountRetrieveParams params, RequestOptions options)
throws StripeException {
String path = "/v1/account";
ApiResource.checkNullTypedParams(path, params);
return getGlobalResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
ApiRequestParams.paramsToMap(params),
Account.class,
options,
ApiMode.V1);
return getGlobalResponseGetter().request(request, Account.class);
}

/** Retrieves the details of an account. */
Expand All @@ -607,31 +573,26 @@ public static Account retrieve(String account, RequestOptions options) throws St
public static Account retrieve(String account, Map<String, Object> params, RequestOptions options)
throws StripeException {
String path = String.format("/v1/accounts/%s", ApiResource.urlEncodeId(account));
return getGlobalResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
params,
Account.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.GET, path, params, options, ApiMode.V1);
return getGlobalResponseGetter().request(request, Account.class);
}

/** Retrieves the details of an account. */
public static Account retrieve(
String account, AccountRetrieveParams params, RequestOptions options) throws StripeException {
String path = String.format("/v1/accounts/%s", ApiResource.urlEncodeId(account));
ApiResource.checkNullTypedParams(path, params);
return getGlobalResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.GET,
path,
ApiRequestParams.paramsToMap(params),
Account.class,
options,
ApiMode.V1);
return getGlobalResponseGetter().request(request, Account.class);
}

/**
Expand Down Expand Up @@ -672,15 +633,10 @@ public Account update(Map<String, Object> params) throws StripeException {
@Override
public Account update(Map<String, Object> params, RequestOptions options) throws StripeException {
String path = String.format("/v1/accounts/%s", ApiResource.urlEncodeId(this.getId()));
return getResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
params,
Account.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.POST, path, params, options, ApiMode.V1);
return getResponseGetter().request(request, Account.class);
}

/**
Expand Down Expand Up @@ -720,15 +676,15 @@ public Account update(AccountUpdateParams params) throws StripeException {
public Account update(AccountUpdateParams params, RequestOptions options) throws StripeException {
String path = String.format("/v1/accounts/%s", ApiResource.urlEncodeId(this.getId()));
ApiResource.checkNullTypedParams(path, params);
return getResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
ApiRequestParams.paramsToMap(params),
Account.class,
options,
ApiMode.V1);
return getResponseGetter().request(request, Account.class);
}

@Getter
Expand Down
20 changes: 8 additions & 12 deletions src/main/java/com/stripe/model/AccountLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.google.gson.annotations.SerializedName;
import com.stripe.exception.StripeException;
import com.stripe.net.ApiMode;
import com.stripe.net.ApiRequest;
import com.stripe.net.ApiRequestParams;
import com.stripe.net.ApiResource;
import com.stripe.net.BaseAddress;
Expand Down Expand Up @@ -60,15 +61,10 @@ public static AccountLink create(Map<String, Object> params) throws StripeExcept
public static AccountLink create(Map<String, Object> params, RequestOptions options)
throws StripeException {
String path = "/v1/account_links";
return getGlobalResponseGetter()
.request(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
params,
AccountLink.class,
options,
ApiMode.V1);
ApiRequest request =
new ApiRequest(
BaseAddress.API, ApiResource.RequestMethod.POST, path, params, options, ApiMode.V1);
return getGlobalResponseGetter().request(request, AccountLink.class);
}

/**
Expand All @@ -87,14 +83,14 @@ public static AccountLink create(AccountLinkCreateParams params, RequestOptions
throws StripeException {
String path = "/v1/account_links";
ApiResource.checkNullTypedParams(path, params);
return getGlobalResponseGetter()
.request(
ApiRequest request =
new ApiRequest(
BaseAddress.API,
ApiResource.RequestMethod.POST,
path,
ApiRequestParams.paramsToMap(params),
AccountLink.class,
options,
ApiMode.V1);
return getGlobalResponseGetter().request(request, AccountLink.class);
}
}
Loading
Loading