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.

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

[CodeHealth] Simplifying json parsing - pt.3 #27732

Merged
merged 1 commit into from
Feb 25, 2025

Conversation

cdesouza-chromium
Copy link
Collaborator

This PR simplifies JSON reading in several places by:

- Using `base::JSONReader::ReadDict`
- Using `base::test::ParseJson*`

This changes aim to make the checks around the parsing and its expectations simpler to read.

Resolves

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Copy link
Collaborator

@zenparsing zenparsing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rewards 👍

Copy link
Contributor

@AlexeyBarabash AlexeyBarabash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync ++

Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@cdesouza-chromium cdesouza-chromium force-pushed the simplify-json-reader-use-pt3 branch 2 times, most recently from 2049f54 to ec52d37 Compare February 24, 2025 18:38
Copy link
Contributor

[puLL-Merge] - brave/brave-core@27732

Description

This PR updates the codebase to use the newer base::JSONReader::ReadDict API instead of base::JSONReader::Read. This change simplifies JSON parsing code by directly returning a base::Value::Dict instead of a base::Value that needs to be checked for dictionary type.

Changes

Changes

By filename:

  1. components/brave_rewards/core/engine/endpoints/

    • Updated multiple files to use ReadDict instead of Read
    • Removed redundant dictionary type checks
    • Simplified access to dictionary values by using the returned dict directly
  2. components/brave_shields/content/browser/

    • Updated ad_block_engine.cc to use ReadDict and simplified parsing logic
  3. components/brave_vpn/

    • Updated JSON parsing in multiple files to use ReadDict
    • Simplified value access patterns
    • Updated test cases to use new API
  4. components/brave_wallet/browser/

    • Updated blockchain_list_parser.cc to use ReadDict
    • Simplified parsing logic and removed redundant type checks
sequenceDiagram
    participant Code
    participant JSONReader
    participant Dict
    
    Note over Code,Dict: Old Flow
    Code->>JSONReader: Read()
    JSONReader-->>Code: base::Value
    Code->>Code: Check if is_dict()
    Code->>Code: GetDict()
    
    Note over Code,Dict: New Flow
    Code->>JSONReader: ReadDict()
    JSONReader-->>Code: base::Value::Dict
    Code->>Dict: Direct dictionary access
Loading

This PR simplifies JSON reading in several places by:

    - Using `base::JSONReader::ReadDict`
    - Using `base::test::ParseJson*`

This changes aim to make the checks around the parsing and its
expectations simpler to read.
@cdesouza-chromium cdesouza-chromium force-pushed the simplify-json-reader-use-pt3 branch from ec52d37 to c8d910f Compare February 24, 2025 22:19
@cdesouza-chromium cdesouza-chromium merged commit 504507e into master Feb 25, 2025
18 checks passed
@cdesouza-chromium cdesouza-chromium deleted the simplify-json-reader-use-pt3 branch February 25, 2025 01:08
@github-actions github-actions bot added this to the 1.77.x - Nightly milestone Feb 25, 2025
@brave-builds
Copy link
Collaborator

Released in v1.77.64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants