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

Upgrade Guice to 5.1.0 #17578

Merged
merged 10 commits into from
Dec 19, 2024
Merged

Upgrade Guice to 5.1.0 #17578

merged 10 commits into from
Dec 19, 2024

Conversation

Akshat-Jain
Copy link
Contributor

Description

This PR upgrades Guice to 5.1.0 and fixes the failing tests.


This PR has:

  • been self-reviewed.
  • added documentation for new or modified features or behaviors.
  • a release note entry in the PR description.
  • added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
  • added or updated version, license, or notice information in licenses.yaml
  • added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
  • added unit tests or modified existing tests to cover new code paths, ensuring the threshold for code coverage is met.
  • added integration tests.
  • been tested in a test Druid cluster.

@Akshat-Jain Akshat-Jain changed the title Move Guice to 5.1.0 and fix tests Upgrade Guice to 5.1.0 Dec 17, 2024
Copy link
Contributor

@kfaraz kfaraz left a comment

Choose a reason for hiding this comment

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

Thanks for the changes, @Akshat-Jain !
Most of the stuff looks good. The ExceptionMatcher is very useful for readability of tests.

I have a couple of questions:

  • Do we not need the guice-multibindings dependency anymore? Where was it being used? Is it now coming packaged inside the other guice dependencies?
  • Are the changes made to DruidCoreInjectorBuilder required in this PR? I would prefer it if we tackled that improvement separately.

@Akshat-Jain
Copy link
Contributor Author

@kfaraz Thanks for the review!

Thanks for the changes, @Akshat-Jain ! Most of the stuff looks good. The ExceptionMatcher is very useful for readability of tests.

Credits to @imply-cheddar for the original changes! 😄

I have a couple of questions:

  • Do we not need the guice-multibindings dependency anymore? Where was it being used? Is it now coming packaged inside the other guice dependencies?

Yeah. Since Guice 4.2, multibindings support has moved to Guice core. Reference: https://github.com/google/guice/wiki/Multibindings

  • Are the changes made to DruidCoreInjectorBuilder required in this PR? I would prefer it if we tackled that improvement separately.

Have reverted those changes.

Copy link
Member

@kgyrtkirk kgyrtkirk left a comment

Choose a reason for hiding this comment

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

+1 (pending tests)

Copy link
Contributor

@capistrant capistrant left a comment

Choose a reason for hiding this comment

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

Looks good to me. Small request for a javadoc to describe the new ExceptionMatcher class. Will when passing CI

@kfaraz kfaraz merged commit ca8f24e into apache:master Dec 19, 2024
78 checks passed
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