[solr] branch branch_9x updated: backport SOLR-11657

[ep...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new afc96563bbe backport SOLR-11657
afc96563bbe is described below

commit afc96563bbe50a9da7dd83586fb5fb39ce4863bb
Author: Joshua Ouma <jo...@gmail.com>
AuthorDate: Fri Oct 14 22:54:39 2022 +0300

    backport SOLR-11657
---
 solr/CHANGES.txt                                                   | 5 +++++
 solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 74305355371..ade1f3f768f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -18,6 +18,11 @@ Improvements
   by setting the `permissiveMode` boolean option to `true` in your solrconfig.xml's
   IgnoreLargeDocumentProcessorFactory declaration. (Jason Gerlowski)
 
+* SOLR-16392: A number of v2 "replica" endpoints have been updated to be more REST-ful, and hopefully, intuitive.
+  ADDREPLICAPROP is now `PUT /api/collections/$coll/shards/$shard/replicas/$rep/properties/$prop {"value": $val}`
+
+* SOLR-11657: Deprecate ContentStream in favour of RequestWriter.ContentWriter.   (Joshua Ouma via Eric Pugh)
+
 Optimizations
 ---------------------
 (No changes)
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java b/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java
index 6d1c46980de..0c3cbbbfcdb 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java
@@ -19,10 +19,13 @@ package org.apache.solr.common.util;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import org.apache.solr.client.solrj.request.RequestWriter.ContentWriter;
 
 /**
  * @since solr 1.2
+ * @deprecated Use {@link ContentWriter} instead.
  */
+@Deprecated
 public interface ContentStream {
   String getName();