SOLR-17884: SolrJ, minimize org.apache.http usage (#3602)

SolrJ users not using deprecated SolrClients can safely exclude Apache HttpClient dependencies.

* SolrJ Utils: Move org.apache.http usage to HttpClientUtil
* SolrHttpConstants extracted from HttpClientUtil 
       Did *not* bother updating deprecated classes that refer to HttpClientUtil; not necessary.

Author: dsmiley

solr/CHANGES.txt

@@ -239,6 +239,9 @@ Improvements
 
 * SOLR-17893: Speed up Remote Proxy for high QPS, utilizing ClusterState caching. (Houston Putman)
 
+* SOLR-17884: SolrJ users not using deprecated SolrClients can safely exclude Apache HttpClient dependencies.
+  (David Smiley)
+
 Optimizations
 ---------------------
 (No changes)

solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java

@@ -38,7 +38,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.management.MBeanServer;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.cloud.ClusterSingleton;
 import org.apache.solr.cluster.placement.PlacementPluginFactory;
 import org.apache.solr.common.ConfigNode;
@@ -435,10 +435,10 @@ private static UpdateShardHandlerConfig loadUpdateConfig(
 
     boolean defined = false;
 
-    int maxUpdateConnections = HttpClientUtil.DEFAULT_MAXCONNECTIONS;
-    int maxUpdateConnectionsPerHost = HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST;
-    int distributedSocketTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
-    int distributedConnectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
+    int maxUpdateConnections = SolrHttpConstants.DEFAULT_MAXCONNECTIONS;
+    int maxUpdateConnectionsPerHost = SolrHttpConstants.DEFAULT_MAXCONNECTIONSPERHOST;
+    int distributedSocketTimeout = SolrHttpConstants.DEFAULT_SO_TIMEOUT;
+    int distributedConnectionTimeout = SolrHttpConstants.DEFAULT_CONNECT_TIMEOUT;
     String metricNameStrategy = UpdateShardHandlerConfig.DEFAULT_METRICNAMESTRATEGY;
     int maxRecoveryThreads = UpdateShardHandlerConfig.DEFAULT_MAXRECOVERYTHREADS;
 

solr/core/src/java/org/apache/solr/handler/IndexFetcher.java

@@ -91,8 +91,8 @@
 import org.apache.solr.client.api.model.FileMetaData;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.InputStreamResponseParser;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.cloud.CloudDescriptor;
 import org.apache.solr.cloud.ZkController;
@@ -284,10 +284,10 @@ public IndexFetcher(
     String compress = (String) initArgs.get(COMPRESSION);
     useInternalCompression = ReplicationHandler.INTERNAL.equals(compress);
     useExternalCompression = ReplicationHandler.EXTERNAL.equals(compress);
-    soTimeout = getParameter(initArgs, HttpClientUtil.PROP_SO_TIMEOUT, 120000, null);
+    soTimeout = getParameter(initArgs, SolrHttpConstants.PROP_SO_TIMEOUT, 120000, null);
 
-    String httpBasicAuthUser = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_USER);
-    String httpBasicAuthPassword = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_PASS);
+    String httpBasicAuthUser = (String) initArgs.get(SolrHttpConstants.PROP_BASIC_AUTH_USER);
+    String httpBasicAuthPassword = (String) initArgs.get(SolrHttpConstants.PROP_BASIC_AUTH_PASS);
     solrClient =
         createSolrClient(solrCore, httpBasicAuthUser, httpBasicAuthPassword, leaderBaseUrl);
   }

solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java

@@ -31,9 +31,9 @@
 import java.util.stream.Collectors;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;
 import org.apache.solr.client.solrj.impl.LBSolrClient;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.routing.AffinityReplicaListTransformerFactory;
 import org.apache.solr.client.solrj.routing.ReplicaListTransformer;
