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

Fix split package org.apache.lucene.search.vectorhighlight #81041

Merged

Conversation

ChrisHegarty
Copy link
Contributor

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

This PR proposes to move the CustomFieldQuery class from org.apache.lucene.search.vectorhighlight to org.elasticsearch.lucene.search.vectorhighlight, thus avoiding the split package with lucene. It would appear that when CustomFieldQuery was originally conceived, it needed package-private access to its superclass, FieldQuery, but this is no longer the case (the superclass now exposes the necessary members publicly).

There is a question, raised by a class-level comment in CustomFieldQuery, about whether this class is still required or not. Since CustomFieldQuery is still used in the code, and the fact that the question is longstanding and orthogonal, it can be addressed as a follow-up, if needed.

relates #78166

Copy link
Contributor

@romseygeek romseygeek 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
Copy link
Contributor Author

@elasticmachine retest this please

@ChrisHegarty ChrisHegarty merged commit 73e7100 into elastic:master Nov 25, 2021
@ChrisHegarty ChrisHegarty deleted the split_lucene_vectorhighlight branch November 25, 2021 12:33
@ChrisHegarty ChrisHegarty mentioned this pull request Nov 25, 2021
58 tasks
@pugnascotia pugnascotia added the modularization Java Modules related label Jan 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
modularization Java Modules related v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants