You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2023/12/04 17:45:11 UTC
(solr) branch main updated: SOLR-17090: Remove DeleteAlias JAX-RS annotations (#2115)
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new f68cfbc1d84 SOLR-17090: Remove DeleteAlias JAX-RS annotations (#2115)
f68cfbc1d84 is described below
commit f68cfbc1d84546f03c30ccbb9f7bd5df94bda924
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Mon Dec 4 12:45:06 2023 -0500
SOLR-17090: Remove DeleteAlias JAX-RS annotations (#2115)
The annotations in `DeleteAlias.java` were shadowing those in
`DeleteAliasApi.java` and preventing the v2 API from being picked up
correctly.
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/handler/admin/api/DeleteAlias.java | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c59ea23dd5d..ed0b55d26d7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -140,6 +140,8 @@ Bug Fixes
* SOLR-16952: In distributed i.e. multi-shard cloud mode returned dense vector 'fl' fields are now a list of numbers instead of strings. (Qais Qadri, Christine Poerschke)
+* SOLR-17090: The v2 "delete alias" API no longer errantly returns a 405 status code (Jason Gerlowski)
+
Dependency Upgrades
---------------------
* SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (Kevin Risden)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java
index 2c577453c93..1242375f5ba 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/DeleteAlias.java
@@ -26,8 +26,6 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PER
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
import org.apache.solr.client.api.endpoint.DeleteAliasApi;
import org.apache.solr.client.api.model.AsyncJerseyResponse;
import org.apache.solr.client.api.model.SolrJerseyResponse;
@@ -51,9 +49,7 @@ public class DeleteAlias extends AdminAPIBase implements DeleteAliasApi {
@Override
@PermissionName(COLL_EDIT_PERM)
- public SolrJerseyResponse deleteAlias(
- @PathParam("aliasName") String aliasName, @QueryParam("async") String asyncId)
- throws Exception {
+ public SolrJerseyResponse deleteAlias(String aliasName, String asyncId) throws Exception {
final AsyncJerseyResponse response = instantiateJerseyResponse(AsyncJerseyResponse.class);
final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();