Skip to content

Repository navigation

Merge to beta - #2298

Closed
jar-stripe wants to merge 14 commits into
betafrom
jar/merge-java-beta
Closed

Merge to beta#2298
jar-stripe wants to merge 14 commits into
betafrom
jar/merge-java-beta

Conversation

@jar-stripe

@jar-stripe jar-stripe commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Why?

Routine merge of master changes into the beta release channel.

What?

Merged master into beta using sdk-codegen's automerge tooling (tools/automerge/java-beta.yaml). The merge resolved cleanly with automerge (no manual conflict resolution needed). Net change outside of .hark changefiles is limited to .github/workflows/ci.yml, README.md, and the v2 event notification / webhook handling code (StripeClient.java, Event.java, EventNotification.java, LiveStripeResponseGetter.java, Webhook.java) plus their tests.

See Also

jar-stripe and others added 14 commits August 28, 2026 16:47
@jar-stripe @claude
Add discriminated union serialization tests (#2260)
9651ffe 
* Add discriminated union serialization tests

Tests both request-side (params → map) and response-side (JSON → object)
serialization for discriminated unions, covering standalone and inline
variants.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* Add null assertions for non-selected DU variants

Assert that when one variant is selected, the other variant fields/structs
remain null in both serialization and deserialization tests.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* Fix response standalone DU test to use proper class hierarchy

Restructure the response-side test fixtures from a flat TestColorEntity
class (holding all variant fields) to a proper class hierarchy:
TestColorEntity (base) -> TestRgbColorEntity / TestHsvColorEntity.

Add a TestColorTypeAdapterFactory that dispatches deserialization to the
correct subclass based on the `model` discriminator field, mirroring how
the codegen will emit TypeAdapterFactory-based dispatch for real DUs.

Update assertions to use instanceof checks and typed casts rather than
checking for null fields on a flat class. Add a second test covering the
HSV variant path.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* fixed formatting

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
@jar-stripe
Carry private-preview's CI workflow hunks on master (#2283)
ac39a60 
private-preview's ci.yml differs from master's by exactly two additive
hunks: `private-preview` in `on.push.branches`, and a `base:` input on the
stripe-mock step mapping every private-preview context onto the beta spec.

Because those hunks live only on private-preview, every merge of master into
private-preview yields a ci.yml matching neither parent. GitHub refuses a
push from a GitHub App lacking `workflows` permission when it introduces a
workflow blob that does not already exist in the repository, so the codegen
job's push is rejected and a human has to perform the merge by hand. Holding
the hunks on master too means both sides of the merge carry the same change,
the merge result is byte-identical to master's blob, and the App only ever
carries an already-committed file forward.

Both hunks are no-ops on master:

- For a push event the workflow file comes from the pushed ref, so master's
  copy listing private-preview cannot affect pushes to master or beta.
- The base: expression falls through to `github.base_ref || github.ref_name`
  for every master-side ref, which is character-identical to the default
  declared by stripe/openapi/actions/stripe-mock.

Committed-By-Agent: claude
@xavdid
Harden API requestor code against malicious URLs (#2284)
e4f0ec3 
* validate that incoming urls don't redirect requests

* shorten comments
@zacchua-stripe
Bump version to 33.4.1
6eb9134
@xavdid
validate that webhook secrets are non-empty (#2286)
966e45a
@xavdid
Bump version to 33.4.2
77399df
@xavdid
support related singleton objects (#2288)
473ae1c
@xavdid
Migrate changelog management to hark (#2289)
38d0e63 
* migrate to hark

* tweak issue template

* point the hark actions at master

* point at the renamed check-github-links action

* use the single hark/checks action in CI

* use the hark checks action and rename pr_link to pr_url

* record language and channel in versions.json metadata

* rename versions.json to releases.json

* regenerate changelogs; pad short versions

* add a minimum-runtime-version recipe

Committed-By-Agent: claude

* add print-version-info recipe

* swap from is_breaking to semver_level

* trigger CI for hark v1.0.0
@xavdid
add missing changefile
5f0c7d7
@xavdid
rename changefiles that don't adhere to new naming rules
29bc997
@zacchua-stripe @codex
Fix event handler account scoping (#2294)
52e42a5 
* Fix event handler account scoping

Committed-By-Agent: codex
Co-authored-by: codex <noreply@openai.com>

* Add PR URL to changefile

Committed-By-Agent: codex
Co-authored-by: codex <noreply@openai.com>

---------

Co-authored-by: codex <noreply@openai.com>
@zacchua-stripe @codex
Add option to suppress Stripe notices (#2293)
9585f4f 
* Add option to suppress Stripe notices

Committed-By-Agent: codex
Co-authored-by: codex <noreply@openai.com>

* Add changelog entry for notice suppression

Committed-By-Agent: codex
Co-authored-by: codex <noreply@openai.com>

* Make Stripe notice integration test environment-independent

Committed-By-Agent: codex
Co-authored-by: codex <noreply@openai.com>

* Clarify Stripe notice suppression instructions

Committed-By-Agent: codex
Co-authored-by: codex <noreply@openai.com>

---------

Co-authored-by: codex <noreply@openai.com>
@jar-stripe
Document Stripe notice suppression (#2297)
25e05a3 
Committed-By-Agent: goose
Orbit-Session-Id: d60d503e-7c8a-4aa0-89d1-37cc435afc02
@jar-stripe
Merge changes from stripe/stripe-java master
0ae0823 
Committed-By-Agent: claude

# Conflicts:
#	.hark/changes/2023-03-17_richardm_api-updates.change.md
#	.hark/changes/2023-03-23_pakrym_update-generated-code.change.md
#	.hark/changes/2023-03-30_anniel_update-generated-code.change.md
#	.hark/changes/2023-04-06_richardm_update-generated-code.change.md
#	.hark/changes/2023-04-13_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-04-20_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-04-27_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-05-04_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-05-11_anniel_update-generated-code.change.md
#	.hark/changes/2023-05-19_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-05-25_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-06-01_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-06-08_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-06-22_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-07-06_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-07-13_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-08-03_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-08-24_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-09-07_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-09-15_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-09-21_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-10-05_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-10-16_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-11-02_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-11-22_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-11-30_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2023-12-22_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-01-04_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-01-12_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-01-18_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-01-25_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-02-08_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-02-22_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-02-29_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-03-07_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-03-21_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-03-28_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-04-18_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-05-09_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-05-16_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-05-23_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-05-30_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-06-06_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-06-13_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-06-27_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-07-05_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-07-25_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-08-15_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-09-05_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-09-18_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2024-10-03_ramya_update-generated-code.change.md
#	.hark/changes/2024-10-29_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-04-24_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-05-27_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-07-01_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-07-30_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-08-27_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-10-27_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-10-28_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2025-12-15_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2026-04-23_stripe-openapi_update-generated-code.change.md
#	.hark/changes/2026-05-27_mbroshi_update-generated-code.change.md
#	.hark/releases.json
#	CHANGELOG.md
#	README.md
#	VERSION
#	gradle.properties
#	src/main/java/com/stripe/Stripe.java
@jar-stripe
jar-stripe requested a review from a team as a code owner September 24, 2026 16:44
@jar-stripe
jar-stripe requested review from xavdid and removed request for a team September 24, 2026 16:44
@jar-stripe
jar-stripe disabled auto-merge September 24, 2026 16:47
@jar-stripe jar-stripe closed this Sep 24, 2026
@jar-stripe
jar-stripe deleted the jar/merge-java-beta branch September 24, 2026 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xavdid xavdid Awaiting requested review from xavdid xavdid is a code owner automatically assigned from stripe/api-library-reviewers

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jar-stripe @xavdid @zacchua-stripe