Skip to content

Commit

Permalink
Merge branch 'master' into sdk-release/next-major
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	README.md
#	VERSION
#	gradle.properties
#	src/main/java/com/stripe/Stripe.java
  • Loading branch information
pakrym-stripe committed Aug 14, 2023
2 parents e99eb59 + 4c7ed65 commit 5a6c0f7
Show file tree
Hide file tree
Showing 16 changed files with 117 additions and 57 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog


## 23.0.0 - 2023-08-16

### StripeClient
Expand Down Expand Up @@ -42,7 +43,7 @@ To migrate from resource-based to service-based pattern:
// Before
Customer customer = Customer.retrive("cus_123");
customer.delete();

// After
client.customers().delete("cus_123");

Expand Down Expand Up @@ -76,9 +77,10 @@ To migrate from resource-based to service-based pattern:
ApiMode.V1);
```


## 22.30.0 - 2023-08-03
* [#1620](https://github.com/stripe/stripe-java/pull/1620) Update generated code
* Change type of `AccountCreateParams.settings.card_issuing.tos_acceptance.user_agent`, `AccountCreateParams.settings.treasury.tos_acceptance.user_agent`, `AccountUpdateParams.settings.card_issuing.tos_acceptance.user_agent`, `AccountUpdateParams.settings.treasury.tos_acceptance.user_agent`, `InvoiceCreateParams.payment_settings.default_mandate`, `InvoiceCreateParams.shipping_details.phone`, `InvoicePayParams.mandate`, `InvoiceUpdateParams.default_source`, `InvoiceUpdateParams.payment_settings.default_mandate`, `InvoiceUpdateParams.shipping_details.phone`, `PaymentIntentConfirmParams.payment_method_data.billing_details.name`, `PaymentIntentConfirmParams.payment_method_data.billing_details.phone`, `PaymentIntentConfirmParams.payment_method_options.konbini.confirmation_number`, `PaymentIntentConfirmParams.payment_method_options.konbini.product_description`, `PaymentIntentCreateParams.payment_method_data.billing_details.name`, `PaymentIntentCreateParams.payment_method_data.billing_details.phone`, `PaymentIntentCreateParams.payment_method_options.konbini.confirmation_number`, `PaymentIntentCreateParams.payment_method_options.konbini.product_description`, `PaymentIntentUpdateParams.payment_method_data.billing_details.name`, `PaymentIntentUpdateParams.payment_method_data.billing_details.phone`, `PaymentIntentUpdateParams.payment_method_options.konbini.confirmation_number`, `PaymentIntentUpdateParams.payment_method_options.konbini.product_description`, `PaymentMethodCreateParams.billing_details.name`, `PaymentMethodCreateParams.billing_details.phone`, `PaymentMethodUpdateParams.billing_details.name`, `PaymentMethodUpdateParams.billing_details.phone`, `ProductUpdateParams.caption`, `ProductUpdateParams.description`, `ProductUpdateParams.unit_label`, `QuoteCreateParams.description`, `QuoteCreateParams.footer`, `QuoteCreateParams.header`, `QuoteUpdateParams.description`, `QuoteUpdateParams.footer`, `QuoteUpdateParams.header`, `QuoteUpdateParams.subscription_data.description`, `SetupIntentConfirmParams.payment_method_data.billing_details.name`, `SetupIntentConfirmParams.payment_method_data.billing_details.phone`, `SetupIntentCreateParams.payment_method_data.billing_details.name`, `SetupIntentCreateParams.payment_method_data.billing_details.phone`, `SetupIntentUpdateParams.payment_method_data.billing_details.name`, `SetupIntentUpdateParams.payment_method_data.billing_details.phone`, `SubscriptionCancelParams.cancellation_details.comment`, `SubscriptionScheduleCreateParams.default_settings.description`, `SubscriptionScheduleCreateParams.phases[].description`, `SubscriptionScheduleUpdateParams.default_settings.description`, `SubscriptionScheduleUpdateParams.phases[].description`, `SubscriptionUpdateParams.cancellation_details.comment`, `SubscriptionUpdateParams.default_source`, `SubscriptionUpdateParams.description`, `TokenCreateParams.person.documents.company_authorization.files[]`, `TokenCreateParams.person.documents.passport.files[]`, `TokenCreateParams.person.documents.visa.files[]`, `WebhookEndpointCreateParams.description`, `WebhookEndpointUpdateParams.description`, `billingportal.ConfigurationCreateParams.business_profile.headline`, `billingportal.ConfigurationUpdateParams.business_profile.headline`, `issuing.CardholderCreateParams.individual.card_issuing.user_terms_acceptance.user_agent`, `issuing.CardholderUpdateParams.individual.card_issuing.user_terms_acceptance.user_agent`, `issuing.DisputeCreateParams.evidence.canceled.cancellation_reason`, `issuing.DisputeCreateParams.evidence.canceled.explanation`, `issuing.DisputeCreateParams.evidence.canceled.product_description`, `issuing.DisputeCreateParams.evidence.duplicate.explanation`, `issuing.DisputeCreateParams.evidence.fraudulent.explanation`, `issuing.DisputeCreateParams.evidence.merchandise_not_as_described.explanation`, `issuing.DisputeCreateParams.evidence.merchandise_not_as_described.return_description`, `issuing.DisputeCreateParams.evidence.not_received.explanation`, `issuing.DisputeCreateParams.evidence.not_received.product_description`, `issuing.DisputeCreateParams.evidence.other.explanation`, `issuing.DisputeCreateParams.evidence.other.product_description`, `issuing.DisputeCreateParams.evidence.service_not_as_described.cancellation_reason`, `issuing.DisputeCreateParams.evidence.service_not_as_described.explanation`, `issuing.DisputeUpdateParams.evidence.canceled.cancellation_reason`, `issuing.DisputeUpdateParams.evidence.canceled.explanation`, `issuing.DisputeUpdateParams.evidence.canceled.product_description`, `issuing.DisputeUpdateParams.evidence.duplicate.explanation`, `issuing.DisputeUpdateParams.evidence.fraudulent.explanation`, `issuing.DisputeUpdateParams.evidence.merchandise_not_as_described.explanation`, `issuing.DisputeUpdateParams.evidence.merchandise_not_as_described.return_description`, `issuing.DisputeUpdateParams.evidence.not_received.explanation`, `issuing.DisputeUpdateParams.evidence.not_received.product_description`, `issuing.DisputeUpdateParams.evidence.other.explanation`, `issuing.DisputeUpdateParams.evidence.other.product_description`, `issuing.DisputeUpdateParams.evidence.service_not_as_described.cancellation_reason`, `issuing.DisputeUpdateParams.evidence.service_not_as_described.explanation`, `tax.CalculationCreateParams.customer_details.address.city`, `tax.CalculationCreateParams.customer_details.address.line1`, `tax.CalculationCreateParams.customer_details.address.line2`, `tax.CalculationCreateParams.customer_details.address.postal_code`, `tax.CalculationCreateParams.customer_details.address.state`, `terminal.LocationUpdateParams.configuration_overrides`, `terminal.ReaderUpdateParams.label`, `treasury.OutboundPaymentCreateParams.destination_payment_method_data.billing_details.name`, and `treasury.OutboundPaymentCreateParams.destination_payment_method_data.billing_details.phone` from `string` to `emptyStringable(string)`
* Change many types from `string` to `emptyStringable(string)`
* Add support for `subscription_details` on `Invoice`
* Add support for `preferred_settlement_speed` on `PaymentIntent.payment_method_options.us_bank_account`, `PaymentIntentConfirmParams.payment_method_options.us_bank_account`, `PaymentIntentCreateParams.payment_method_options.us_bank_account`, and `PaymentIntentUpdateParams.payment_method_options.us_bank_account`
* Add support for new values `sepa_debit_fingerprint` and `us_bank_account_fingerprint` on enum `radar.ValueListCreateParams.item_type`
Expand Down
2 changes: 1 addition & 1 deletion OPENAPI_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v446
v458
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Stripe Java client library

[![Maven Central](https://img.shields.io/badge/maven--central-v23.0.0-blue)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
[![Maven Central](https://img.shields.io/badge/maven--central-v22.30.0-blue)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
[![JavaDoc](http://img.shields.io/badge/javadoc-reference-blue.svg)](https://stripe.dev/stripe-java)
[![Build Status](https://github.com/stripe/stripe-java/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/stripe/stripe-java/actions?query=branch%3Amaster)
[![Coverage Status](https://coveralls.io/repos/github/stripe/stripe-java/badge.svg?branch=master)](https://coveralls.io/github/stripe/stripe-java?branch=master)
Expand All @@ -18,7 +18,7 @@ The official [Stripe][stripe] Java client library.
Add this dependency to your project's build file:

```groovy
implementation "com.stripe:stripe-java:23.0.0"
implementation "com.stripe:stripe-java:22.30.0"
```

### Maven users
Expand All @@ -29,15 +29,15 @@ Add this dependency to your project's POM:
<dependency>
<groupId>com.stripe</groupId>
<artifactId>stripe-java</artifactId>
<version>23.0.0</version>
<version>22.30.0</version>
</dependency>
```

