Skip to content

Commit

Permalink
Merge branch 'master' into jar/fix-javadocs-publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
jar-stripe authored Mar 4, 2025
2 parents 0aadffd + 1cf6c5b commit 0de54d7
Show file tree
Hide file tree
Showing 38 changed files with 1,736 additions and 194 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# All files should be reviewed by a member of the SDKs team
* @stripe/api-library-reviewers
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## 28.4.0 - 2025-02-24
* [#1943](https://github.com/stripe/stripe-java/pull/1943) Update generated code
* Add support for `prices` on `Billing.CreditGrant.applicability_config.scope`, `billing.CreditBalanceSummaryRetrieveParams.filter.applicability_scope`, and `billing.CreditGrantCreateParams.applicability_config.scope`
* Change `billing.CreditBalanceSummaryRetrieveParams.filter.applicability_scope.price_type` and `billing.CreditGrantCreateParams.applicability_config.scope.price_type` to be optional
* Add support for `priority` on `Billing.CreditGrant` and `billing.CreditGrantCreateParams`
* Add support for `target_date` on `Checkout.Session.payment_method_options.acss_debit`, `Checkout.Session.payment_method_options.au_becs_debit`, `Checkout.Session.payment_method_options.bacs_debit`, `Checkout.Session.payment_method_options.sepa_debit`, `Checkout.Session.payment_method_options.us_bank_account`, `PaymentIntent.payment_method_options.acss_debit`, `PaymentIntent.payment_method_options.au_becs_debit`, `PaymentIntent.payment_method_options.bacs_debit`, `PaymentIntent.payment_method_options.sepa_debit`, `PaymentIntent.payment_method_options.us_bank_account`, `PaymentIntentConfirmParams.payment_method_options.acss_debit`, `PaymentIntentConfirmParams.payment_method_options.au_becs_debit`, `PaymentIntentConfirmParams.payment_method_options.bacs_debit`, `PaymentIntentConfirmParams.payment_method_options.sepa_debit`, `PaymentIntentConfirmParams.payment_method_options.us_bank_account`, `PaymentIntentCreateParams.payment_method_options.acss_debit`, `PaymentIntentCreateParams.payment_method_options.au_becs_debit`, `PaymentIntentCreateParams.payment_method_options.bacs_debit`, `PaymentIntentCreateParams.payment_method_options.sepa_debit`, `PaymentIntentCreateParams.payment_method_options.us_bank_account`, `PaymentIntentUpdateParams.payment_method_options.acss_debit`, `PaymentIntentUpdateParams.payment_method_options.au_becs_debit`, `PaymentIntentUpdateParams.payment_method_options.bacs_debit`, `PaymentIntentUpdateParams.payment_method_options.sepa_debit`, `PaymentIntentUpdateParams.payment_method_options.us_bank_account`, `checkout.SessionCreateParams.payment_method_options.acss_debit`, `checkout.SessionCreateParams.payment_method_options.au_becs_debit`, `checkout.SessionCreateParams.payment_method_options.bacs_debit`, `checkout.SessionCreateParams.payment_method_options.sepa_debit`, and `checkout.SessionCreateParams.payment_method_options.us_bank_account`
* Add support for `restrictions` on `Checkout.Session.payment_method_options.card` and `checkout.SessionCreateParams.payment_method_options.card`
* Add support for `collected_information` on `Checkout.Session` and `checkout.SessionUpdateParams`
* Add support for `metadata` on `ProductCreateParams.default_price_data`
* Change type of `TokenCreateParams.person.political_exposure` from `string` to `enum('existing'|'none')`
* Add support for new value `2025-02-24.acacia` on enum `WebhookEndpointCreateParams.api_version`
* [#1948](https://github.com/stripe/stripe-java/pull/1948) add codeowners file

## 28.3.1 - 2025-02-07
* [#1946](https://github.com/stripe/stripe-java/pull/1946) Ensure `getRawJsonObject` returns data for constructed webhooks

## 28.3.0 - 2025-01-27
* [#1936](https://github.com/stripe/stripe-java/pull/1936) Update generated code
* Add support for `close` method on resource `Treasury.FinancialAccount`
Expand Down
25 changes: 0 additions & 25 deletions CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion OPENAPI_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1455
v1505
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-v28.3.0-blue)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
[![Maven Central](https://img.shields.io/badge/maven--central-v28.4.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)

Expand All @@ -17,7 +17,7 @@ The official [Stripe][stripe] Java client library.
Add this dependency to your project's build file:

```groovy
implementation "com.stripe:stripe-java:28.3.0"
implementation "com.stripe:stripe-java:28.4.0"
```

### Maven users
Expand All @@ -28,15 +28,15 @@ Add this dependency to your project's POM:
<dependency>
<groupId>com.stripe</groupId>
<artifactId>stripe-java</artifactId>
<version>28.3.0</version>
<version>28.4.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/28.3.0/stripe-java-28.3.0.jar)
- [The Stripe JAR](https://search.maven.org/remotecontent?filepath=com/stripe/stripe-java/28.4.0/stripe-java-28.4.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 @@
28.3.0
28.4.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=28.3.0
VERSION_NAME=28.4.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/ApiVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
package com.stripe;

final class ApiVersion {
public static final String CURRENT = "2025-01-27.acacia";
public static final String CURRENT = "2025-02-24.acacia";
}
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 @@ -14,7 +14,7 @@ public abstract class Stripe {
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 METER_EVENTS_API_BASE = "https://meter-events.stripe.com";
public static final String VERSION = "28.3.0";
public static final String VERSION = "28.4.0";

public static volatile String apiKey;
public static volatile String clientId;
Expand Down
90 changes: 72 additions & 18 deletions src/main/java/com/stripe/model/Balance.java
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,24 @@ public static class Available extends StripeObject {
@Setter
@EqualsAndHashCode(callSuper = false)
public static class SourceTypes extends StripeObject {
/** Amount for bank account. */
/**
* Amount coming from <a href="https://docs.stripe.com/ach-deprecated">legacy US ACH
* payments</a>.
*/
@SerializedName("bank_account")
Long bankAccount;

/** Amount for card. */
/**
* Amount coming from most payment methods, including cards as well as <a
* href="https://docs.stripe.com/payments/bank-debits">non-legacy bank debits</a>.
*/
@SerializedName("card")
Long card;

/** Amount for FPX. */
/**
* Amount coming from <a href="https://docs.stripe.com/payments/fpx">FPX</a>, a Malaysian
* payment method.
*/
@SerializedName("fpx")
Long fpx;
}
Expand Down Expand Up @@ -211,15 +220,24 @@ public static class ConnectReserved extends StripeObject {
@Setter
@EqualsAndHashCode(callSuper = false)
public static class SourceTypes extends StripeObject {
/** Amount for bank account. */
/**
* Amount coming from <a href="https://docs.stripe.com/ach-deprecated">legacy US ACH
* payments</a>.
*/
@SerializedName("bank_account")
Long bankAccount;

/** Amount for card. */
/**
* Amount coming from most payment methods, including cards as well as <a
* href="https://docs.stripe.com/payments/bank-debits">non-legacy bank debits</a>.
*/
@SerializedName("card")
Long card;

/** Amount for FPX. */
/**
* Amount coming from <a href="https://docs.stripe.com/payments/fpx">FPX</a>, a Malaysian
* payment method.
*/
@SerializedName("fpx")
Long fpx;
}
Expand Down Expand Up @@ -279,15 +297,24 @@ public static class NetAvailable extends StripeObject {
@Setter
@EqualsAndHashCode(callSuper = false)
public static class SourceTypes extends StripeObject {
/** Amount for bank account. */
/**
* Amount coming from <a href="https://docs.stripe.com/ach-deprecated">legacy US ACH
* payments</a>.
*/
@SerializedName("bank_account")
Long bankAccount;

/** Amount for card. */
/**
* Amount coming from most payment methods, including cards as well as <a
* href="https://docs.stripe.com/payments/bank-debits">non-legacy bank debits</a>.
*/
@SerializedName("card")
Long card;

/** Amount for FPX. */
/**
* Amount coming from <a href="https://docs.stripe.com/payments/fpx">FPX</a>, a Malaysian
* payment method.
*/
@SerializedName("fpx")
Long fpx;
}
Expand All @@ -301,15 +328,24 @@ public static class SourceTypes extends StripeObject {
@Setter
@EqualsAndHashCode(callSuper = false)
public static class SourceTypes extends StripeObject {
/** Amount for bank account. */
/**
* Amount coming from <a href="https://docs.stripe.com/ach-deprecated">legacy US ACH
* payments</a>.
*/
@SerializedName("bank_account")
Long bankAccount;

/** Amount for card. */
/**
* Amount coming from most payment methods, including cards as well as <a
* href="https://docs.stripe.com/payments/bank-debits">non-legacy bank debits</a>.
*/
@SerializedName("card")
Long card;

/** Amount for FPX. */
/**
* Amount coming from <a href="https://docs.stripe.com/payments/fpx">FPX</a>, a Malaysian
* payment method.
*/
@SerializedName("fpx")
Long fpx;
}
Expand Down Expand Up @@ -358,15 +394,24 @@ public static class Available extends StripeObject {
@Setter
@EqualsAndHashCode(callSuper = false)
public static class SourceTypes extends StripeObject {
/** Amount for bank account. */
/**
* Amount coming from <a href="https://docs.stripe.com/ach-deprecated">legacy US ACH
* payments</a>.
*/
@SerializedName("bank_account")
Long bankAccount;

/** Amount for card. */
/**
* Amount coming from most payment methods, including cards as well as <a
* href="https://docs.stripe.com/payments/bank-debits">non-legacy bank debits</a>.
*/
@SerializedName("card")
Long card;

/** Amount for FPX. */
/**
* Amount coming from <a href="https://docs.stripe.com/payments/fpx">FPX</a>, a Malaysian
* payment method.
*/
@SerializedName("fpx")
Long fpx;
}
Expand Down Expand Up @@ -404,15 +449,24 @@ public static class Pending extends StripeObject {
@Setter
@EqualsAndHashCode(callSuper = false)
public static class SourceTypes extends StripeObject {
/** Amount for bank account. */
/**
* Amount coming from <a href="https://docs.stripe.com/ach-deprecated">legacy US ACH
* payments</a>.
*/
@SerializedName("bank_account")
Long bankAccount;

/** Amount for card. */
/**
* Amount coming from most payment methods, including cards as well as <a
* href="https://docs.stripe.com/payments/bank-debits">non-legacy bank debits</a>.
*/
@SerializedName("card")
Long card;

/** Amount for FPX. */
/**
* Amount coming from <a href="https://docs.stripe.com/payments/fpx">FPX</a>, a Malaysian
* payment method.
*/
@SerializedName("fpx")
Long fpx;
}
Expand Down
30 changes: 11 additions & 19 deletions src/main/java/com/stripe/model/Charge.java
Original file line number Diff line number Diff line change
Expand Up @@ -1305,13 +1305,11 @@ public static class PaymentMethodDetails extends StripeObject {
Twint twint;

/**
* The type of transaction-specific details of the payment method used in the payment, one of
* {@code ach_credit_transfer}, {@code ach_debit}, {@code acss_debit}, {@code alipay}, {@code
* au_becs_debit}, {@code bancontact}, {@code card}, {@code card_present}, {@code eps}, {@code
* giropay}, {@code ideal}, {@code klarna}, {@code multibanco}, {@code p24}, {@code sepa_debit},
* {@code sofort}, {@code stripe_account}, or {@code wechat}. An additional hash is included on
* {@code payment_method_details} with a name matching this value. It contains information
* specific to the payment method.
* The type of transaction-specific details of the payment method used in the payment. See <a
* href="https://stripe.com/docs/api/payment_methods/object#payment_method_object-type">PaymentMethod.type</a>
* for the full list of possible types. An additional hash is included on {@code
* payment_method_details} with a name matching this value. It contains information specific to
* the payment method.
*/
@SerializedName("type")
String type;
Expand Down Expand Up @@ -1889,10 +1887,8 @@ public static class Card extends StripeObject {
/**
* This is used by the financial networks to identify a transaction. Visa calls this the
* Transaction ID, Mastercard calls this the Trace ID, and American Express calls this the
* Acquirer Reference Data. The first three digits of the Trace ID is the Financial Network
* Code, the next 6 digits is the Banknet Reference Number, and the last 4 digits represent
* the date (MM/DD). This field will be available for successful Visa, Mastercard, or American
* Express transactions and always null for other card brands.
* Acquirer Reference Data. This value will be present if it is returned by the financial
* network in the authorization response, and null otherwise.
*/
@SerializedName("network_transaction_id")
String networkTransactionId;
Expand Down Expand Up @@ -2454,10 +2450,8 @@ public static class CardPresent extends StripeObject {
/**
* This is used by the financial networks to identify a transaction. Visa calls this the
* Transaction ID, Mastercard calls this the Trace ID, and American Express calls this the
* Acquirer Reference Data. The first three digits of the Trace ID is the Financial Network
* Code, the next 6 digits is the Banknet Reference Number, and the last 4 digits represent
* the date (MM/DD). This field will be available for successful Visa, Mastercard, or American
* Express transactions and always null for other card brands.
* Acquirer Reference Data. This value will be present if it is returned by the financial
* network in the authorization response, and null otherwise.
*/
@SerializedName("network_transaction_id")
String networkTransactionId;
Expand Down Expand Up @@ -2917,10 +2911,8 @@ public static class InteracPresent extends StripeObject {
/**
* This is used by the financial networks to identify a transaction. Visa calls this the
* Transaction ID, Mastercard calls this the Trace ID, and American Express calls this the
* Acquirer Reference Data. The first three digits of the Trace ID is the Financial Network
* Code, the next 6 digits is the Banknet Reference Number, and the last 4 digits represent
* the date (MM/DD). This field will be available for successful Visa, Mastercard, or American
* Express transactions and always null for other card brands.
* Acquirer Reference Data. This value will be present if it is returned by the financial
* network in the authorization response, and null otherwise.
*/
@SerializedName("network_transaction_id")
String networkTransactionId;
Expand Down
Loading

0 comments on commit 0de54d7

Please sign in to comment.