Skip to content

Avoid unnecessary split package with lucene-highlighter#78099

Merged
elasticsearchmachine merged 2 commits intoelastic:masterfrom
ChrisHegarty:uhighlight_split
Sep 21, 2021
Merged

Avoid unnecessary split package with lucene-highlighter#78099
elasticsearchmachine merged 2 commits intoelastic:masterfrom
ChrisHegarty:uhighlight_split

Conversation

@ChrisHegarty
Copy link
Copy Markdown
Contributor

@ChrisHegarty ChrisHegarty commented Sep 21, 2021

To allow for the future modularization of Elasticsearch with Java Modules, there are a number preparatory tasks that need be completed. This is one such task: eliminate split packages.

Specifically, relocate org.apache.lucene.search.uhighlight to org.elasticsearch.lucene.search.uhighlight to avoid unnecessary package-private dependencies on Lucene - unnecessary since Lucene 9.0.

The relocation target package seems reasonable, supported by the fact that the existing tests already occupy that namespace.

Note: beyond the package rename, the only substantive change is to expose the protected member through an accessor - which avoids the need for package-private access.

relates #78166

@ChrisHegarty ChrisHegarty added v8.0.0 Team:Core/Infra Meta label for core/infra team modularization Java Modules related labels Sep 21, 2021
@ChrisHegarty ChrisHegarty marked this pull request as ready for review September 21, 2021 14:02
@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

Copy link
Copy Markdown
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

LGTM

@ChrisHegarty ChrisHegarty added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Sep 21, 2021
@ChrisHegarty
Copy link
Copy Markdown
Contributor Author

@elasticmachine update branch

@elasticsearchmachine elasticsearchmachine merged commit c1950a6 into elastic:master Sep 21, 2021
@ChrisHegarty ChrisHegarty mentioned this pull request Sep 22, 2021
58 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) modularization Java Modules related >non-issue Team:Core/Infra Meta label for core/infra team v8.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants