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

[PM-14526] Add JsonNames annotation to SyncResponseJson #4269

Merged
merged 1 commit into from
Nov 11, 2024

Conversation

SaintPatrck
Copy link
Contributor

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-14526
Cherry-picked from #4247 (816b976) from branch release/hotfix-v2024.11.1.

📔 Objective

Adds the @JsonNames annotation to the profile and domains properties in the SyncResponseJson data class.

This ensures that the properties are correctly deserialized even if the server response uses different casing for the property names.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

Copy link
Contributor

github-actions bot commented Nov 8, 2024

Logo
Checkmarx One – Scan Summary & Detailsfabaf6fd-97f7-4a07-9fb1-a41d253b534d

No New Or Fixed Issues Found

Copy link

codecov bot commented Nov 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.98%. Comparing base (2c40a7f) to head (015832e).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4269      +/-   ##
==========================================
- Coverage   88.98%   88.98%   -0.01%     
==========================================
  Files         452      452              
  Lines       38946    38945       -1     
  Branches     5478     5478              
==========================================
- Hits        34655    34654       -1     
  Misses       2369     2369              
  Partials     1922     1922              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SaintPatrck SaintPatrck force-pushed the cherrypick/hotfix-816b9769-to-main branch 3 times, most recently from f5775f8 to e3e703e Compare November 8, 2024 20:14
@SaintPatrck SaintPatrck force-pushed the cherrypick/hotfix-816b9769-to-main branch from e3e703e to 015832e Compare November 11, 2024 17:33
@@ -125,7 +124,6 @@ class VaultDiskSourceImpl(
override fun getDomains(userId: String): Flow<SyncResponseJson.Domains?> =
domainsDao
.getDomains(userId)
.filterNotNull()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

📓 Included as part of merge conflicts. Original change should have been in #4268 but was lost during rebase & conflict resolution.

@SaintPatrck SaintPatrck added this pull request to the merge queue Nov 11, 2024
Merged via the queue into main with commit c529371 Nov 11, 2024
9 checks passed
@SaintPatrck SaintPatrck deleted the cherrypick/hotfix-816b9769-to-main branch November 11, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants