Skip to content

Conversation

@infeo
Copy link
Member

@infeo infeo commented May 22, 2025

This PR updates integrations-api to version 1.6.0 and make the necessary adjustments in the keychainAccessProvider impls.

Addtionally, the mavne failsafe plugin is added to execute integrations tests again.

@infeo infeo added this to the next milestone May 22, 2025
@coderabbitai
Copy link

coderabbitai bot commented May 22, 2025

Walkthrough

The changes update the Maven project configuration by increasing the api.version property to 1.6.0, introducing a new mvn-failsafe.version property, and adding the maven-failsafe-plugin for integration testing. In the Java codebase, several classes transition from method-based display name localization to annotation-based localization using @LocalizedDisplayName or @DisplayName. The storePassphrase method in WindowsKeychainAccessBase is refactored to remove an unused boolean parameter, with corresponding test updates. Additionally, a test reduces the size of data written to the Windows registry from 2 MiB to 1 MiB. No other public APIs or test logic are changed.

Note

⚡️ AI Code Reviews for VS Code, Cursor, Windsurf

CodeRabbit now has a plugin for VS Code, Cursor and Windsurf. This brings AI code reviews directly in the code editor. Each commit is reviewed immediately, finding bugs before the PR is raised. Seamless context handoff to your AI code agent ensures that you can easily incorporate review feedback.
Learn more here.


Note

⚡️ Faster reviews with caching

CodeRabbit now supports caching for code and dependencies, helping speed up reviews. This means quicker feedback, reduced wait times, and a smoother review experience overall. Cached data is encrypted and stored securely. This feature will be automatically enabled for all accounts on May 30th. To opt out, configure Review - Disable Cache at either the organization or repository level. If you prefer to disable all data retention across your organization, simply turn off the Data Retention setting under your Organization Settings.
Enjoy the performance boost—your workflow just got faster.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5d71ba9 and ccf9235.

📒 Files selected for processing (7)
  • pom.xml (3 hunks)
  • src/main/java/org/cryptomator/windows/keychain/WindowsHelloKeychainAccess.java (2 hunks)
  • src/main/java/org/cryptomator/windows/keychain/WindowsKeychainAccessBase.java (1 hunks)
  • src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java (2 hunks)
  • src/test/java/org/cryptomator/windows/common/WindowsRegistryIT.java (1 hunks)
  • src/test/java/org/cryptomator/windows/keychain/WindowsKeychainAccessBaseTest.java (2 hunks)
  • src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java (2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java (1)
src/test/java/org/cryptomator/windows/keychain/WindowsKeychainAccessBaseTest.java (1)
  • DisplayName (80-87)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Analyse
🔇 Additional comments (9)
pom.xml (3)

40-40: API version update to 1.6.0

The update to integrations-api version 1.6.0 aligns with the PR's primary objective. This should allow the project to use the latest API features and improvements.


50-50: Maven Failsafe version property added

Good practice to define the failsafe plugin version as a property, consistent with other Maven plugin version definitions in the project.


224-236: Maven Failsafe plugin configuration

The addition of the failsafe plugin is appropriate for running integration tests. The configuration correctly includes both the integration-test and verify goals, which is important for the complete integration test lifecycle.

src/test/java/org/cryptomator/windows/common/WindowsRegistryIT.java (1)

238-238: Test data size reduction

Reducing the test data size from 2 MiB to 1 MiB is a reasonable adjustment that maintains the test's purpose while potentially avoiding performance issues when writing to the Windows registry.

src/main/java/org/cryptomator/windows/keychain/WindowsKeychainAccessBase.java (1)

23-23:

Details

✅ Verification successful

Simplified method signature

The removal of the unused ignored boolean parameter from storePassphrase improves code clarity and aligns with the updated API version 1.6.0. This change will require updating all call sites to match the new signature.


🏁 Script executed:

#!/bin/bash
# Check for any remaining references to the old method signature that might have been missed
rg "storePassphrase.*,\s*(?:true|false)\s*\)" --type java

Length of output: 59


storePassphrase signature is clean—no legacy usages found

I ran a repository-wide search for calls to storePassphrase(…, true|false) and found zero matches. All call sites now use the new three-parameter signature; no further updates are required.

src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java (1)

3-4: Transition to annotation-based localization

The change from method-based display name localization to annotation-based localization with @LocalizedDisplayName is a good modernization that aligns with the updated API. This declarative approach is more maintainable and follows current best practices for internationalization.

Also applies to: 16-16

src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java (1)

66-66: Correctly updated to use the simplified storePassphrase method signature.

The method calls have been properly updated to align with the removal of the unused boolean parameter from the storePassphrase method in the WindowsKeychainAccessBase class.

Also applies to: 100-100

src/test/java/org/cryptomator/windows/keychain/WindowsKeychainAccessBaseTest.java (1)

3-3: Successfully migrated to annotation-based display name.

The code has been properly updated to use the @DisplayName annotation instead of a method override, which aligns with the new approach in integrations-api 1.6.0.

Also applies to: 80-81

src/main/java/org/cryptomator/windows/keychain/WindowsHelloKeychainAccess.java (1)

3-3: Properly implemented localized display name using annotations.

The code has been updated to use the @LocalizedDisplayName annotation with appropriate bundle and key parameters, replacing the previous method-based approach. This change aligns with the updated integrations-api 1.6.0 pattern for handling localized display names.

Also applies to: 15-15

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@infeo infeo merged commit ce38498 into develop May 26, 2025
5 checks passed
@infeo infeo deleted the feature/refactored-keychain-api branch May 26, 2025 08:35
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