Address follow-up feedback on JAVA-2633

Description

I didn't get the opportunity to review the PR before it got merged, but I have a few comments that I think are worth addressing.
This can be done in a follow-up commit.

Environment

None

Pull Requests

None

Assignee

Unassigned

Reporter

Olivier Michallat

Labels

None

PM Priority

None

Affects versions

None

Fix versions

Pull Request

None

Doc Impact

None

Size

None

External issue ID

None

External issue ID

None

Priority

Minor
Configure