This is an automated email from the ASF dual-hosted git repository.
epugh 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 7575ad4c5ae SOLR-18385: remove CollectionAdminRequest.PROPERTY_PREFIX
(#4770)
7575ad4c5ae is described below
commit 7575ad4c5ae0660de5eeb2d5021204409bf84bfb
Author: Serhiy Bzhezytskyy <[email protected]>
AuthorDate: Thu Aug 20 20:30:44 2026 +0300
SOLR-18385: remove CollectionAdminRequest.PROPERTY_PREFIX (#4770)
---
.../SOLR-18385-remove-collectionadminrequest-property-prefix.yml | 8 ++++++++
dev-docs/overseer/overseer.adoc | 2 +-
.../apache/solr/cloud/api/collections/ReindexCollectionCmd.java | 3 +--
.../java/org/apache/solr/cloud/overseer/CollectionMutator.java | 3 ++-
.../apache/solr/client/solrj/request/CollectionAdminRequest.java | 3 +--
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git
a/changelog/unreleased/SOLR-18385-remove-collectionadminrequest-property-prefix.yml
b/changelog/unreleased/SOLR-18385-remove-collectionadminrequest-property-prefix.yml
new file mode 100644
index 00000000000..f6c1cfc270c
--- /dev/null
+++
b/changelog/unreleased/SOLR-18385-remove-collectionadminrequest-property-prefix.yml
@@ -0,0 +1,8 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Remove the deprecated CollectionAdminRequest.PROPERTY_PREFIX field,
which was only an alias - use CollectionAdminParams.PROPERTY_PREFIX instead.
+type: removed
+authors:
+ - name: Serhiy Bzhezytskyy
+links:
+ - name: SOLR-18385
+ url: https://issues.apache.org/jira/browse/SOLR-18385
diff --git a/dev-docs/overseer/overseer.adoc b/dev-docs/overseer/overseer.adoc
index a782e5a0bc8..f88e2bf3d68 100644
--- a/dev-docs/overseer/overseer.adoc
+++ b/dev-docs/overseer/overseer.adoc
@@ -619,7 +619,7 @@ Note that properties `"parent"`,
`"shard_parent_zk_session"` and `"shard_parent_
deleteShard() (implementing `CollectionAction.DELETESHARD`) removes a slice
(shard) from a collection.
-modifyCollection() (implementing `CollectionAction.MODIFYCOLLECTION`) modifies
a given collection by setting new values for (or removing) specified
properties, ignoring changes to properties that are not considered modifiable
(those listed in `CollectionAdminRequest.MODIFIABLE_COLLECTION_PROPERTIES` and
those starting with `CollectionAdminRequest.PROPERTY_PREFIX="property."`).
+modifyCollection() (implementing `CollectionAction.MODIFYCOLLECTION`) modifies
a given collection by setting new values for (or removing) specified
properties, ignoring changes to properties that are not considered modifiable
(those listed in `CollectionAdminRequest.MODIFIABLE_COLLECTION_PROPERTIES` and
those starting with `CollectionAdminParams.PROPERTY_PREFIX="property."`).
updateSlice() replaces a `Slice` on an existing `DocCollection` or creates a
new `DocCollection` with the provided slice.
diff --git
a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
index e72cfbe04a4..f9de890485b 100644
---
a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
+++
b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
@@ -36,7 +36,6 @@ import java.util.stream.Stream;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.cloud.DistribStateManager;
-import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.GenericSolrRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -98,7 +97,7 @@ public class ReindexCollectionCmd implements
CollApiCmds.CollectionApiCommand {
public static final String TARGET = "target";
public static final String TARGET_COL_PREFIX = ".rx_";
public static final String CHK_COL_PREFIX = ".rx_ck_";
- public static final String REINDEXING_STATE =
CollectionAdminRequest.PROPERTY_PREFIX + "rx";
+ public static final String REINDEXING_STATE =
CollectionAdminParams.PROPERTY_PREFIX + "rx";
public static final String STATE = "state";
public static final String PHASE = "phase";
diff --git
a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
index 1cf36d87f15..ba8f563ca3c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java
@@ -39,6 +39,7 @@ import org.apache.solr.common.cloud.Slice.SliceStateProps;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CollectionAdminParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -154,7 +155,7 @@ public class CollectionMutator {
}
// other aux properties are also modifiable
for (String prop : message.keySet()) {
- if (prop.startsWith(CollectionAdminRequest.PROPERTY_PREFIX)) {
+ if (prop.startsWith(CollectionAdminParams.PROPERTY_PREFIX)) {
hasAnyOps = true;
if (message.get(prop) == null) {
props.remove(prop);
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 0ac88ee3922..7147699a592 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -20,6 +20,7 @@ import static
org.apache.solr.common.params.CollectionAdminParams.ALIAS;
import static org.apache.solr.common.params.CollectionAdminParams.COUNT_PROP;
import static
org.apache.solr.common.params.CollectionAdminParams.CREATE_NODE_SET_PARAM;
import static
org.apache.solr.common.params.CollectionAdminParams.CREATE_NODE_SET_SHUFFLE_PARAM;
+import static
org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;
import static
org.apache.solr.common.params.CollectionAdminParams.ROUTER_PREFIX;
import static
org.apache.solr.common.params.CollectionAdminParams.SKIP_NODE_ASSIGNMENT;
import static org.apache.solr.common.params.CoreAdminParams.BACKUP_REPOSITORY;
@@ -77,8 +78,6 @@ public abstract class CollectionAdminRequest<T extends
CollectionAdminResponse>
protected final CollectionAction action;
- @Deprecated public static String PROPERTY_PREFIX =
CollectionAdminParams.PROPERTY_PREFIX;
-
public CollectionAdminRequest(CollectionAction action) {
this("/admin/collections", action);
}
