refactor: compile against the forked OpenSearch package in fesen-httpclient - #35
Merged
Merged
Conversation
…client The OpenSearch DTOs and query builders Fess uses are now forked into org.codelibs.fesen.opensearch inside fesen-httpclient, and Fess core has already migrated. IndexingHelper.deleteDocumentByQuery now takes the forked QueryBuilder, so GoogleDriveDataStore has to follow. Rewrite the six imports in GoogleDriveDataStore and GoogleDriveChangeHandlingTest onto the forked package, and drop the now-redundant provided-scope org.opensearch:opensearch declaration: the classes arrive through Fess, which depends on fesen-httpclient. Nothing here used the jar's transitive dependencies -- Lucene still arrives through the same path.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fess is dropping the 17 MiB
org.opensearch:opensearchjar: the DTOs and query builders it actually uses are now forked intoorg.codelibs.fesen.opensearch.*insidefesen-httpclient, pruned from 8,578 classes to 3,751. This plugin follows.GoogleDriveDataStorebuilds a bool/term/wildcard delete query and hands it toIndexingHelper.deleteDocumentByQuery(SearchEngineClient, QueryBuilder). The type is dictated by that core signature, which moves in codelibs/fess#3439, so this plugin has no choice about when it migrates.Six import lines across two files — the data store and
GoogleDriveChangeHandlingTest. Theprovideddeclaration oforg.opensearch:opensearchis removed; the classes now arrive through Fess. Nothing else needed declaring in its place.Verification
mvn clean package— 240 tests, 0 failures.Ordering
Must be released together with codelibs/fess#3439, not after it. A plugin built against the old core signature will not load against the new war, and vice versa.