@@ -294,17 +294,18 @@ public void init(PluginInfo info) {
     int connectionTimeout =
         getParameter(
             args,
-            HttpClientUtil.PROP_CONNECTION_TIMEOUT,
-            HttpClientUtil.DEFAULT_CONNECT_TIMEOUT,
+            SolrHttpConstants.PROP_CONNECTION_TIMEOUT,
+            SolrHttpConstants.DEFAULT_CONNECT_TIMEOUT,
             sb);
     int maxConnectionsPerHost =
         getParameter(
             args,
-            HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST,
-            HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST,
+            SolrHttpConstants.PROP_MAX_CONNECTIONS_PER_HOST,
+            SolrHttpConstants.DEFAULT_MAXCONNECTIONSPERHOST,
             sb);
     int soTimeout =
-        getParameter(args, HttpClientUtil.PROP_SO_TIMEOUT, HttpClientUtil.DEFAULT_SO_TIMEOUT, sb);
+        getParameter(
+            args, SolrHttpConstants.PROP_SO_TIMEOUT, SolrHttpConstants.DEFAULT_SO_TIMEOUT, sb);
 
     this.defaultClient =
         new Http2SolrClient.Builder()

solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.ExecutorUtil;
@@ -73,22 +73,22 @@ public class UpdateShardHandler implements SolrInfoBean {
 
   private SolrMetricsContext solrMetricsContext;
 
-  private int socketTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
-  private int connectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
+  private int socketTimeout = SolrHttpConstants.DEFAULT_SO_TIMEOUT;
+  private int connectionTimeout = SolrHttpConstants.DEFAULT_CONNECT_TIMEOUT;
 
   public UpdateShardHandler(UpdateShardHandlerConfig cfg) {
 
     ModifiableSolrParams clientParams = new ModifiableSolrParams();
     if (cfg != null) {
-      clientParams.set(HttpClientUtil.PROP_SO_TIMEOUT, cfg.getDistributedSocketTimeout());
+      clientParams.set(SolrHttpConstants.PROP_SO_TIMEOUT, cfg.getDistributedSocketTimeout());
       clientParams.set(
-          HttpClientUtil.PROP_CONNECTION_TIMEOUT, cfg.getDistributedConnectionTimeout());
+          SolrHttpConstants.PROP_CONNECTION_TIMEOUT, cfg.getDistributedConnectionTimeout());
       // following is done only for logging complete configuration.
       // The maxConnections and maxConnectionsPerHost have already been specified on the connection
       // manager
-      clientParams.set(HttpClientUtil.PROP_MAX_CONNECTIONS, cfg.getMaxUpdateConnections());
+      clientParams.set(SolrHttpConstants.PROP_MAX_CONNECTIONS, cfg.getMaxUpdateConnections());
       clientParams.set(
-          HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST, cfg.getMaxUpdateConnectionsPerHost());
+          SolrHttpConstants.PROP_MAX_CONNECTIONS_PER_HOST, cfg.getMaxUpdateConnectionsPerHost());
       socketTimeout = cfg.getDistributedSocketTimeout();
       connectionTimeout = cfg.getDistributedConnectionTimeout();
     }

solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java

@@ -16,7 +16,7 @@
  */
 package org.apache.solr.update;
 
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 
 public class UpdateShardHandlerConfig {
 
@@ -25,17 +25,17 @@ public class UpdateShardHandlerConfig {
 
   public static final UpdateShardHandlerConfig DEFAULT =
       new UpdateShardHandlerConfig(
-          HttpClientUtil.DEFAULT_MAXCONNECTIONS,
-          HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST,
-          HttpClientUtil.DEFAULT_SO_TIMEOUT,
-          HttpClientUtil.DEFAULT_CONNECT_TIMEOUT,
+          SolrHttpConstants.DEFAULT_MAXCONNECTIONS,
+          SolrHttpConstants.DEFAULT_MAXCONNECTIONSPERHOST,
+          SolrHttpConstants.DEFAULT_SO_TIMEOUT,
+          SolrHttpConstants.DEFAULT_CONNECT_TIMEOUT,
           DEFAULT_METRICNAMESTRATEGY,
           DEFAULT_MAXRECOVERYTHREADS);
 
   public static final UpdateShardHandlerConfig TEST_DEFAULT =
       new UpdateShardHandlerConfig(
-          HttpClientUtil.DEFAULT_MAXCONNECTIONS,
-          HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST,
+          SolrHttpConstants.DEFAULT_MAXCONNECTIONS,
+          SolrHttpConstants.DEFAULT_MAXCONNECTIONSPERHOST,
           30000,
           30000,
           UpdateShardHandlerConfig.DEFAULT_METRICNAMESTRATEGY,

solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java

@@ -27,8 +27,8 @@
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -48,7 +48,7 @@ public static void setupCluster() throws Exception {
     // for context)
     if (rarely()) {
       System.setProperty(
-          HttpClientUtil.SYS_PROP_HTTP_CLIENT_BUILDER_FACTORY,
+          SolrHttpConstants.SYS_PROP_HTTP_CLIENT_BUILDER_FACTORY,
           "org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory");
       System.setProperty("solr.security.auth.basicauth.credentials", SecurityJson.USER_PASS);
     }

solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java

@@ -39,6 +39,7 @@
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.common.cloud.ZkStateReader;
@@ -81,7 +82,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
 
   @Rule
   public TestRule syspropRestore =
-      new TestRuleRestoreSystemProperties(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME);
+      new TestRuleRestoreSystemProperties(SolrHttpConstants.SYS_PROP_CHECK_PEER_NAME);
 
   @Before
   public void before() {
@@ -177,7 +178,8 @@ private void checkClusterWithNodeReplacement(SSLTestConfig sslConfig) throws Exc
       SSLContext.setDefault(
           sslConfig.isSSLMode() ? sslConfig.buildClientSSLContext() : DEFAULT_SSL_CONTEXT);
       System.setProperty(
-          HttpClientUtil.SYS_PROP_CHECK_PEER_NAME, Boolean.toString(sslConfig.getCheckPeerName()));
+          SolrHttpConstants.SYS_PROP_CHECK_PEER_NAME,
+          Boolean.toString(sslConfig.getCheckPeerName()));
       HttpClientUtil.resetHttpClientBuilder();
       Http2SolrClient.resetSslContextFactory();
 
@@ -206,7 +208,7 @@ public void testSslWithInvalidPeerName() throws Exception {
 
       // now initialize a client that still uses the existing SSLContext/Provider, so it will accept
       // our existing certificate, but *does* care about validating the peer name
-      System.setProperty(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME, "true");
+      System.setProperty(SolrHttpConstants.SYS_PROP_CHECK_PEER_NAME, "true");
       HttpClientUtil.resetHttpClientBuilder();
       Http2SolrClient.resetSslContextFactory();
 

solr/core/src/test/org/apache/solr/core/TestHttpSolrClientProvider.java

@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.verify;
 
 import org.apache.solr.SolrTestCase;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.client.solrj.impl.SolrHttpConstants;
 import org.apache.solr.metrics.SolrMetricsContext;
 import org.apache.solr.update.UpdateShardHandlerConfig;
 import org.junit.Before;
@@ -46,7 +46,7 @@ public void test_when_updateShardHandler_cfg_is_null() {
     try (var httpSolrClientProvider = new HttpSolrClientProvider(null, parentSolrMetricCtx); ) {
       assertEquals(
           httpSolrClientProvider.getSolrClient().getIdleTimeout(),
-          HttpClientUtil.DEFAULT_SO_TIMEOUT);
+          SolrHttpConstants.DEFAULT_SO_TIMEOUT);
     }
   }
 

solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java

@@ -38,6 +38,7 @@
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteExecutionException;
+import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.FileStoreApi;
 import org.apache.solr.client.solrj.request.V2Request;
@@ -182,7 +183,7 @@ public void testFileStoreManagement() throws Exception {
           j.getBaseURLV2() + "/cluster/filestore/files" + "/package/mypkg/v1.0/runtimelibs.jar";
       HttpDelete del = new HttpDelete(path);
       try (HttpSolrClient cl = (HttpSolrClient) j.newClient()) {
-        Utils.executeHttpMethod(cl.getHttpClient(), path, Utils.JSONCONSUMER, del);
+        HttpClientUtil.executeHttpMethod(cl.getHttpClient(), path, Utils.JSONCONSUMER, del);
       }
       expected = Collections.singletonMap(":files:/package/mypkg/v1.0/runtimelibs.jar", null);
       checkAllNodesForFile(cluster, "/package/mypkg/v1.0/runtimelibs.jar", expected, false);
@@ -205,7 +206,7 @@ public static void checkAllNodesForFile(
       if (verifyContent) {
         try (HttpSolrClient solrClient = (HttpSolrClient) jettySolrRunner.newClient()) {
           ByteBuffer buf =
-              Utils.executeGET(
+              HttpClientUtil.executeGET(
                   solrClient.getHttpClient(),
                   baseUrl + "/cluster/filestore/files" + path,
                   Utils.newBytesConsumer(Integer.MAX_VALUE));
@@ -230,7 +231,7 @@ public Fetcher(String s, JettySolrRunner jettySolrRunner) {
     public NavigableObject call() throws Exception {
       try (HttpSolrClient solrClient = (HttpSolrClient) jetty.newClient()) {
         return (NavigableObject)
-            Utils.executeGET(solrClient.getHttpClient(), this.url, JAVABINCONSUMER);
+            HttpClientUtil.executeGET(solrClient.getHttpClient(), this.url, JAVABINCONSUMER);
       }
     }