This is an automated email from the ASF dual-hosted git repository. epugh pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4ef9a9858c764ed99d5680353cf6665ec049dfb8 Author: Serhiy Bzhezytskyy <[email protected]> AuthorDate: Mon Aug 24 20:16:47 2026 +0300 SOLR-18353: Remove deprecated SolrDocumentBase.getChildDocumentCount() (#4785) (cherry picked from commit 7d8926542eaad9884c2a44608961d061936b6b33) --- .../src/java/org/apache/solr/response/GeoJSONResponseWriter.java | 2 +- solr/core/src/java/org/apache/solr/response/JSONWriter.java | 2 +- .../test/org/apache/solr/search/join/TestCloudNestedDocsSort.java | 2 +- solr/solrj/src/java/org/apache/solr/common/SolrDocument.java | 7 ------- solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java | 4 ---- solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java | 6 ------ .../client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java | 4 ++-- .../solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java | 4 ++-- 8 files changed, 7 insertions(+), 24 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java index 3b0959e7a2d..b88eaf924f6 100644 --- a/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java @@ -174,8 +174,8 @@ class GeoJSONWriter extends JSONWriter { indent(); } writeKey("_childDocuments_", true); - writeArrayOpener(doc.getChildDocumentCount()); List<SolrDocument> childDocs = doc.getChildDocuments(); + writeArrayOpener(childDocs.size()); for (int i = 0; i < childDocs.size(); i++) { writeSolrDocument(null, childDocs.get(i), null, i); } diff --git a/solr/core/src/java/org/apache/solr/response/JSONWriter.java b/solr/core/src/java/org/apache/solr/response/JSONWriter.java index bad358b0f5f..e9eb78c9a36 100644 --- a/solr/core/src/java/org/apache/solr/response/JSONWriter.java +++ b/solr/core/src/java/org/apache/solr/response/JSONWriter.java @@ -116,8 +116,8 @@ public class JSONWriter extends TextResponseWriter implements JsonTextWriter { indent(); } writeKey("_childDocuments_", true); - writeArrayOpener(doc.getChildDocumentCount()); List<SolrDocument> childDocs = doc.getChildDocuments(); + writeArrayOpener(childDocs.size()); for (int i = 0; i < childDocs.size(); i++) { writeSolrDocument(null, childDocs.get(i), null, i); } diff --git a/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java b/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java index 9921394e136..40f16748840 100644 --- a/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java +++ b/solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java @@ -125,7 +125,7 @@ public class TestCloudNestedDocsSort extends SolrCloudTestCase { matchingChild = chVals.iterator().next(); } } - maxDocs += parent.getChildDocumentCount() + 1; + maxDocs += (parent.hasChildDocuments() ? parent.getChildDocuments().size() : 0) + 1; docs.add(parent); } // don't add parents in increasing uniqueKey order diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java index 53a152cfcd5..e363352fe6a 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java @@ -482,11 +482,4 @@ public class SolrDocument extends SolrDocumentBase<Object, SolrDocument> boolean isEmpty = (_childDocuments == null || _childDocuments.isEmpty()); return !isEmpty; } - - @Override - @Deprecated - public int getChildDocumentCount() { - if (_childDocuments == null) return 0; - return _childDocuments.size(); - } } diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java index c3102d2a3bb..59c4c0557e5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java @@ -63,8 +63,4 @@ public abstract class SolrDocumentBase<T, K> implements Map<String, T>, Serializ /** Has <em>anonymous</em> children? */ public abstract boolean hasChildDocuments(); - - /** The <em>anonymous</em> child document count. */ - @Deprecated - public abstract int getChildDocumentCount(); } diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java index 4ae3f35eff5..505de256afe 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java @@ -317,10 +317,4 @@ public class SolrInputDocument extends SolrDocumentBase<SolrInputField, SolrInpu boolean isEmpty = (_childDocuments == null || _childDocuments.isEmpty()); return !isEmpty; } - - @Override - @Deprecated - public int getChildDocumentCount() { - return hasChildDocuments() ? _childDocuments.size() : 0; - } } diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java index d735eac5003..439351c896b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java @@ -79,7 +79,7 @@ public class SolrExampleStreamingBinaryHttp2Test extends SolrExampleStreamingHtt QueryResponse response = client.query(query); assertEquals(1, response.getResults().size()); SolrDocument parentDoc = response.getResults().get(0); - assertEquals(1, parentDoc.getChildDocumentCount()); + assertEquals(1, parentDoc.getChildDocuments().size()); // test streaming final List<SolrDocument> docs = new ArrayList<>(); @@ -97,6 +97,6 @@ public class SolrExampleStreamingBinaryHttp2Test extends SolrExampleStreamingHtt assertEquals(1, docs.size()); parentDoc = docs.get(0); - assertEquals(1, parentDoc.getChildDocumentCount()); + assertEquals(1, parentDoc.getChildDocuments().size()); } } diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java index 32aa7164cd1..3e963505d9f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java @@ -78,7 +78,7 @@ public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest { QueryResponse response = client.query(query); assertEquals(1, response.getResults().size()); SolrDocument parentDoc = response.getResults().get(0); - assertEquals(1, parentDoc.getChildDocumentCount()); + assertEquals(1, parentDoc.getChildDocuments().size()); // test streaming final List<SolrDocument> docs = new ArrayList<>(); @@ -96,6 +96,6 @@ public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest { assertEquals(1, docs.size()); parentDoc = docs.get(0); - assertEquals(1, parentDoc.getChildDocumentCount()); + assertEquals(1, parentDoc.getChildDocuments().size()); } }