### Others

You'll need to manually install the following JARs:

- [The Stripe JAR](https://search.maven.org/remotecontent?filepath=com/stripe/stripe-java/23.0.0/stripe-java-23.0.0.jar)
- [The Stripe JAR](https://search.maven.org/remotecontent?filepath=com/stripe/stripe-java/22.30.0/stripe-java-22.30.0.jar)
- [Google Gson][gson] from <https://repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar>.

### [ProGuard][proguard]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23.0.0
22.30.0
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GROUP=com.stripe
VERSION_NAME=23.0.0
VERSION_NAME=22.30.0

POM_URL=https://github.com/stripe/stripe-java
POM_SCM_URL=[email protected]:stripe/stripe-java.git
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/stripe/Stripe.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public abstract class Stripe {
public static final String CONNECT_API_BASE = "https://connect.stripe.com";
public static final String LIVE_API_BASE = "https://api.stripe.com";
public static final String UPLOAD_API_BASE = "https://files.stripe.com";
public static final String VERSION = "23.0.0";
public static final String VERSION = "22.30.0";

public static volatile String apiKey;
public static volatile String clientId;
Expand Down
29 changes: 15 additions & 14 deletions src/main/java/com/stripe/model/Account.java
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public static Account create(AccountCreateParams params, RequestOptions options)
* can only be deleted once all balances are zero.
*
* <p>If you want to delete your own account, use the <a
* href="https://dashboard.stripe.com/account">account information tab in your account
* href="https://dashboard.stripe.com/settings/account">account information tab in your account
* settings</a> instead.
*/
public Account delete() throws StripeException {
Expand All @@ -325,7 +325,7 @@ public Account delete() throws StripeException {
* can only be deleted once all balances are zero.
*
* <p>If you want to delete your own account, use the <a
* href="https://dashboard.stripe.com/account">account information tab in your account
* href="https://dashboard.stripe.com/settings/account">account information tab in your account
* settings</a> instead.
*/
public Account delete(RequestOptions options) throws StripeException {
Expand All @@ -340,7 +340,7 @@ public Account delete(RequestOptions options) throws StripeException {
* can only be deleted once all balances are zero.
*
* <p>If you want to delete your own account, use the <a
* href="https://dashboard.stripe.com/account">account information tab in your account
* href="https://dashboard.stripe.com/settings/account">account information tab in your account
* settings</a> instead.
*/
public Account delete(Map<String, Object> params) throws StripeException {
Expand All @@ -355,7 +355,7 @@ public Account delete(Map<String, Object> params) throws StripeException {
* can only be deleted once all balances are zero.
*
* <p>If you want to delete your own account, use the <a
* href="https://dashboard.stripe.com/account">account information tab in your account
* href="https://dashboard.stripe.com/settings/account">account information tab in your account
* settings</a> instead.
*/
public Account delete(Map<String, Object> params, RequestOptions options) throws StripeException {
Expand Down Expand Up @@ -645,7 +645,7 @@ public static Account retrieve(
* <strong>Custom Only</strong> or <strong>Custom and Express</strong> below.
*
* <p>To update your own account, use the <a
* href="https://dashboard.stripe.com/account">Dashboard</a>. Refer to our <a
* href="https://dashboard.stripe.com/settings/account">Dashboard</a>. Refer to our <a
* href="https://stripe.com/docs/connect/updating-accounts">Connect</a> documentation to learn
* more about updating accounts.
*/
Expand All @@ -665,7 +665,7 @@ public Account update(Map<String, Object> params) throws StripeException {
* <strong>Custom Only</strong> or <strong>Custom and Express</strong> below.
*
* <p>To update your own account, use the <a
* href="https://dashboard.stripe.com/account">Dashboard</a>. Refer to our <a
* href="https://dashboard.stripe.com/settings/account">Dashboard</a>. Refer to our <a
* href="https://stripe.com/docs/connect/updating-accounts">Connect</a> documentation to learn
* more about updating accounts.
*/
Expand Down Expand Up @@ -694,7 +694,7 @@ public Account update(Map<String, Object> params, RequestOptions options) throws
* <strong>Custom Only</strong> or <strong>Custom and Express</strong> below.
*
* <p>To update your own account, use the <a
* href="https://dashboard.stripe.com/account">Dashboard</a>. Refer to our <a
* href="https://dashboard.stripe.com/settings/account">Dashboard</a>. Refer to our <a
* href="https://stripe.com/docs/connect/updating-accounts">Connect</a> documentation to learn
* more about updating accounts.
*/
Expand All @@ -713,7 +713,7 @@ public Account update(AccountUpdateParams params) throws StripeException {
* <strong>Custom Only</strong> or <strong>Custom and Express</strong> below.
*
* <p>To update your own account, use the <a
* href="https://dashboard.stripe.com/account">Dashboard</a>. Refer to our <a
* href="https://dashboard.stripe.com/settings/account">Dashboard</a>. Refer to our <a
* href="https://stripe.com/docs/connect/updating-accounts">Connect</a> documentation to learn
* more about updating accounts.
*/
Expand Down Expand Up @@ -1210,12 +1210,13 @@ public static class Company extends StripeObject {
*
* <p>One of {@code free_zone_establishment}, {@code free_zone_llc}, {@code
* government_instrumentality}, {@code governmental_unit}, {@code incorporated_non_profit},
* {@code limited_liability_partnership}, {@code llc}, {@code multi_member_llc}, {@code
* private_company}, {@code private_corporation}, {@code private_partnership}, {@code
* public_company}, {@code public_corporation}, {@code public_partnership}, {@code
* single_member_llc}, {@code sole_establishment}, {@code sole_proprietorship}, {@code
* tax_exempt_government_instrumentality}, {@code unincorporated_association}, or {@code
* unincorporated_non_profit}.
* {@code incorporated_partnership}, {@code limited_liability_partnership}, {@code llc}, {@code
* multi_member_llc}, {@code private_company}, {@code private_corporation}, {@code
* private_partnership}, {@code public_company}, {@code public_corporation}, {@code
* public_partnership}, {@code single_member_llc}, {@code sole_establishment}, {@code
* sole_proprietorship}, {@code tax_exempt_government_instrumentality}, {@code
* unincorporated_association}, {@code unincorporated_non_profit}, or {@code
* unincorporated_partnership}.
*/
@SerializedName("structure")
String structure;
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/com/stripe/model/BalanceTransaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,25 +116,25 @@ public class BalanceTransaction extends ApiResource implements HasId {
* charge}, {@code connect_collection_transfer}, {@code contribution}, {@code
* issuing_authorization_hold}, {@code issuing_authorization_release}, {@code issuing_dispute},
* {@code issuing_transaction}, {@code payment}, {@code payment_failure_refund}, {@code
* payment_refund}, {@code payout}, {@code payout_cancel}, {@code payout_failure}, {@code refund},
* {@code refund_failure}, {@code reserve_transaction}, {@code reserved_funds}, {@code
* stripe_fee}, {@code stripe_fx_fee}, {@code tax_fee}, {@code topup}, {@code topup_reversal},
* {@code transfer}, {@code transfer_cancel}, {@code transfer_failure}, or {@code
* transfer_refund}. <a href="https://stripe.com/docs/reports/balance-transaction-types">Learn
* more</a> about balance transaction types and what they represent. If you are looking to
* classify transactions for accounting purposes, you might want to consider {@code
* reporting_category} instead.
* payment_refund}, {@code payment_reversal}, {@code payout}, {@code payout_cancel}, {@code
* payout_failure}, {@code refund}, {@code refund_failure}, {@code reserve_transaction}, {@code
* reserved_funds}, {@code stripe_fee}, {@code stripe_fx_fee}, {@code tax_fee}, {@code topup},
* {@code topup_reversal}, {@code transfer}, {@code transfer_cancel}, {@code transfer_failure}, or
* {@code transfer_refund}. <a
* href="https://stripe.com/docs/reports/balance-transaction-types">Learn more</a> about balance
* transaction types and what they represent. If you are looking to classify transactions for
* accounting purposes, you might want to consider {@code reporting_category} instead.
*
* <p>One of {@code adjustment}, {@code advance}, {@code advance_funding}, {@code
* anticipation_repayment}, {@code application_fee}, {@code application_fee_refund}, {@code
* charge}, {@code connect_collection_transfer}, {@code contribution}, {@code
* issuing_authorization_hold}, {@code issuing_authorization_release}, {@code issuing_dispute},
* {@code issuing_transaction}, {@code payment}, {@code payment_failure_refund}, {@code
* payment_refund}, {@code payout}, {@code payout_cancel}, {@code payout_failure}, {@code refund},
* {@code refund_failure}, {@code reserve_transaction}, {@code reserved_funds}, {@code
* stripe_fee}, {@code stripe_fx_fee}, {@code tax_fee}, {@code topup}, {@code topup_reversal},
* {@code transfer}, {@code transfer_cancel}, {@code transfer_failure}, or {@code
* transfer_refund}.
* payment_refund}, {@code payment_reversal}, {@code payout}, {@code payout_cancel}, {@code
* payout_failure}, {@code refund}, {@code refund_failure}, {@code reserve_transaction}, {@code
* reserved_funds}, {@code stripe_fee}, {@code stripe_fx_fee}, {@code tax_fee}, {@code topup},
* {@code topup_reversal}, {@code transfer}, {@code transfer_cancel}, {@code transfer_failure}, or
* {@code transfer_refund}.
*/
@SerializedName("type")
String type;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/stripe/model/CreditNoteLineItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import lombok.Getter;
import lombok.Setter;

/** The credit note line item object. */
@Getter
@Setter
@EqualsAndHashCode(callSuper = false)
Expand Down
Loading

0 comments on commit 5a6c0f7

Please sign in to comment.