Apache Solr open-source search software
SOLR-17703: Rename BinaryResponseParser and BinaryRequestWriter to JavaBin... (#3307)
Abhishek Umarjikare17078a98a8e
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex da086489d83..61a1d98e47a 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -176,6 +176,8 @@ Other Changes* SOLR-14070: Deprecate CloudSolrClient's ZooKeeper Hosts constructor. (Abhishek Umarjikar)+* SOLR-17703: SolrJ - Rename BinaryResponseParser and BinaryRequestWriter including StreamingBinaryResponseParser to "JavaBin.." equivalent. (Abhishek Umarjikar)+================== 9.9.0 ==================New Features---------------------diff --git a/solr/api/src/java/org/apache/solr/client/api/util/Constants.java b/solr/api/src/java/org/apache/solr/client/api/util/Constants.javaindex eab0b6f1020..cff9084b549 100644--- a/solr/api/src/java/org/apache/solr/client/api/util/Constants.java+++ b/solr/api/src/java/org/apache/solr/client/api/util/Constants.java@@ -37,5 +37,5 @@ public class Constants {public static final String GENERIC_ENTITY_PROPERTY = "genericEntity";- public static final String BINARY_CONTENT_TYPE_V2 = "application/vnd.apache.solr.javabin";+ public static final String JAVABIN_CONTENT_TYPE_V2 = "application/vnd.apache.solr.javabin";}diff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java b/solr/core/src/java/org/apache/solr/cli/ExportTool.javaindex 30187d13ffc..050092c2017 100644--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java@@ -64,7 +64,7 @@ import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;import org.apache.solr.client.solrj.impl.Http2SolrClient;-import org.apache.solr.client.solrj.impl.StreamingBinaryResponseParser;+import org.apache.solr.client.solrj.impl.StreamingJavaBinResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.common.SolrDocument;@@ -683,8 +683,8 @@ public class ExportTool extends ToolBase {runtime.println("Failed to write docs from" + e.getMessage());}};- StreamingBinaryResponseParser responseParser =- new StreamingBinaryResponseParser(getStreamer(wrapper));+ StreamingJavaBinResponseParser responseParser =+ new StreamingJavaBinResponseParser(getStreamer(wrapper));while (true) {if (failed) return false;if (docsWritten.get() > limit) return true;diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.javaindex 59d1f2c99fa..f31b58fb81a 100644--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java@@ -35,9 +35,9 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.StreamingResponseCallback;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;import org.apache.solr.client.solrj.request.RequestWriter;@@ -78,7 +78,7 @@ public class EmbeddedSolrServer extends SolrClient {@SuppressWarnings("ImmutableEnumChecker")public enum RequestWriterSupplier {- JavaBin(BinaryRequestWriter::new),+ JavaBin(JavaBinRequestWriter::new),XML(XMLRequestWriter::new);private final Supplier<RequestWriter> supplier;@@ -246,7 +246,7 @@ public class EmbeddedSolrServer extends SolrClient {var params = request.getParams();var responseParser = request.getResponseParser();if (responseParser == null) {- responseParser = new BinaryResponseParser();+ responseParser = new JavaBinResponseParser();}var addParams =new MapSolrParams(@@ -262,7 +262,7 @@ public class EmbeddedSolrServer extends SolrClient {SolrRequest<?> request, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {ResponseParser responseParser = request.getResponseParser();if (responseParser == null) {- responseParser = new BinaryResponseParser();+ responseParser = new JavaBinResponseParser();}StreamingResponseCallback callback = request.getStreamingResponseCallback();// TODO refactor callback to be a special responseParser that we check for@@ -279,7 +279,7 @@ public class EmbeddedSolrServer extends SolrClient {req.getResponseWriter().write(byteBuffer, req, rsp);} else {// mostly stream results to the callback; rest goes into the byteBuffer- if (!(responseParser instanceof BinaryResponseParser))+ if (!(responseParser instanceof JavaBinResponseParser))throw new IllegalArgumentException("Only javabin is supported when using a streaming response callback");var resolver =diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex d9a3ce3df15..b8ad0c5c18f 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -79,7 +79,7 @@ import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;import org.apache.lucene.store.LockObtainFailedException;import org.apache.lucene.util.ResourceLoader;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.cloud.CloudDescriptor;import org.apache.solr.cloud.RecoveryStrategy;import org.apache.solr.cloud.ZkSolrResourceLoader;@@ -3069,7 +3069,7 @@ public class SolrCore implements SolrInfoBean, Closeable {if (rawWriter != null) {return rawWriter.getContentType();} else {- return BinaryResponseParser.BINARY_CONTENT_TYPE;+ return JavaBinResponseParser.JAVABIN_CONTENT_TYPE;}}};@@ -3082,7 +3082,7 @@ public class SolrCore implements SolrInfoBean, Closeable {public interface RawWriter {default String getContentType() {- return BinaryResponseParser.BINARY_CONTENT_TYPE;+ return JavaBinResponseParser.JAVABIN_CONTENT_TYPE;}void write(OutputStream os) throws IOException;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.javaindex bf0db85fcdb..996d62b0d56 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperRead.java@@ -32,7 +32,7 @@ import java.util.Map;import org.apache.solr.client.api.endpoint.ZooKeeperReadApis;import org.apache.solr.client.api.model.ZooKeeperListChildrenResponse;import org.apache.solr.client.api.model.ZooKeeperStat;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;@@ -138,7 +138,7 @@ public class ZookeeperRead extends AdminAPIBase implements ZooKeeperReadApis {case '?':return XMLResponseParser.XML_CONTENT_TYPE;default:- return BinaryResponseParser.BINARY_CONTENT_TYPE;+ return JavaBinResponseParser.JAVABIN_CONTENT_TYPE;}}diff --git a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java b/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.javaindex 9a96b34afc0..f3cb152204d 100644--- a/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java+++ b/solr/core/src/java/org/apache/solr/handler/api/V2ApiUtils.java@@ -17,7 +17,7 @@package org.apache.solr.handler.api;-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;+import static org.apache.solr.client.solrj.impl.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;import static org.apache.solr.common.params.CommonParams.WT;import static org.apache.solr.handler.admin.api.ReplicationAPIBase.FILE_STREAM;@@ -101,7 +101,7 @@ public class V2ApiUtils {case "xml":return "application/xml";case "javabin":- return BINARY_CONTENT_TYPE_V2;+ return JAVABIN_CONTENT_TYPE_V2;case FILE_STREAM:return RawResponseWriter.CONTENT_TYPE;default:diff --git a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.javaindex 53970f9bfed..296f3966b9a 100644--- a/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java+++ b/solr/core/src/java/org/apache/solr/handler/designer/SchemaDesignerConfigSetHelper.java@@ -58,9 +58,9 @@ import org.apache.lucene.util.IOSupplier;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;@@ -516,7 +516,7 @@ class SchemaDesignerConfigSetHelper implements SchemaDesignerConstants {protected void postDataToBlobStore(CloudSolrClient cloudClient, String blobName, byte[] bytes)throws IOException {var request = new GenericSolrRequest(SolrRequest.METHOD.POST, "/blob/" + blobName);- request.withContent(bytes, BinaryResponseParser.BINARY_CONTENT_TYPE);+ request.withContent(bytes, JavaBinResponseParser.JAVABIN_CONTENT_TYPE);request.setRequiresCollection(true);try {request.process(cloudClient, BLOB_STORE_ID);diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.javaindex 8e4a3da6514..94cd9253f44 100644--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java@@ -39,7 +39,7 @@ import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;import org.apache.lucene.util.BitSetIterator;import org.apache.lucene.util.FixedBitSet;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.stream.StreamContext;import org.apache.solr.client.solrj.io.stream.TupleStream;@@ -149,7 +149,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {@Overridepublic String getContentType() {if ("javabin".equals(wt)) {- return BinaryResponseParser.BINARY_CONTENT_TYPE;+ return JavaBinResponseParser.JAVABIN_CONTENT_TYPE;} else return "json";}diff --git a/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java b/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.javaindex 62949441c7f..61a2967375a 100644--- a/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java+++ b/solr/core/src/java/org/apache/solr/jersey/MessageBodyWriters.java@@ -17,7 +17,7 @@package org.apache.solr.jersey;-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;+import static org.apache.solr.client.solrj.impl.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_REQUEST;import static org.apache.solr.jersey.RequestContextKeys.SOLR_QUERY_RESPONSE;import static org.apache.solr.response.QueryResponseWriter.CONTENT_TYPE_TEXT_UTF8;@@ -65,7 +65,7 @@ public class MessageBodyWriters {}}- @Produces(BINARY_CONTENT_TYPE_V2)+ @Produces(JAVABIN_CONTENT_TYPE_V2)public static class JavabinMessageBodyWriter extends BaseMessageBodyWriterimplements MessageBodyWriter<Object> {@Override@@ -75,7 +75,7 @@ public class MessageBodyWriters {@Overridepublic String getSupportedMediaType() {- return BINARY_CONTENT_TYPE_V2;+ return JAVABIN_CONTENT_TYPE_V2;}}diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.javaindex 2d184ad303f..aa5ca5d9564 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java@@ -36,7 +36,7 @@ import org.apache.solr.api.EndPoint;import org.apache.solr.api.PayloadObj;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.beans.PackagePayload;import org.apache.solr.common.SolrException;@@ -260,7 +260,7 @@ public class PackageAPI {final var request =new GenericSolrRequest(SolrRequest.METHOD.GET, "/cluster/package", solrParams);- request.setResponseParser(new BinaryResponseParser());+ request.setResponseParser(new JavaBinResponseParser());for (String liveNode : FileStoreUtils.fetchAndShuffleRemoteLiveNodes(coreContainer)) {final var baseUrl =@@ -442,7 +442,7 @@ public class PackageAPI {final var request =new GenericSolrRequest(SolrRequest.METHOD.GET, "/cluster/package", solrParams);- request.setResponseParser(new BinaryResponseParser());+ request.setResponseParser(new JavaBinResponseParser());for (String liveNode : FileStoreUtils.fetchAndShuffleRemoteLiveNodes(coreContainer)) {var baseUrl = coreContainer.getZkController().zkStateReader.getBaseUrlV2ForNodeName(liveNode);diff --git a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.javaindex 3cba7e0ec2c..39bc03dc562 100644--- a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java+++ b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java@@ -76,7 +76,7 @@ public class RequestUtil {String[] jsonFromParams = map.remove(JSON);for (ContentStream cs : req.getContentStreams()) {- // if BinaryResponseParser.BINARY_CONTENT_TYPE, let the following fail below - we may have+ // if BinaryResponseParser.JAVABIN_CONTENT_TYPE, let the following fail below - we may have// adjusted the content without updating the content type// problem in this case happens in a few tests including a remote// node query (HttpSolrCall's request proxy)diff --git a/solr/core/src/java/org/apache/solr/response/CborResponseWriter.java b/solr/core/src/java/org/apache/solr/response/CborResponseWriter.javaindex f0f3f2a2e46..fd5bc68f113 100644--- a/solr/core/src/java/org/apache/solr/response/CborResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/CborResponseWriter.java@@ -22,7 +22,7 @@ import java.io.IOException;import java.io.OutputStream;import java.math.BigDecimal;import java.math.BigInteger;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.common.util.NamedList;import org.apache.solr.request.SolrQueryRequest;@@ -52,7 +52,7 @@ public class CborResponseWriter implements QueryResponseWriter {@Overridepublic String getContentType(SolrQueryRequest request, SolrQueryResponse response) {- return BinaryResponseParser.BINARY_CONTENT_TYPE;+ return JavaBinResponseParser.JAVABIN_CONTENT_TYPE;}static class WriterImpl extends JSONWriter {diff --git a/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.javaindex ebe8bec6de6..5c6b6001366 100644--- a/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/JavaBinResponseWriter.java@@ -30,7 +30,7 @@ import java.util.List;import java.util.function.Consumer;import org.apache.lucene.index.IndexableField;import org.apache.lucene.search.TotalHits;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.util.JavaBinCodec;@@ -61,7 +61,7 @@ public class JavaBinResponseWriter implements QueryResponseWriter {@Overridepublic String getContentType(SolrQueryRequest request, SolrQueryResponse response) {- return BinaryResponseParser.BINARY_CONTENT_TYPE;+ return JavaBinResponseParser.JAVABIN_CONTENT_TYPE;}public static class Resolver@@ -174,7 +174,7 @@ public class JavaBinResponseWriter implements QueryResponseWriter {};new JavaBinResponseWriter().write(out, req, rsp);- return new BinaryResponseParser().processResponse(out.toInputStream(), null);+ return new JavaBinResponseParser().processResponse(out.toInputStream(), null);} catch (IOException ex) {throw new RuntimeException(ex); // almost impossible as we don't do real IOdiff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.javaindex 7683250226f..e899c6fbb20 100644--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java@@ -35,8 +35,8 @@ import java.util.concurrent.Future;import org.apache.http.NoHttpResponseException;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrException;@@ -449,7 +449,7 @@ public class SolrCmdDistributor implements Closeable {private int getRfFromResponse(InputStream inputStream) {if (inputStream != null) {try {- BinaryResponseParser brp = new BinaryResponseParser();+ JavaBinResponseParser brp = new JavaBinResponseParser();NamedList<Object> nl = brp.processResponse(inputStream, null);Object hdr = nl.get("responseHeader");if (hdr != null && hdr instanceof NamedList) {diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.javaindex 6b877fab528..ae9db33525d 100644--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java@@ -29,7 +29,7 @@ import java.util.List;import java.util.Map;import java.util.Objects;import java.util.TreeMap;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.GroupParams;@@ -445,7 +445,7 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {}assertEquals(6, ((ResultContext) response.getResponse()).getDocList().matches());- new BinaryResponseParser().processResponse(new ByteArrayInputStream(out.toByteArray()), "");+ new JavaBinResponseParser().processResponse(new ByteArrayInputStream(out.toByteArray()), "");out.close();}diff --git a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.javaindex 11bcd7cf96f..f44e0b86279 100644--- a/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/BinaryUpdateRequestHandlerTest.java@@ -18,7 +18,7 @@ package org.apache.solr.handler;import java.io.ByteArrayOutputStream;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;@@ -49,7 +49,7 @@ public class BinaryUpdateRequestHandlerTest extends SolrTestCaseJ4 {ureq.setParam(UpdateParams.COMMIT_WITHIN, "100");ureq.setParam(UpdateParams.OVERWRITE, Boolean.toString(false));- BinaryRequestWriter brw = new BinaryRequestWriter();+ JavaBinRequestWriter brw = new JavaBinRequestWriter();BufferingRequestProcessor p = new BufferingRequestProcessor(null);SolrQueryResponse rsp = new SolrQueryResponse();try (SolrQueryRequest req = req();diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.javaindex bd68337398e..d9872f4b19d 100644--- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java@@ -30,9 +30,9 @@ import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.impl.NoOpResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;@@ -94,9 +94,9 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase {String incorrectPayload = "{rebalance-leaders: {maxAtOnce: abc, maxWaitSeconds: xyz}}";testException(new XMLResponseParser(), 404, notFoundPath, incorrectPayload);testException(new JsonMapResponseParser(), 404, notFoundPath, incorrectPayload);- testException(new BinaryResponseParser(), 404, notFoundPath, incorrectPayload);+ testException(new JavaBinResponseParser(), 404, notFoundPath, incorrectPayload);testException(new XMLResponseParser(), 400, "/c/" + COLL_NAME, incorrectPayload);- testException(new BinaryResponseParser(), 400, "/c/" + COLL_NAME, incorrectPayload);+ testException(new JavaBinResponseParser(), 400, "/c/" + COLL_NAME, incorrectPayload);testException(new JsonMapResponseParser(), 400, "/c/" + COLL_NAME, incorrectPayload);}diff --git a/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java b/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.javaindex 9a4945cfb94..608b28161a3 100644--- a/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java+++ b/solr/core/src/test/org/apache/solr/handler/api/V2ApiUtilsTest.java@@ -16,7 +16,7 @@*/package org.apache.solr.handler.api;-import static org.apache.solr.client.solrj.impl.BinaryResponseParser.BINARY_CONTENT_TYPE_V2;+import static org.apache.solr.client.solrj.impl.JavaBinResponseParser.JAVABIN_CONTENT_TYPE_V2;import static org.apache.solr.handler.admin.api.ReplicationAPIBase.FILE_STREAM;import jakarta.ws.rs.core.MediaType;@@ -55,7 +55,7 @@ public class V2ApiUtilsTest extends SolrTestCaseJ4 {assertEquals(MediaType.APPLICATION_XML, V2ApiUtils.getMediaTypeFromWtParam(params, null));params.set("wt", "javabin");- assertEquals(BINARY_CONTENT_TYPE_V2, V2ApiUtils.getMediaTypeFromWtParam(params, null));+ assertEquals(JAVABIN_CONTENT_TYPE_V2, V2ApiUtils.getMediaTypeFromWtParam(params, null));params.set("wt", FILE_STREAM);assertEquals(diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.javaindex 4136090d6bf..be385f807b9 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java@@ -20,8 +20,8 @@ import org.apache.lucene.util.Constants;import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;@@ -170,7 +170,7 @@ public class DistributedQueryElevationComponentTest extends BaseDistributedSearctry (SolrClient client =new HttpSolrClient.Builder(clientUrl).withDefaultCollection("collection1")- .withResponseParser(new BinaryResponseParser())+ .withResponseParser(new JavaBinResponseParser()).build(); ) {SolrQuery solrQuery =new SolrQuery("XXXX")diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.javaindex fbeda40717f..b8203d1581f 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java@@ -26,7 +26,7 @@ import org.apache.solr.BaseDistributedSearchTestCase;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.JsonMapResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;@@ -251,7 +251,7 @@ public class DistributedTermsComponentTest extends BaseDistributedSearchTestCaseprivate ResponseParser[] getResponseParsers() {// can't use junit parameters as this would also require RunWithreturn new ResponseParser[] {- new BinaryResponseParser(), new JsonMapResponseParser(), new XMLResponseParser()+ new JavaBinResponseParser(), new JsonMapResponseParser(), new XMLResponseParser()};}}diff --git a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.javaindex 676f5622eee..f1b5a51804a 100644--- a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java+++ b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java@@ -22,7 +22,7 @@ import java.lang.invoke.MethodHandles;import java.util.ArrayList;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.ResponseParser;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.response.QueryResponseWriter;import org.apache.solr.response.SolrQueryResponse;@@ -191,7 +191,7 @@ public class TestWriterPerf extends SolrTestCaseJ4 {if (writerName.equals("xml")) {rp = new XMLResponseParser();} else if (writerName.equals("javabin")) {- rp = new BinaryResponseParser();+ rp = new JavaBinResponseParser();} else {break;}diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.javaindex d84a91cf1f8..fea9ad10a4a 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java@@ -22,7 +22,7 @@ import java.io.IOException;import java.nio.charset.StandardCharsets;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.common.util.ContentStreamBase.ByteArrayStream;import org.apache.solr.common.util.ContentStreamBase.StringStream;import org.apache.solr.common.util.NamedList;@@ -154,7 +154,7 @@ public class TestRawResponseWriter extends SolrTestCaseJ4 {// javabinByteArrayOutputStream bytes = new ByteArrayOutputStream();writerBinBase.write(bytes, req(), rsp);- BinaryResponseParser parser = new BinaryResponseParser();+ JavaBinResponseParser parser = new JavaBinResponseParser();NamedList<Object> out =parser.processResponse(new ByteArrayInputStream(bytes.toByteArray()), /* encoding irrelevant */ null);diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.javaindex 0695facddba..35ec90a7ffd 100644--- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java@@ -22,7 +22,7 @@ import java.util.HashMap;import java.util.Map;import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.MultiMapSolrParams;@@ -295,7 +295,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {LocalSolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), mmparams);try {req.setContentStreams(- Collections.singletonList(ContentStreamBase.create(new BinaryRequestWriter(), ureq)));+ Collections.singletonList(ContentStreamBase.create(new JavaBinRequestWriter(), ureq)));UpdateRequestHandler h = new UpdateRequestHandler();h.init(new NamedList<>());h.handleRequestBody(req, new SolrQueryResponse());diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adocindex eeb1ff958f5..618fc5f6e0b 100644--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc@@ -58,6 +58,9 @@ Users who previously relied on collection-specific URLs to avoid including the c* Deprecate CloudSolrClient’s ZooKeeper Hosts constructor. Users are encouraged to supply Solr URLs instead of communicating with ZooKeeper. It’s not likely to be removed before Solr 11.+* Rename BinaryResponseParser and BinaryRequestWriter including StreamingBinaryResponseParser to JavaBinRequestWriter, JavaBinResponseParser, StreamingJavaBinResponseParser.+This makes it clear that they pertain specifically to “JavaBin” rather than binary in general.+=== Service installerThe service installer now installs a `systemd` startup script instead of an `init.d` startup script. It is up to the user to uninstall any existing `init.d` script when upgrading.diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.javaindex eb2e377c3ad..e3b3e9cbcf5 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java@@ -286,7 +286,7 @@ public class SolrClientNodeStateProvider implements NodeStateProvider, MapWriterString url = zkClientClusterStateProvider.getZkStateReader().getBaseUrlForNodeName(solrNode);GenericSolrRequest request = new GenericSolrRequest(SolrRequest.METHOD.POST, path, params);- request.setResponseParser(new BinaryResponseParser());+ request.setResponseParser(new JavaBinResponseParser());try {return cloudSolrClient.getHttpClient().requestWithBaseUrl(url, request::process);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.javaindex acdf6b013b3..86220557c64 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java@@ -26,7 +26,7 @@ import java.util.Iterator;import java.util.List;import org.apache.solr.client.solrj.SolrRequest.METHOD;import org.apache.solr.client.solrj.beans.DocumentObjectBinder;-import org.apache.solr.client.solrj.impl.StreamingBinaryResponseParser;+import org.apache.solr.client.solrj.impl.StreamingJavaBinResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.SolrPing;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -990,21 +990,21 @@ public abstract class SolrClient implements Serializable, Closeable {public QueryResponse queryAndStreamResponse(String collection, SolrParams params, StreamingResponseCallback callback)throws SolrServerException, IOException {- return getQueryResponse(collection, params, new StreamingBinaryResponseParser(callback));+ return getQueryResponse(collection, params, new StreamingJavaBinResponseParser(callback));}public QueryResponse queryAndStreamResponse(String collection, SolrParams params, FastStreamingDocsCallback callback)throws SolrServerException, IOException {- return getQueryResponse(collection, params, new StreamingBinaryResponseParser(callback));+ return getQueryResponse(collection, params, new StreamingJavaBinResponseParser(callback));}private QueryResponse getQueryResponse(String collection, SolrParams params, ResponseParser parser)throws SolrServerException, IOException {QueryRequest req = new QueryRequest(params);- if (parser instanceof StreamingBinaryResponseParser) {- req.setStreamingResponseCallback(((StreamingBinaryResponseParser) parser).callback);+ if (parser instanceof StreamingJavaBinResponseParser) {+ req.setStreamingResponseCallback(((StreamingJavaBinResponseParser) parser).callback);}req.setResponseParser(parser);return req.process(this, collection);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.javaindex c8cce36fbf0..e8aecc8a88b 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java@@ -151,8 +151,8 @@ public class CloudLegacySolrClient extends CloudSolrClient {lbBuilder.withConnectionTimeout(cloudSolrClientBuilder.connectionTimeoutMillis, TimeUnit.MILLISECONDS);lbBuilder.withSocketTimeout(cloudSolrClientBuilder.socketTimeoutMillis, TimeUnit.MILLISECONDS);- lbBuilder.withRequestWriter(new BinaryRequestWriter());- lbBuilder.withResponseParser(new BinaryResponseParser());+ lbBuilder.withRequestWriter(new JavaBinRequestWriter());+ lbBuilder.withResponseParser(new JavaBinResponseParser());return lbBuilder.build();}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.javaindex e66d966eb32..e1de05d97da 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java@@ -123,7 +123,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {* <p>This parser represents the default Response Parser chosen to parse the response if the* parser were not specified as part of the request.*- * @see org.apache.solr.client.solrj.impl.BinaryResponseParser+ * @see org.apache.solr.client.solrj.impl.JavaBinResponseParser*/protected volatile ResponseParser parser;@@ -132,7 +132,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {** @see org.apache.solr.client.solrj.request.RequestWriter*/- protected volatile RequestWriter requestWriter = new BinaryRequestWriter();+ protected volatile RequestWriter requestWriter = new JavaBinRequestWriter();private final HttpClient httpClient;@@ -812,7 +812,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {protected ModifiableSolrParams invariantParams = new ModifiableSolrParams();public Builder() {- this.responseParser = new BinaryResponseParser();+ this.responseParser = new JavaBinResponseParser();}/**@@ -847,15 +847,15 @@ public class HttpSolrClient extends BaseHttpSolrClient {** <p>By default, compression is not enabled on created HttpSolrClient objects. By default,* redirects are not followed in created HttpSolrClient objects. By default, {@link- * BinaryRequestWriter} is used for composing requests. By default, {@link BinaryResponseParser}- * is used for parsing responses.+ * JavaBinRequestWriter} is used for composing requests. By default, {@link+ * JavaBinResponseParser} is used for parsing responses.** @param baseSolrUrl a URL to the root Solr path (i.e. "/solr") that will be targeted by any* created clients.*/public Builder(String baseSolrUrl) {this.baseSolrUrl = baseSolrUrl;- this.responseParser = new BinaryResponseParser();+ this.responseParser = new JavaBinResponseParser();}/** Chooses whether created {@link HttpSolrClient}s use compression by default. */diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.javaindex 6246fea6465..b4b84541cc6 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java@@ -63,10 +63,10 @@ public abstract class HttpSolrClientBase extends SolrClient {protected final Set<String> urlParamNames;- protected RequestWriter requestWriter = new BinaryRequestWriter();+ protected RequestWriter requestWriter = new JavaBinRequestWriter();// updating parser instance needs to go via the setter to ensure update of defaultParserMimeTypes- protected ResponseParser parser = new BinaryResponseParser();+ protected ResponseParser parser = new JavaBinResponseParser();protected Set<String> defaultParserMimeTypes;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinRequestWriter.javasimilarity index 97%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinRequestWriter.javaindex 43549ef1c2b..29b036dfced 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinRequestWriter.java@@ -33,7 +33,7 @@ import org.apache.solr.common.util.ContentStream;* @see org.apache.solr.client.solrj.request.RequestWriter* @since solr 1.4*/-public class BinaryRequestWriter extends RequestWriter {+public class JavaBinRequestWriter extends RequestWriter {@Overridepublic ContentWriter getContentWriter(SolrRequest<?> req) {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.javasimilarity index 82%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.javaindex 07385b38a52..06f348111dc 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/JavaBinResponseParser.java@@ -27,13 +27,13 @@ import org.apache.solr.common.util.NamedList;/*** @since solr 1.3*/-public class BinaryResponseParser extends ResponseParser {- public static final String BINARY_CONTENT_TYPE_V2 = "application/vnd.apache.solr.javabin";- public static final String BINARY_CONTENT_TYPE = "application/octet-stream";+public class JavaBinResponseParser extends ResponseParser {+ public static final String JAVABIN_CONTENT_TYPE_V2 = "application/vnd.apache.solr.javabin";+ public static final String JAVABIN_CONTENT_TYPE = "application/octet-stream";protected JavaBinCodec.StringCache stringCache;- public BinaryResponseParser setStringCache(JavaBinCodec.StringCache cache) {+ public JavaBinResponseParser setStringCache(JavaBinCodec.StringCache cache) {this.stringCache = cache;return this;}@@ -55,7 +55,7 @@ public class BinaryResponseParser extends ResponseParser {@Overridepublic Collection<String> getContentTypes() {- return Set.of(BINARY_CONTENT_TYPE, BINARY_CONTENT_TYPE_V2);+ return Set.of(JAVABIN_CONTENT_TYPE, JAVABIN_CONTENT_TYPE_V2);}@Overridediff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.javaindex f78dc458841..d250f0a5d8f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java@@ -219,7 +219,7 @@ public class LBHttpSolrClient extends LBSolrClient {public Builder() {this.solrEndpoints = new ArrayList<>();- this.responseParser = new BinaryResponseParser();+ this.responseParser = new JavaBinResponseParser();}public HttpSolrClient.Builder getHttpSolrClientBuilder() {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingJavaBinResponseParser.javasimilarity index 96%rename from solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.javarename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingJavaBinResponseParser.javaindex 7f8a8bec5a4..c669e38f9c7 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingJavaBinResponseParser.java@@ -37,16 +37,16 @@ import org.apache.solr.common.util.NamedList;** @since solr 4.0*/-public class StreamingBinaryResponseParser extends BinaryResponseParser {+public class StreamingJavaBinResponseParser extends JavaBinResponseParser {public final StreamingResponseCallback callback;public final FastStreamingDocsCallback fastCallback;- public StreamingBinaryResponseParser(StreamingResponseCallback cb) {+ public StreamingJavaBinResponseParser(StreamingResponseCallback cb) {this.callback = cb;fastCallback = null;}- public StreamingBinaryResponseParser(FastStreamingDocsCallback cb) {+ public StreamingJavaBinResponseParser(FastStreamingDocsCallback cb) {this.fastCallback = cb;this.callback = null;}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.javaindex de2f8d7759e..8a7987d6ec9 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java@@ -19,9 +19,9 @@ package org.apache.solr.client.solrj;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.Http2SolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.junit.BeforeClass;/**@@ -41,9 +41,9 @@ public class SolrExampleBinaryHttp2Test extends SolrExampleTests {return new Http2SolrClient.Builder(getBaseUrl()).withDefaultCollection(DEFAULT_TEST_CORENAME).withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)- .withRequestWriter(new BinaryRequestWriter())+ .withRequestWriter(new JavaBinRequestWriter())// where the magic happens- .withResponseParser(new BinaryResponseParser())+ .withResponseParser(new JavaBinResponseParser()).build();}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.javaindex 4aa7c0938bc..4866431b290 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java@@ -17,9 +17,9 @@package org.apache.solr.client.solrj;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.junit.BeforeClass;/**@@ -38,8 +38,8 @@ public class SolrExampleBinaryTest extends SolrExampleTests {return new HttpSolrClient.Builder(getBaseUrl()).withDefaultCollection(DEFAULT_TEST_CORENAME).allowMultiPartPost(random().nextBoolean())- .withRequestWriter(new BinaryRequestWriter())- .withResponseParser(new BinaryResponseParser())+ .withRequestWriter(new JavaBinRequestWriter())+ .withResponseParser(new JavaBinResponseParser()).build();}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.javaindex 4c3576b82f2..af039be9d1c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java@@ -27,8 +27,8 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.request.RequestWriter;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrDocument;@@ -240,7 +240,7 @@ public class SolrExampleCborTest extends SolrExampleTests {@SuppressWarnings("rawtypes")private static RequestWriter cborRequestWriter() {- return new BinaryRequestWriter() {+ return new JavaBinRequestWriter() {@Overridepublic ContentWriter getContentWriter(SolrRequest<?> request) {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.javaindex 05a5756d931..0b610339687 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java@@ -42,8 +42,8 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingHttp2Test;import org.apache.solr.client.solrj.embedded.SolrExampleStreamingTest.ErrorTrackingConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.NoOpResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;@@ -839,7 +839,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {query.set(CommonParams.FL, "id,json_s:[json],xml_s:[xml]");QueryRequest req = new QueryRequest(query);- req.setResponseParser(new BinaryResponseParser());+ req.setResponseParser(new JavaBinResponseParser());QueryResponse rsp = req.process(client);SolrDocumentList out = rsp.getResults();@@ -2371,7 +2371,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {// First Try with the BinaryResponseParserQueryRequest req = new QueryRequest(q);- req.setResponseParser(new BinaryResponseParser());+ req.setResponseParser(new JavaBinResponseParser());QueryResponse rsp = req.process(client);SolrDocument out = (SolrDocument) rsp.getResponse().get("doc");assertEquals("DOCID", out.get("id"));diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.javaindex df166981431..2978a7d947f 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java@@ -30,10 +30,10 @@ import org.apache.http.HttpResponse;import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.InputStreamEntity;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.util.Utils;@@ -138,8 +138,8 @@ public class SolrSchemalessExampleTest extends SolrExampleTestsBase {.allowMultiPartPost(random().nextBoolean());if (random().nextBoolean()) {httpSolrClientBuilder- .withRequestWriter(new BinaryRequestWriter())- .withResponseParser(new BinaryResponseParser());+ .withRequestWriter(new JavaBinRequestWriter())+ .withResponseParser(new JavaBinResponseParser());}return httpSolrClientBuilder.build();}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.javaindex 30a1212c38d..c43ef1602d4 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java@@ -21,8 +21,8 @@ import java.util.Iterator;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.beans.Field;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;@@ -61,7 +61,7 @@ public class TestBatchUpdate extends SolrJettyTestBase {try (SolrClient client =new HttpSolrClient.Builder(getBaseUrl()).withDefaultCollection(DEFAULT_TEST_CORENAME)- .withRequestWriter(new BinaryRequestWriter())+ .withRequestWriter(new JavaBinRequestWriter()).build()) {client.deleteByQuery("*:*"); // delete everything!doIt(client);@@ -73,7 +73,7 @@ public class TestBatchUpdate extends SolrJettyTestBase {try (SolrClient client =new HttpSolrClient.Builder(getBaseUrl()).withDefaultCollection(DEFAULT_TEST_CORENAME)- .withRequestWriter(new BinaryRequestWriter())+ .withRequestWriter(new JavaBinRequestWriter()).build()) {client.deleteByQuery("*:*"); // delete everything!final int[] counter = new int[1];diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.javaindex e4bd95680f6..8d6cc79fca7 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java@@ -37,8 +37,8 @@ import java.util.concurrent.CopyOnWriteArrayList;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.SolrJettyTestBase;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;import org.apache.solr.client.solrj.impl.XMLRequestWriter;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;@@ -116,7 +116,7 @@ public class TestSolrJErrorHandling extends SolrJettyTestBase {try (SolrClient client =new HttpSolrClient.Builder(getBaseUrl()).withDefaultCollection(DEFAULT_TEST_CORENAME)- .withRequestWriter(new BinaryRequestWriter())+ .withRequestWriter(new JavaBinRequestWriter()).build()) {client.deleteByQuery("*:*"); // delete everything!doIt(client);diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.javaindex 632145f4df8..cf5e9b915f5 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java@@ -21,7 +21,7 @@ import org.apache.solr.util.ExternalPaths;import org.junit.BeforeClass;/**- * @see org.apache.solr.client.solrj.impl.BinaryRequestWriter+ * @see org.apache.solr.client.solrj.impl.JavaBinRequestWriter* @see org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec*/public class LargeVolumeBinaryJettyTest extends LargeVolumeTestBase {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.javaindex f2ca853005f..81e9aca90bb 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@@ -23,10 +23,10 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.StreamingResponseCallback;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;@@ -41,8 +41,8 @@ public class SolrExampleStreamingBinaryHttp2Test extends SolrExampleStreamingHtt// smaller queue size hits locks more oftenHttp2SolrClient solrClient =new Http2SolrClient.Builder()- .withRequestWriter(new BinaryRequestWriter())- .withResponseParser(new BinaryResponseParser())+ .withRequestWriter(new JavaBinRequestWriter())+ .withResponseParser(new JavaBinResponseParser()).build();ConcurrentUpdateHttp2SolrClient concurrentClient =new ErrorTrackingConcurrentUpdateSolrClient.Builder(url, solrClient)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.javaindex 1610760a84f..e52fff60023 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@@ -22,8 +22,8 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.StreamingResponseCallback;-import org.apache.solr.client.solrj.impl.BinaryRequestWriter;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;+import org.apache.solr.client.solrj.impl.JavaBinRequestWriter;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrInputDocument;@@ -40,8 +40,8 @@ public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest {.withDefaultCollection(DEFAULT_TEST_CORENAME).withQueueSize(2).withThreadCount(5)- .withResponseParser(new BinaryResponseParser())- .withRequestWriter(new BinaryRequestWriter())+ .withResponseParser(new JavaBinResponseParser())+ .withRequestWriter(new JavaBinRequestWriter()).build();return client;diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.javaindex c3865f1caf6..6707bc32394 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java@@ -540,8 +540,8 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {// javabin requesttry (HttpSolrClient client =new HttpSolrClient.Builder(getBaseUrl())- .withRequestWriter(new BinaryRequestWriter())- .withResponseParser(new BinaryResponseParser())+ .withRequestWriter(new JavaBinRequestWriter())+ .withResponseParser(new JavaBinResponseParser()).build()) {UpdateRequest req = new UpdateRequest();req.add(new SolrInputDocument());diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.javaindex 4b2285b9d44..a1e5996e54e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java@@ -306,8 +306,8 @@ public class Http2SolrClientTest extends HttpSolrClientTestBase {try (Http2SolrClient client =new Http2SolrClient.Builder(url).withDefaultCollection(DEFAULT_CORE)- .withRequestWriter(new BinaryRequestWriter())- .withResponseParser(new BinaryResponseParser())+ .withRequestWriter(new JavaBinRequestWriter())+ .withResponseParser(new JavaBinResponseParser()).build()) {testUpdate(client, WT.JAVABIN, "application/javabin", MUST_ENCODE);}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.javaindex 1e6a3666cd2..49627a52cd7 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpJdkSolrClientTest.java@@ -167,7 +167,7 @@ public class HttpJdkSolrClientTest extends HttpSolrClientTestBase {q.setParam("a", MUST_ENCODE);HttpJdkSolrClient.Builder b =- builder(someOtherUrl).withResponseParser(new BinaryResponseParser());+ builder(someOtherUrl).withResponseParser(new JavaBinResponseParser());try (HttpJdkSolrClient client = b.build()) {client.requestWithBaseUrl(intendedUrl, new QueryRequest(q, SolrRequest.METHOD.GET), null);assertEquals(@@ -347,8 +347,8 @@ public class HttpJdkSolrClientTest extends HttpSolrClientTestBase {String url = getBaseUrl() + DEBUG_SERVLET_PATH;try (HttpJdkSolrClient client =builder(url)- .withRequestWriter(new BinaryRequestWriter())- .withResponseParser(new BinaryResponseParser())+ .withRequestWriter(new JavaBinRequestWriter())+ .withResponseParser(new JavaBinResponseParser()).build()) {testUpdate(client, WT.JAVABIN, "application/javabin", MUST_ENCODE);assertNoHeadRequestWithSsl(client);@@ -440,7 +440,7 @@ public class HttpJdkSolrClientTest extends HttpSolrClientTestBase {queryToHelpJdkReleaseThreads(client);}- rp = new BinaryResponseParser();+ rp = new JavaBinResponseParser();try (HttpJdkSolrClient client = builder(getBaseUrl()).withResponseParser(rp).build()) {assertTrue(client.processorAcceptsMimeType(diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.javaindex 67260a588a5..e3a8e4618fb 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBuilderTest.java@@ -81,7 +81,7 @@ public class HttpSolrClientBuilderTest extends SolrTestCase {public void testDefaultsToBinaryResponseParserWhenNoneProvided() throws IOException {try (HttpSolrClient createdClient = new Builder(ANY_BASE_SOLR_URL).build()) {final ResponseParser usedParser = createdClient.getParser();- assertTrue(usedParser instanceof BinaryResponseParser);+ assertTrue(usedParser instanceof JavaBinResponseParser);}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.javaindex 3c6e4ce5f15..edd562868eb 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBuilderTest.java@@ -57,7 +57,7 @@ public class LBHttpSolrClientBuilderTest extends SolrTestCase {new Builder().withBaseEndpoint(ANY_BASE_SOLR_URL).build()) {final ResponseParser usedParser = createdClient.getParser();- assertTrue(usedParser instanceof BinaryResponseParser);+ assertTrue(usedParser instanceof JavaBinResponseParser);}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.javaindex 226997c32c9..f7c1722bc01 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java@@ -47,7 +47,7 @@ public class LBHttpSolrClientTest extends SolrTestCase {HttpClientUtil.close(httpClient);}- ResponseParser parser = new BinaryResponseParser();+ ResponseParser parser = new JavaBinResponseParser();httpClient = HttpClientUtil.createClient(new ModifiableSolrParams());try {try (LBHttpSolrClient testClient =diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.javaindex 65d2c966257..b3a45dc36ed 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java@@ -24,8 +24,8 @@ import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.BinaryResponseParser;import org.apache.solr.client.solrj.impl.HttpSolrClient;+import org.apache.solr.client.solrj.impl.JavaBinResponseParser;import org.apache.solr.client.solrj.impl.XMLResponseParser;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.common.SolrInputDocument;@@ -141,7 +141,7 @@ public class TestSuggesterResponse extends SolrJettyTestBase {*/private SolrClient createSuggestSolrClient() {final ResponseParser randomParser =- random().nextBoolean() ? new BinaryResponseParser() : new XMLResponseParser();+ random().nextBoolean() ? new JavaBinResponseParser() : new XMLResponseParser();return new HttpSolrClient.Builder().withBaseSolrUrl(getBaseUrl()).withDefaultCollection(DEFAULT_TEST_CORENAME)diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java b/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.javaindex 55ed6128cf4..9759fd84b92 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java@@ -29,7 +29,7 @@ import java.util.Map;import java.util.Objects;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.FastStreamingDocsCallback;-import org.apache.solr.client.solrj.impl.StreamingBinaryResponseParser;+import org.apache.solr.client.solrj.impl.StreamingJavaBinResponseParser;import org.apache.solr.common.SolrDocument;import org.apache.solr.common.SolrDocumentList;import org.apache.solr.common.util.FastJavaBinDecoder.Tag;@@ -153,8 +153,8 @@ public class TestFastJavabinDecoder extends SolrTestCaseJ4 {@SuppressWarnings({"rawtypes"})List<NamedList> children;}- StreamingBinaryResponseParser parser =- new StreamingBinaryResponseParser(+ StreamingJavaBinResponseParser parser =+ new StreamingJavaBinResponseParser(new FastStreamingDocsCallback() {@Override@@ -253,8 +253,8 @@ public class TestFastJavabinDecoder extends SolrTestCaseJ4 {}}List<Pojo> l = new ArrayList<>();- StreamingBinaryResponseParser binaryResponseParser =- new StreamingBinaryResponseParser(+ StreamingJavaBinResponseParser binaryResponseParser =+ new StreamingJavaBinResponseParser(new FastStreamingDocsCallback() {@Override