Apache Solr open-source search software
SOLR-16723: Http2SolrClient should not use Apache Http client classes (#1503)
Kevin Risden2e6715a2d6d2
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex b153cef5b8b..dc71eea41d7 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -83,6 +83,8 @@ Bug Fixes* SOLR-16638: Fix Http2SolrClient's exception message when serverBaseUrl is null (Alex Deparvu via Kevin Risden)+* SOLR-16723: Http2SolrClient should not use Apache Http client classes (Kevin Risden)+Dependency Upgrades---------------------* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.javaindex 1c2fe209ef0..c1ea7e2cf9b 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java@@ -50,7 +50,6 @@ import java.util.concurrent.Semaphore;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.stream.Collectors;-import org.apache.http.entity.ContentType;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;@@ -922,13 +921,15 @@ public class Http2SolrClient extends SolrClient {if (processorSupportedContentTypes != null && !processorSupportedContentTypes.isEmpty()) {boolean processorAcceptsMimeType =processorSupportedContentTypes.stream()- .map(ct -> ContentType.parse(ct).getMimeType().trim())+ .map(ct -> MimeTypes.getContentTypeWithoutCharset(ct).trim()).anyMatch(mimeType::equalsIgnoreCase);if (!processorAcceptsMimeType) {// unexpected mime typefinal String allSupportedTypes =processorSupportedContentTypes.stream()- .map(ct -> ContentType.parse(ct).getMimeType().trim().toLowerCase(Locale.ROOT))+ .map(+ ct ->+ MimeTypes.getContentTypeWithoutCharset(ct).trim().toLowerCase(Locale.ROOT)).collect(Collectors.joining(", "));String prefix ="Expected mime type in [" + allSupportedTypes + "] but got " + mimeType + ". ";@@ -1309,7 +1310,7 @@ public class Http2SolrClient extends SolrClient {protected void updateDefaultMimeTypeForParser() {defaultParserMimeTypes =parser.getContentTypes().stream()- .map(ct -> ContentType.parse(ct).getMimeType().trim().toLowerCase(Locale.ROOT))+ .map(ct -> MimeTypes.getContentTypeWithoutCharset(ct).trim().toLowerCase(Locale.ROOT)).collect(Collectors.toSet());}