-
Notifications
You must be signed in to change notification settings - Fork 686
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into save_models_compacted…
…_SOLR-17050 Resolved Conflicts: solr/CHANGES.txt
- Loading branch information
Showing
32 changed files
with
422 additions
and
378 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
39 changes: 39 additions & 0 deletions
39
solr/api/src/java/org/apache/solr/client/api/endpoint/RenameCoreApi.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,39 @@ | ||
| /* | ||
| * 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.client.api.endpoint; | ||
|
|
||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.parameters.RequestBody; | ||
| import javax.ws.rs.POST; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.PathParam; | ||
| import org.apache.solr.client.api.model.RenameCoreRequestBody; | ||
| import org.apache.solr.client.api.model.SolrJerseyResponse; | ||
|
|
||
| /** V2 API definition for renaming a Solr core. */ | ||
| @Path("/cores/{coreName}/rename") | ||
| public interface RenameCoreApi { | ||
| @POST | ||
| @Operation( | ||
| summary = "The RENAME action changes the name of a Solr core", | ||
| tags = {"cores"}) | ||
| SolrJerseyResponse renameCore( | ||
| @PathParam("coreName") String coreName, | ||
| @RequestBody(description = "Additional properties related to the core renaming") | ||
| RenameCoreRequestBody requestBody) | ||
| throws Exception; | ||
| } |
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
66 changes: 66 additions & 0 deletions
66
solr/core/src/java/org/apache/solr/handler/admin/api/RenameCore.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,66 @@ | ||
| /* | ||
| * 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.security.PermissionNameProvider.Name.CORE_EDIT_PERM; | ||
|
|
||
| import javax.inject.Inject; | ||
| import org.apache.solr.client.api.endpoint.RenameCoreApi; | ||
| import org.apache.solr.client.api.model.RenameCoreRequestBody; | ||
| import org.apache.solr.client.api.model.SolrJerseyResponse; | ||
| import org.apache.solr.core.CoreContainer; | ||
| import org.apache.solr.handler.admin.CoreAdminHandler; | ||
| import org.apache.solr.jersey.PermissionName; | ||
| import org.apache.solr.request.SolrQueryRequest; | ||
| import org.apache.solr.response.SolrQueryResponse; | ||
|
|
||
| /** | ||
| * V2 API for renaming an existing Solr core. | ||
| * | ||
| * <p>The new API (POST /v2/cores/coreName/rename is equivalent to the v1 /admin/cores?action=rename | ||
| * command. | ||
| */ | ||
| public class RenameCore extends CoreAdminAPIBase implements RenameCoreApi { | ||
| @Inject | ||
| public RenameCore( | ||
| CoreContainer coreContainer, | ||
| CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker, | ||
| SolrQueryRequest solrQueryRequest, | ||
| SolrQueryResponse solrQueryResponse) { | ||
| super(coreContainer, coreAdminAsyncTracker, solrQueryRequest, solrQueryResponse); | ||
| } | ||
|
|
||
| @PermissionName(CORE_EDIT_PERM) | ||
| @Override | ||
| public SolrJerseyResponse renameCore(String coreName, RenameCoreRequestBody requestBody) | ||
| throws Exception { | ||
| ensureRequiredParameterProvided("coreName", coreName); | ||
| ensureRequiredRequestBodyProvided(requestBody); | ||
| ensureRequiredParameterProvided("to", requestBody.to); | ||
| SolrJerseyResponse solrJerseyResponse = instantiateJerseyResponse(SolrJerseyResponse.class); | ||
| if (coreName.equals(requestBody.to)) return solrJerseyResponse; | ||
| return handlePotentiallyAsynchronousTask( | ||
| solrJerseyResponse, | ||
| coreName, | ||
| requestBody.async, | ||
| "rename", | ||
| () -> { | ||
| coreContainer.rename(coreName, requestBody.to); | ||
| return solrJerseyResponse; | ||
| }); | ||
| } | ||
| } |
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
Oops, something went wrong.