Migrate org.apache.solr.cli tools from V1 to V2 APIs#4154
Open
epugh wants to merge 5 commits intoapache:mainfrom
Open
Migrate org.apache.solr.cli tools from V1 to V2 APIs#4154epugh wants to merge 5 commits intoapache:mainfrom
epugh wants to merge 5 commits intoapache:mainfrom
Conversation
Co-authored-by: epugh <22395+epugh@users.noreply.github.com>
…r/nodes + /collections APIs Co-authored-by: epugh <22395+epugh@users.noreply.github.com>
… POJOs Co-authored-by: epugh <22395+epugh@users.noreply.github.com>
Co-authored-by: epugh <22395+epugh@users.noreply.github.com>
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
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.
Replaces legacy V1 admin API calls (
CollectionAdminRequest,CoreAdminRequest) in thebin/solrCLI tools with generated V2 OpenAPI SolrJ classes. Also adds a new proper SolrJ V2 endpoint forGET /cluster/nodesthat was previously missing, eliminating the need for aGenericV2SolrRequestworkaround.I used Copilot for this, and here is the agent chat: https://github.com/epugh/solr/tasks/3c2f15c6-c0c7-4e39-b6b6-1cd51f8e7aa4
Migrated calls
CLIUtilssafeCheckCollectionExistsCollectionAdminRequest.List→CollectionsApi.ListCollectionsCreateToolcreateCoreCoreAdminRequest.createCore→CoresApi.CreateCoreCreateToolcreateCollectionCollectionAdminRequest.createCollection→CollectionsApi.CreateCollectionDeleteTooldeleteCollectionCollectionAdminRequest.deleteCollection→CollectionsApi.DeleteCollectionDeleteTooldeleteCoreCoreAdminRequest.Unload→CoresApi.UnloadCoreStatusToolgetCloudStatusCollectionAdminRequest.ClusterStatus→ClusterApi.ListClusterNodes+CollectionsApi.ListCollectionsVerbose output restored via Jackson
The old V1 code serialized
NamedListresponses with noggit'sJSONWriter. V2 response POJOs are Jackson-annotated, so verbose output now usesJacksonContentWriter.DEFAULT_MAPPER.writerWithDefaultPrettyPrinter()— actually cleaner output since the responses are already proper JSON objects:New
GET /cluster/nodesV2 API (SolrJ support)StatusToolpreviously fell back toGenericV2SolrRequestbecause SolrJ had no typed class for this endpoint. The full API pipeline was wired up:ListClusterNodesResponse— new model withSet<String> nodesListClusterNodesApi— new endpoint interface at@Path("/cluster/nodes")ListClusterNodes— new Jersey implementation registered inCollectionsHandlerClusterApi.ListClusterNodes— generated SolrJ request class (replacesGenericV2SolrRequest)Not migrated
Snapshot tools (
SnapshotCreateTool,SnapshotDeleteTool, etc.) are intentionally excluded as candidates for removal.In fact, we may just remove them...?
Tests
Existing tests + bats tests all pass.