Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SOLR-16372: Migrate collection listing, deletion to JAX-RS (#1412)
The endpoints themselves remain the same, other than moving to the JAX-RS framework.
- Loading branch information
1 parent
34c85d3
commit e53cb0b
Showing
19 changed files
with
424 additions
and
92 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
75 changes: 75 additions & 0 deletions
75
solr/core/src/java/org/apache/solr/handler/admin/api/ListCollectionsAPI.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.solr.handler.admin.api; | ||
|
|
||
| import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2; | ||
| import static org.apache.solr.security.PermissionNameProvider.Name.COLL_READ_PERM; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import javax.inject.Inject; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.Produces; | ||
| import org.apache.solr.common.cloud.DocCollection; | ||
| import org.apache.solr.core.CoreContainer; | ||
| import org.apache.solr.jersey.PermissionName; | ||
| import org.apache.solr.jersey.SolrJerseyResponse; | ||
| import org.apache.solr.request.SolrQueryRequest; | ||
| import org.apache.solr.response.SolrQueryResponse; | ||
|
|
||
| /** | ||
| * V2 API for listing collections. | ||
| * | ||
| * <p>This API (GET /v2/collections) is equivalent to the v1 /admin/collections?action=LIST command | ||
| */ | ||
| @Path("/collections") | ||
| public class ListCollectionsAPI extends AdminAPIBase { | ||
|
|
||
| @Inject | ||
| public ListCollectionsAPI( | ||
| CoreContainer coreContainer, SolrQueryRequest req, SolrQueryResponse rsp) { | ||
| super(coreContainer, req, rsp); | ||
| } | ||
|
|
||
| @GET | ||
| @Produces({"application/json", "application/xml", BINARY_CONTENT_TYPE_V2}) | ||
| @PermissionName(COLL_READ_PERM) | ||
| public ListCollectionsResponse listCollections() { | ||
| final ListCollectionsResponse response = | ||
| instantiateJerseyResponse(ListCollectionsResponse.class); | ||
| validateZooKeeperAwareCoreContainer(coreContainer); | ||
|
|
||
| Map<String, DocCollection> collections = | ||
| coreContainer.getZkController().getZkStateReader().getClusterState().getCollectionsMap(); | ||
| List<String> collectionList = new ArrayList<>(collections.keySet()); | ||
| Collections.sort(collectionList); | ||
| // XXX should we add aliases here? | ||
| response.collections = collectionList; | ||
|
|
||
| return response; | ||
| } | ||
|
|
||
| public static class ListCollectionsResponse extends SolrJerseyResponse { | ||
| @JsonProperty("collections") | ||
| public List<String> collections; | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.