(solr) branch main updated: SOLR-18388: remove the deprecated ZkStateReader collection-path delegates (#4767)

[epugh]

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 c7897688c41 SOLR-18388: remove the deprecated ZkStateReader 
collection-path delegates (#4767)
c7897688c41 is described below

commit c7897688c41a53916176cdef75d646e6ad715049
Author: Serhiy Bzhezytskyy <m...@serhiy-bzhezytskyy.com>
AuthorDate: Fri Aug 21 02:32:40 2026 +0300

    SOLR-18388: remove the deprecated ZkStateReader collection-path delegates 
(#4767)
---
 ...LR-18388-remove-zkstatereader-collection-path-delegates.yml |  8 ++++++++
 .../test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java |  4 ++--
 .../test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java |  4 ++--
 .../src/java/org/apache/solr/common/cloud/ZkStateReader.java   | 10 ----------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git 
a/changelog/unreleased/SOLR-18388-remove-zkstatereader-collection-path-delegates.yml
 
b/changelog/unreleased/SOLR-18388-remove-zkstatereader-collection-path-delegates.yml
new file mode 100644
index 00000000000..e0695aa8821
--- /dev/null
+++ 
b/changelog/unreleased/SOLR-18388-remove-zkstatereader-collection-path-delegates.yml
@@ -0,0 +1,8 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Remove the deprecated static ZkStateReader.getCollectionPath and 
getCollectionPathRoot delegates; use the equivalent methods on DocCollection 
instead.
+type: removed
+authors:
+  - name: Serhiy Bzhezytskyy
+links:
+  - name: SOLR-18388
+    url: https://issues.apache.org/jira/browse/SOLR-18388
diff --git 
a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java 
b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
index df6aced524e..55bac4237ee 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
@@ -264,7 +264,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {
     assertFalse(ref.isLazilyLoaded());
 
     Stat stat = new Stat();
-    fixture.zkClient.getData(ZkStateReader.getCollectionPath("c1"), null, 
stat);
+    fixture.zkClient.getData(DocCollection.getCollectionPath("c1"), null, 
stat);
     assertEquals(Instant.ofEpochMilli(stat.getCtime()), 
ref.get().getCreationTime());
   }
 
@@ -813,7 +813,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {
         "Timeout on waiting for c1 to show up in cluster state",
         () -> reader.getClusterState().getCollectionOrNull(collectionName) != 
null);
 
-    String collectionPath = ZkStateReader.getCollectionPath(collectionName);
+    String collectionPath = DocCollection.getCollectionPath(collectionName);
 
     // now create the replica, take note that this has to be done after 
DocCollection creation with
     // empty slice, otherwise the DocCollection ctor would fetch the PRS 
entries and throw
diff --git 
a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java 
b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
index 6eed23c8b4e..379deb31734 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
@@ -303,7 +303,7 @@ public class ZkStateWriterTest extends SolrTestCaseJ4 {
         assertNotNull(map.get("c1"));
 
         Stat stat = new Stat();
-        zkClient.getData(ZkStateReader.getCollectionPath("c1"), null, stat);
+        zkClient.getData(DocCollection.getCollectionPath("c1"), null, stat);
         assertEquals(
             Instant.ofEpochMilli(stat.getCtime()),
             clusterState.getCollection("c1").getCreationTime());
@@ -364,7 +364,7 @@ public class ZkStateWriterTest extends SolrTestCaseJ4 {
         state = reader.getClusterState();
 
         Stat stat = new Stat();
-        zkClient.getData(ZkStateReader.getCollectionPath("c2"), null, stat);
+        zkClient.getData(DocCollection.getCollectionPath("c2"), null, stat);
         assertEquals(
             Instant.ofEpochMilli(stat.getCtime()), 
state.getCollection("c2").getCreationTime());
 
diff --git 
a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java 
b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 4f0c3bb3836..0f9095a3737 100644
--- 
a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ 
b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1497,16 +1497,6 @@ public class ZkStateReader implements SolrCloseable {
     }
   }
 
-  @Deprecated // see DocCollection
-  public static String getCollectionPathRoot(String coll) {
-    return DocCollection.getCollectionPathRoot(coll);
-  }
-
-  @Deprecated // see DocCollection
-  public static String getCollectionPath(String coll) {
-    return DocCollection.getCollectionPath(coll);
-  }
-
   /**
    * Notify this reader that a local Core is a member of a collection, and so 
that collection state
    * should be watched.