Feature : Saved payment method data models by balamaninayard · Pull Request #1718 · braintree/braintree_android

balamaninayard · 2026-10-06T10:34:53Z

Summary of changes

Adds the internal data layer for the PayPal Saved Payment Method (View/Edit FI) module. No public API changes; nothing is wired up yet — these types are consumed by PayPalSavedPaymentMethodClient in the follow-up PR.
Funding instrument response models (model/): PayPalSavedPaymentMethodSummary, PayPalSavedPaymentMethod, PayPalSavedPaymentMethodType, PayPalPayer — parse the paypalFundingInstrumentDetails GraphQL response.
Credit messaging: PayPalCreditMessagingRequest (POST body for v2/credit/fetch-presentment-messages, built with toJson()), plus model/PayPalCreditMessagingResult, PayPalCreditMessageItem, PayPalCreditMessageItemType.
flow_context.attributes sends BRAND_BRAINTREE, EXPERIENCE_ANDROID_SDK, EXPERIENCE_VIEW_EDIT_FI, EXPERIENCE_EXTERNAL_DIRECT .
Response models live in a model/ subpackage to keep them separate from the request body and the upcoming client; all types are internal.
Replaces the scaffold placeholder unit test with 34 unit tests (one test file per source file).

Steps to test

./gradlew :PayPalSavedPaymentMethod:testReleaseUnitTest
./gradlew :PayPalSavedPaymentMethod:lintRelease detekt

AI Usage

Which AI Agent Was Used?

Copilot
Claude
Other (Type Name Here)

How was AI used?
Code generation for the models and request body, writing unit tests, reviewing parity again and its review comments, and applying review fixes (naming, KDoc, test coverage). Alloutput was reviewed, and tests, lint and detekt were run locally.

Estimated AI Code Contribution

less than 30%
30 - 60%
60 - 100%

Checklist

Added a changelog entry — not needed on the feature branch; will be added when view-edit-fi-beta-feature merges to main
Tested and confirmed payment flows affected by this change are functioning as expecteonly; no payment flow uses them yet

Authors

List GitHub usernames for everyone who contributed to this pull request.

@balamaninayard

Inner Source Process

Internal to PayPal contributors should fill out this section. All others can delete.

PR should follow these steps before codeowners review will begin:

Comment /inner source on this PR — this will automatically add the inner source and tech lead review required labels. Open the PR in a draft state.
PR should be reviewed by and approved by your team's technical lead, we do not allow LGTe comments and feedback provided on all PR reviews
Once the above steps are completed, comment /ready on this PR — this will automatically remove the tech lead review required label. Move the PR to ready to review.
PR comments must be addressed within 24 hours, if you are unable to address within this ck to a draft state so our team knows not to review

Inner Source Checklist

Added all labels to the PR
Provide steps to test the flows changed, if applicable in the summary
Demo video of the functionality, if applicable — N/A, no UI or flow changes
All upstream dependencies are merged in and this PR can be released at any time; PRs l this is true
Unit tests and builds have been run locally and pass/compile as expected

… models

…od and credit messaging data models

…d models with SDK conventions - rename PayPalCreditMessagingRequest.build() to toJson() - remove internal terms from KDoc and test names, document request properties - limit paymentMethods and subtype KDoc to documented API behavior - simplify the displayable-text check and link KDoc references Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

…e and unknown type cases - use a PAYPAL_CREDIT fixture for subtype - cover preferred_message without content and explicit null embeddable - assert unknown types keep the remaining fields Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

anibalb2500 · 2026-10-06T21:59:10Z

Do we need the @Serializable annotation on any of these models?

balamaninayard · 2026-10-07T10:31:18Z

Do we need the @Serializable annotation on any of these models?

No, kotlinx.serialization isn't used anywhere in this repo — these models follow the existing pattern of manual parsing via fromJson(JSONObject), same as other SDK response models.

…saging response Addresses PR review comment confirming Json.optString handles a null analytics object safely, but was missing test coverage for that case. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Bhuvana-S100

LGTM

anibalb2500 · 2026-10-07T14:57:41Z

LGTM

balamaninayard · 2026-10-07T15:56:23Z

/inner source

balamaninayard · 2026-10-07T15:59:41Z

/ready

mzlangreder

Requesting changes:

