dsmiley commented on code in PR #2852:
URL: https://github.com/apache/solr/pull/2852#discussion_r1833191483
##########
solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java:
##########
@@ -66,32 +64,23 @@ public static Collection<ContentStream> toContentStreams(
* Create the full URL for a SolrRequest (excepting query parameters) as a
String
*
* @param solrRequest the {@link SolrRequest} to build the URL for
- * @param requestWriter a {@link RequestWriter} from the {@link SolrClient}
that will be sending
- * the request
- * @param serverRootUrl the root URL of the Solr server being targeted. May
be overridden {@link
- * SolrRequest#getBasePath()}, if present.
+ * @param serverRootUrl the root URL of the Solr server being targeted.
* @param collection the collection to send the request to. May be null if
no collection is
* needed.
- * @throws MalformedURLException if {@code serverRootUrl} or {@link
SolrRequest#getBasePath()}
- * contain a malformed URL string
+ * @throws MalformedURLException if {@code serverRootUrl} contains a
malformed URL string
*/
public static String buildRequestUrl(
- SolrRequest<?> solrRequest,
- RequestWriter requestWriter,
- String serverRootUrl,
- String collection)
+ SolrRequest<?> solrRequest, String serverRootUrl, String collection)
throws MalformedURLException {
- // TODO remove getBasePath support here prior to closing SOLR-17256
- String basePath = solrRequest.getBasePath() == null ? serverRootUrl :
solrRequest.getBasePath();
-
+ String basePath = serverRootUrl;
if (solrRequest.getApiVersion() == SolrRequest.ApiVersion.V2) {
basePath = addNormalV2ApiRoot(basePath);
}
if (solrRequest.requiresCollection() && collection != null) basePath +=
"/" + collection;
- String path = requestWriter.getPath(solrRequest);
+ String path = solrRequest.getPath();
Review Comment:
You haven't removed the deprecated RequestWriter.getPath in Solr 10;
shouldn't you?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
