Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18383: remove CollectionParams.FROM_NODE (#4769)

Serhiy Bzhezytskyyb7ce42a2f6de
diff --git a/changelog/unreleased/SOLR-18383-remove-collectionparams-from-node.yml b/changelog/unreleased/SOLR-18383-remove-collectionparams-from-node.yml
new file mode 100644
index 00000000000..42398be2a1f
--- /dev/null
+++ b/changelog/unreleased/SOLR-18383-remove-collectionparams-from-node.yml
@@ -0,0 +1,8 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Remove the deprecated `fromNode` request parameter of the MOVEREPLICA Collections API command; use `sourceNode` instead.
+type: removed
+authors:
+ - name: Serhiy Bzhezytskyy
+links:
+ - name: SOLR-18383
+ url: https://issues.apache.org/jira/browse/SOLR-18383
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java
index 634b2374633..635bae1e682 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java
@@ -108,16 +108,11 @@ public class MoveReplicaCmd implements CollApiCmds.CollectionApiCommand {
"Collection: " + collection + " replica: " + replicaName + " does not exist");
}
} else {
- String sourceNode =
- message.getStr(CollectionParams.SOURCE_NODE, message.getStr(CollectionParams.FROM_NODE));
+ String sourceNode = message.getStr(CollectionParams.SOURCE_NODE);
if (sourceNode == null) {
throw new SolrException(
SolrException.ErrorCode.BAD_REQUEST,
- "'"
- + CollectionParams.SOURCE_NODE
- + " or '"
- + CollectionParams.FROM_NODE
- + "' is a required param");
+ "'" + CollectionParams.SOURCE_NODE + "' is a required param");
}
String shardId = message.getStr(SHARD_ID_PROP);
if (shardId == null) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 6e3c9e453d7..270afc24906 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -1180,7 +1180,6 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
return copy(
req.getParams(),
map,
- CollectionParams.FROM_NODE,
CollectionParams.SOURCE_NODE,
TARGET_NODE,
WAIT_FOR_FINAL_STATE,
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
index 3e1d9745c93..14b85ef94a4 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
@@ -30,11 +30,6 @@ public interface CollectionParams {
String NAME = "name";
- /**
- * @deprecated use {@link #SOURCE_NODE} instead
- */
- @Deprecated String FROM_NODE = "fromNode";
-
String SOURCE_NODE = "sourceNode";
String TARGET_NODE = "targetNode";
String SOURCE_NODES = "sourceNodes";