Credit request attributes differ from iOS (C1).
Parsers are looser than the LLD (C2).
Server URLs aren't validated (C3).
Some tests can't fail (C4).
Credit model shape and scope need a decision (C5).
Note for the client PR (C6).

C6. Follow-up note
For #1719: BraintreeGraphQLClient throws only on non-2xx. HTTP 200 with errors[] is returned raw, contrary to LLD §8.1. The client must check errors first (see CardClient.kt:102). Please take a look.

mzlangreder · 2026-10-08T21:29:18Z

+internal data class PayPalCreditMessagingResult(
+    val mainItems: List<PayPalCreditMessageItem>,
+    val disclaimerItems: List<PayPalCreditMessageItem>,
+    val actionItems: List<PayPalCreditMessageItem>,
+    val messageId: String?,
+    val messageType: String?,
+    val impressionUrl: String?
+) {


C5. Credit LLD §6.4 specifies a sealed MessageItem (Text/Image), non-null messageId/messageType, and flattened learnMoreText/learnMoreUrl. This PR exposes raw wire blocks (7 nullable fields). iOS needed a second mapping layer in #1886. §6.4 sign-off is still Pending.

Parse into the §6.4 shape here (preferred), or

Update §6.4 to match iOS #1850 and get sign-off first.

Should these models move to their own PR? The parent LLD lists Upstream Messaging as separate.

Updated Credit LLD §6.4 to match the iOS model (#1850).
Although Funding Instrument and Credit Messaging have separate LLDs, we're raising the PRs in layers (data models, then the client, then the view), with each layer covering both features. That's why the credit messaging models are in this PR alongside the saved payment method models

…ver URLs Drop instruments with a blank type or label and payers with a blank email so the LLD fallback (email only, else hidden) triggers instead of rendering an empty row. Accept only https URLs for click, source, impression and image URLs since they are fired automatically or opened in a Custom Tab. Unwrap parsed results in tests so assertions cannot pass on a null result. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

balamaninayard · 2026-10-09T15:55:30Z

C6. Follow-up note
For #1719: BraintreeGraphQLClient throws only on non-2xx. HTTP 200 with errors[] is returned raw, contrary to LLD §8.1. The client must check errors first (see CardClient.kt:102). Please take a look

Already handled in #1719: PayPalSavedPaymentMethodClient checks errors[] on the HTTP 200 response and throws a BraintreeException with the GraphQL error message before reading data, the same as CardClient, with unit tests.
and updated in the LLD

…ethod-data-models

jaxdesmarais · 2026-10-15T13:41:02Z

@balamaninayard this PR is missing a XO Tech Lead review and is being moved back to draft

vkspune · 2026-10-15T15:40:15Z

Approved

balamaninayard · 2026-10-15T16:59:47Z

@balamaninayard this PR is missing a XO Tech Lead review and is being moved back to draft

XO tech lead - @vkspune & @anibalb2500 has reviewed , and has approved the PR. @jaxdesmarais

Copilot

🟢 Approval recommended

Static review found no blocking issues in these isolated internal additions and accompanying tests; tests were not executed.

0 open findings

What changed in this PR

Adds internal data models for the upcoming PayPal saved-payment-method client, without changing public APIs or existing payment flows.

Changes:

Adds funding-instrument and credit-message response parsing.
Adds credit-messaging request serialization and HTTPS URL filtering.
Replaces the placeholder test with focused parsing, serialization, and validation tests.

Paths below are relative to PayPalSavedPaymentMethod/src/.

File	Description
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/UrlValidationUnitTest.kt`	Tests HTTPS URL filtering.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/PayPalSavedPaymentMethodUnitTest.kt`	Removes the scaffold test.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/PayPalCreditMessagingRequestUnitTest.kt`	Tests request serialization.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalSavedPaymentMethodUnitTest.kt`	Tests instrument parsing and fallback behavior.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalSavedPaymentMethodTypeUnitTest.kt`	Tests instrument-type mapping.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalSavedPaymentMethodSummaryUnitTest.kt`	Tests summary parsing and malformed entries.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalPayerUnitTest.kt`	Tests payer parsing and defaults.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessagingResultUnitTest.kt`	Tests message parsing and displayability checks.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessageItemUnitTest.kt`	Tests content blocks and URL filtering.
`test/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessageItemTypeUnitTest.kt`	Tests content-type mapping.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/UrlValidation.kt`	Filters URLs to HTTPS with a host.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/PayPalCreditMessagingRequest.kt`	Serializes credit-messaging request bodies.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalSavedPaymentMethodType.kt`	Defines funding-instrument types.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalSavedPaymentMethodSummary.kt`	Parses funding instruments and payer details.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalSavedPaymentMethod.kt`	Parses individual funding instruments.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalPayer.kt`	Parses payer email and editability.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessagingResult.kt`	Parses preferred messages and metadata.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessageItemType.kt`	Defines message content types.
`main/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessageItem.kt`	Parses individual message blocks.

🧠 Review effort: Balanced

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

balamaninayard and others added 5 commits October 6, 2026 15:06

feat(PayPalSavedPaymentMethod): add saved payment method summary data…

510f525

… models

feat(PayPalSavedPaymentMethod): add credit messaging data models

6a57043

test(PayPalSavedPaymentMethod): add unit tests for saved payment meth…

c12fc07

…od and credit messaging data models

balamaninayard requested a review from a team as a code owner October 6, 2026 10:34

balamaninayard marked this pull request as draft October 6, 2026 10:35

Bhuvana-S100 reviewed Oct 7, 2026

View reviewed changes

test(PayPalSavedPaymentMethod): cover missing analytics in credit mes…

101096d

…saging response Addresses PR review comment confirming Json.optString handles a null analytics object safely, but was missing test coverage for that case. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Bhuvana-S100 reviewed Oct 7, 2026

View reviewed changes

balamaninayard marked this pull request as ready for review October 7, 2026 15:55

github-actions Bot added inner source This PR is internal to PP but external to the mobile SDK team tech lead review required labels Oct 7, 2026

github-actions Bot removed the tech lead review required label Oct 7, 2026

agedd reviewed Oct 8, 2026

View reviewed changes

Comment thread ...ain/java/com/braintreepayments/api/paypalsavedpaymentmethod/model/PayPalCreditMessageItem.kt

mzlangreder requested changes Oct 8, 2026

View reviewed changes

balamaninayard requested review from agedd and mzlangreder October 9, 2026 16:05

balamaninayard mentioned this pull request Oct 13, 2026

Feature : saved payment method image loader #1721

Open

5 of 13 tasks

Merge branch 'view-edit-fi-beta-feature' into feature/saved-payment-m…

c2bb80a

…ethod-data-models

balamaninayard mentioned this pull request Oct 13, 2026

Feature/saved payment method client #1719

Draft

4 of 11 tasks

Merge branch 'view-edit-fi-beta-feature' into feature/saved-payment-m…

d9f5bb2

…ethod-data-models

balamaninayard requested a review from Bhuvana-S100 October 14, 2026 14:20

balamaninayard mentioned this pull request Oct 15, 2026

Feature : Saved payment method request, display states and content mapper #1727

Draft

2 of 13 tasks

jaxdesmarais marked this pull request as draft October 15, 2026 13:41

mzlangreder approved these changes Oct 15, 2026

View reviewed changes

balamaninayard marked this pull request as ready for review October 15, 2026 16:57

noguier requested a balanced review from Copilot and removed request for Bhuvana-S100 October 16, 2026 19:36

Copilot started reviewing on behalf of noguier October 16, 2026 19:37

View session

Copilot AI reviewed Oct 16, 2026

View reviewed changes

Conversation

balamaninayard commented Oct 6, 2026

Summary of changes

AI Usage

Checklist

Authors

Inner Source Process

Inner Source Checklist

Uh oh!

anibalb2500 commented Oct 6, 2026

Uh oh!

balamaninayard commented Oct 7, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Bhuvana-S100 left a comment

Choose a reason for hiding this comment

Uh oh!

anibalb2500 commented Oct 7, 2026

Uh oh!

balamaninayard commented Oct 7, 2026

Uh oh!

balamaninayard commented Oct 7, 2026

Uh oh!

Uh oh!

mzlangreder left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mzlangreder Oct 8, 2026

Choose a reason for hiding this comment

Uh oh!

balamaninayard Oct 9, 2026

Choose a reason for hiding this comment

Uh oh!

balamaninayard commented Oct 9, 2026

Uh oh!

jaxdesmarais commented Oct 15, 2026

Uh oh!

vkspune commented Oct 15, 2026

Uh oh!

balamaninayard commented Oct 15, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟢 Approval recommended

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants