Apache Solr open-source search software
SOLR-16368: Use SolrClient type instead of overly specific subclasses (#1012)
Eric Pugh02a1ff4b41d4
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.javaindex 76e025c318f..565ce004b99 100644--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java@@ -29,6 +29,7 @@ import org.apache.http.client.methods.HttpUriRequest;import org.apache.lucene.index.IndexCommit;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.store.Directory;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient.HttpUriRequestResponse;@@ -279,7 +280,7 @@ public class RecoveryStrategy implements Runnable, Closeable {}private final void commitOnLeader(String leaderUrl) throws SolrServerException, IOException {- try (HttpSolrClient client = recoverySolrClientBuilder(leaderUrl).build()) {+ try (SolrClient client = recoverySolrClientBuilder(leaderUrl).build()) {UpdateRequest ureq = new UpdateRequest();ureq.setParams(new ModifiableSolrParams());// ureq.getParams().set(DistributedUpdateProcessor.COMMIT_END_POINT, true);@@ -804,7 +805,7 @@ public class RecoveryStrategy implements Runnable, Closeable {return leaderReplica;}- try (HttpSolrClient httpSolrClient =+ try (SolrClient httpSolrClient =recoverySolrClientBuilder(leaderReplica.getCoreUrl()).build()) {httpSolrClient.ping();return leaderReplica;diff --git a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.javaindex 9aeff026b20..129d6c6f84c 100644--- a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java+++ b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java@@ -24,6 +24,7 @@ import java.util.ArrayList;import java.util.List;import java.util.concurrent.ExecutorService;import org.apache.http.client.HttpClient;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest.RequestRecovery;@@ -361,7 +362,7 @@ public class SyncStrategy {recoverRequestCmd.setAction(CoreAdminAction.REQUESTRECOVERY);recoverRequestCmd.setCoreName(coreName);- try (HttpSolrClient client =+ try (SolrClient client =new HttpSolrClient.Builder(baseUrl).withHttpClient(SyncStrategy.this.client).withConnectionTimeout(30000)diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex 1465e1bf41c..6d3e102baea 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -59,9 +59,9 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicReference;import java.util.function.Supplier;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;import org.apache.solr.client.solrj.impl.SolrClientCloudManager;import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;@@ -2153,7 +2153,7 @@ public class ZkController implements Closeable {// short timeouts, we may be in a storm and this is best effort and maybe we should be the// leader now- try (HttpSolrClient client =+ try (SolrClient client =new Builder(leaderBaseUrl).withConnectionTimeout(8000).withSocketTimeout(30000)diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.javaindex 76f077387a5..68a8baceb15 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java@@ -35,6 +35,7 @@ import java.util.Set;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;@@ -235,7 +236,7 @@ public class CollectionHandlingUtils {static UpdateResponse softCommit(String url) throws SolrServerException, IOException {- try (HttpSolrClient client =+ try (SolrClient client =new HttpSolrClient.Builder(url).withConnectionTimeout(30000).withSocketTimeout(120000)diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.javaindex 663a0480574..9a35d9a712e 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java@@ -34,6 +34,7 @@ import java.util.function.Function;import java.util.stream.Collectors;import java.util.stream.Stream;import org.apache.http.client.HttpClient;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.cloud.DistribStateManager;import org.apache.solr.client.solrj.impl.CloudSolrClient;@@ -740,7 +741,7 @@ public class ReindexCollectionCmd implements CollApiCmds.CollectionApiCommand {Map<String, Object> reindexingState)throws Exception {HttpClient client = ccc.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient();- try (HttpSolrClient solrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder().withHttpClient(client).withBaseSolrUrl(daemonUrl).build()) {ModifiableSolrParams q = new ModifiableSolrParams();q.set(CommonParams.QT, "/stream");@@ -798,7 +799,7 @@ public class ReindexCollectionCmd implements CollApiCmds.CollectionApiCommand {private void killDaemon(String daemonName, String daemonUrl) throws Exception {log.debug("-- killing daemon {} at {}", daemonName, daemonUrl);HttpClient client = ccc.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient();- try (HttpSolrClient solrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder().withHttpClient(client).withBaseSolrUrl(daemonUrl).build()) {ModifiableSolrParams q = new ModifiableSolrParams();q.set(CommonParams.QT, "/stream");diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javaindex d2a70f68eee..d0ab8c1da91 100644--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java@@ -97,6 +97,7 @@ import org.apache.lucene.store.FilterDirectory;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpClientUtil;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -369,7 +370,7 @@ public class IndexFetcher {QueryRequest req = new QueryRequest(params);// TODO modify to use shardhandler- try (HttpSolrClient client =+ try (SolrClient client =new Builder(leaderUrl).withHttpClient(myHttpClient).withConnectionTimeout(connTimeout)@@ -396,7 +397,7 @@ public class IndexFetcher {QueryRequest req = new QueryRequest(params);// TODO modify to use shardhandler- try (HttpSolrClient client =+ try (SolrClient client =new HttpSolrClient.Builder(leaderUrl).withHttpClient(myHttpClient).withConnectionTimeout(connTimeout)@@ -1986,7 +1987,7 @@ public class IndexFetcher {InputStream is = null;// TODO use shardhandler- try (HttpSolrClient client =+ try (SolrClient client =new Builder(leaderUrl).withHttpClient(myHttpClient).withResponseParser(null)@@ -2111,7 +2112,7 @@ public class IndexFetcher {params.set(CommonParams.QT, ReplicationHandler.PATH);// TODO use shardhandler- try (HttpSolrClient client =+ try (SolrClient client =new HttpSolrClient.Builder(leaderUrl).withHttpClient(myHttpClient).withConnectionTimeout(connTimeout)diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.javaindex 6a6ec8076b1..85b562aa6df 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java@@ -144,8 +144,8 @@ import org.apache.commons.lang3.StringUtils;import org.apache.solr.api.AnnotatedApi;import org.apache.solr.api.Api;import org.apache.solr.api.JerseyResource;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest.RequestSyncShard;@@ -721,7 +721,7 @@ public class CollectionsHandler extends RequestHandlerBase implements PermissionZkNodeProps leaderProps = docCollection.getLeader(shard);ZkCoreNodeProps nodeProps = new ZkCoreNodeProps(leaderProps);- try (HttpSolrClient client =+ try (SolrClient client =new Builder(nodeProps.getBaseUrl()).withConnectionTimeout(15000).withSocketTimeout(60000)diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.javaindex 977e3f180dc..6b3af985ef7 100644--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java@@ -29,6 +29,7 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.SynchronousQueue;import java.util.concurrent.TimeUnit;import org.apache.commons.lang3.StringUtils;+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;@@ -386,7 +387,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory}}- public Http2SolrClient getClient() {+ public SolrClient getClient() {return defaultClient;}diff --git a/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java b/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.javaindex aa2029ea065..5729128729a 100644--- a/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java+++ b/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java@@ -25,9 +25,9 @@ import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import org.apache.http.impl.client.CloseableHttpClient;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -79,7 +79,7 @@ public abstract class IterativeMergeStrategy implements MergeStrategy {public void handleMergeFields(ResponseBuilder rb, SolrIndexSearcher searcher) {}public class CallBack implements Callable<CallBack> {- private HttpSolrClient solrClient;+ private SolrClient solrClient;private QueryRequest req;private QueryResponse response;private ShardResponse originalShardResponse;diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.javaindex 11c1e20cd94..0c62ec057ec 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageUtils.java@@ -274,8 +274,7 @@ public class PackageUtils {return "/api/collections/" + collection + "/config/params";}- public static void uploadKey(byte[] bytes, String path, Path home, HttpSolrClient client)- throws IOException {+ public static void uploadKey(byte[] bytes, String path, Path home) throws IOException {PackageStoreAPI.MetaData meta = PackageStoreAPI._createJsonMetaData(bytes, null);DistribPackageStore._persistToFile(home, path, ByteBuffer.wrap(bytes), ByteBuffer.wrap(Utils.toJSON(meta)));diff --git a/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java b/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.javaindex 5b67b92c9d0..3affac550f9 100644--- a/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java+++ b/solr/core/src/java/org/apache/solr/packagemanager/RepositoryManager.java@@ -141,7 +141,7 @@ public class RepositoryManager {// put the public key into package store's trusted key store and request a sync.String path = PackageStoreAPI.KEYS_DIR + "/" + destinationKeyFilename;- PackageUtils.uploadKey(key, path, Paths.get(solrHome), solrClient);+ PackageUtils.uploadKey(key, path, Paths.get(solrHome));PackageUtils.getJsonStringFromUrl(solrClient.getHttpClient(),solrClient.getBaseURL() + "/api/node/files" + path + "?sync=true");diff --git a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.javaindex e040a27bb72..d2ab56829e3 100644--- a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java+++ b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java@@ -29,6 +29,7 @@ import java.lang.invoke.MethodHandles;import java.util.List;import java.util.Set;import org.apache.http.client.HttpClient;+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.HttpSolrClient;@@ -54,7 +55,7 @@ public class PeerSyncWithLeader implements SolrMetricProducer {private UpdateHandler uhandler;private UpdateLog ulog;- private HttpSolrClient clientToLeader;+ private SolrClient clientToLeader;private boolean doFingerprint;diff --git a/solr/core/src/java/org/apache/solr/util/ExportTool.java b/solr/core/src/java/org/apache/solr/util/ExportTool.javaindex 35ad4b80b84..1f611a8e03e 100644--- a/solr/core/src/java/org/apache/solr/util/ExportTool.java+++ b/solr/core/src/java/org/apache/solr/util/ExportTool.java@@ -55,6 +55,7 @@ import java.util.zip.GZIPOutputStream;import org.apache.commons.cli.CommandLine;import org.apache.commons.cli.Option;import org.apache.lucene.util.SuppressForbidden;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;@@ -490,8 +491,8 @@ public class ExportTool extends SolrCLI.ToolBase {}boolean exportDocsFromCore() throws IOException, SolrServerException {- HttpSolrClient client = new HttpSolrClient.Builder(baseurl).build();- try {++ try (SolrClient client = new HttpSolrClient.Builder(baseurl).build()) {expectedDocs = getDocCount(replica.getCoreName(), client);GenericSolrRequest request;ModifiableSolrParams params = new ModifiableSolrParams();@@ -554,14 +555,12 @@ public class ExportTool extends SolrCLI.ToolBase {return false;}}- } finally {- client.close();}}}}- static long getDocCount(String coreName, HttpSolrClient client)+ static long getDocCount(String coreName, SolrClient client)throws SolrServerException, IOException {SolrQuery q = new SolrQuery("*:*");q.setRows(0);diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.javaindex c45f08cfe8b..15dc4fe1253 100755--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java@@ -3046,7 +3046,7 @@ public class SolrCLI implements CLIO {"exampledocs directory not found, skipping indexing step for the techproducts example");}} else if ("films".equals(exampleName) && !alreadyExists) {- HttpSolrClient solrClient = new HttpSolrClient.Builder(solrUrl).build();+ SolrClient solrClient = new HttpSolrClient.Builder(solrUrl).build();echo("Adding name and initial_release_data fields to films schema \"_default\"");try {@@ -4075,7 +4075,7 @@ public class SolrCLI implements CLIO {}private static boolean runningSolrIsCloud(String url) throws Exception {- try (final HttpSolrClient client = new HttpSolrClient.Builder(url).build()) {+ try (final SolrClient client = new HttpSolrClient.Builder(url).build()) {final SolrRequest<CollectionAdminResponse> request =new CollectionAdminRequest.ClusterStatus();final CollectionAdminResponse response = request.process(client);diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.javaindex 7665b112f00..f218823471c 100644--- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java+++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java@@ -23,7 +23,6 @@ import org.apache.commons.io.FileUtils;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.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;@@ -68,7 +67,7 @@ public class TestTolerantSearch extends SolrJettyTestBase {shard2 = urlCollection2.replaceAll("https?://", "");// create second core- try (HttpSolrClient nodeClient = getHttpSolrClient(url)) {+ try (SolrClient nodeClient = getHttpSolrClient(url)) {CoreAdminRequest.Create req = new CoreAdminRequest.Create();req.setCoreName("collection2");req.setConfigSet("collection1");diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.javaindex 5b0e05bf635..50cdd81b7b2 100644--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java@@ -33,6 +33,7 @@ import org.apache.http.entity.StringEntity;import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.util.EntityUtils;import org.apache.lucene.util.IOUtils;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;@@ -41,7 +42,6 @@ import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -907,12 +907,12 @@ public class AliasIntegrationTest extends SolrCloudTestCase {// HttpSolrClientJettySolrRunner jetty = cluster.getRandomJetty(random());if (random().nextBoolean()) {- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(jetty.getBaseUrl().toString() + "/" + collectionList)) {responseConsumer.accept(client.query(null, solrQuery));}} else {- try (HttpSolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString())) {responseConsumer.accept(client.query(collectionList, solrQuery));}}diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.javaindex ecb48c6fae3..1a99f66f2aa 100644--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java@@ -43,7 +43,6 @@ import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.CoreStatus;@@ -402,9 +401,9 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {String nodeName = (String) response._get("success[0]/key", null);String corename = (String) response._get(asList("success", nodeName, "core"), null);- try (HttpSolrClient coreclient =+ try (SolrClient coreClient =getHttpSolrClient(cluster.getZkStateReader().getBaseUrlForNodeName(nodeName))) {- CoreAdminResponse status = CoreAdminRequest.getStatus(corename, coreclient);+ CoreAdminResponse status = CoreAdminRequest.getStatus(corename, coreClient);assertEquals(collectionName, status._get(asList("status", corename, "cloud", "collection"), null));assertNotNull(status._get(asList("status", corename, "cloud", "shard"), null));diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.javaindex 0aa13d8fd5b..52caba7ebfa 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java@@ -28,9 +28,9 @@ import java.util.Objects;import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;+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.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -315,7 +315,7 @@ public class DistribDocExpirationUpdateProcessorTest extends SolrCloudTestCase {for (Replica replica : collectionState.getReplicas()) {String coreName = replica.getCoreName();- try (HttpSolrClient client = getHttpSolrClient(replica.getCoreUrl())) {+ try (SolrClient client = getHttpSolrClient(replica.getCoreUrl())) {ModifiableSolrParams params = new ModifiableSolrParams();params.set("command", "indexversion");diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.javaindex ba4379727bc..2e95e685c17 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java@@ -36,7 +36,6 @@ 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.SolrServerException;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -320,9 +319,9 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {int lastDocId,Set<Integer> deletedDocs)throws Exception {- HttpSolrClient leaderSolr = getHttpSolrClient(leader);- List<HttpSolrClient> replicas = new ArrayList<HttpSolrClient>(notLeaders.size());- for (Replica r : notLeaders) replicas.add(getHttpSolrClient(r));+ SolrClient leaderSolr = getSolrClient(leader);+ List<SolrClient> replicas = new ArrayList<SolrClient>(notLeaders.size());+ for (Replica r : notLeaders) replicas.add(getSolrClient(r));try {for (int d = firstDocId; d <= lastDocId; d++) {@@ -331,7 +330,7 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {String docId = String.valueOf(d);Long leaderVers = assertDocExists(leaderSolr, docId, null);- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {assertDocExists(replicaSolr, docId, leaderVers);}}@@ -339,13 +338,13 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {if (leaderSolr != null) {leaderSolr.close();}- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {replicaSolr.close();}}}- protected HttpSolrClient getHttpSolrClient(Replica replica) {+ protected SolrClient getSolrClient(Replica replica) {return getHttpSolrClient(replica.getCoreUrl());}@@ -361,7 +360,7 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {* Query the real-time get handler for a specific doc by ID to verify it exists in the provided* server, using distrib=false, so it doesn't route to another replica.*/- protected Long assertDocExists(HttpSolrClient solr, String docId, Long expVers) throws Exception {+ protected Long assertDocExists(SolrClient solr, String docId, Long expVers) throws Exception {QueryRequest qr =new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false", "fl", "id,_version_"));@@ -369,15 +368,7 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {SolrDocument doc = (SolrDocument) rsp.get("doc");String match = JSONTestUtil.matchObj("/id", doc, docId);assertTrue(- "Doc with id="- + docId- + " not found in "- + solr.getBaseURL()- + " due to: "- + match- + "; rsp="- + rsp,- match == null);+ "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);Long vers = (Long) doc.getFirstValue("_version_");assertNotNull(vers);@@ -391,7 +382,7 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {ZkCoreNodeProps coreProps = new ZkCoreNodeProps(replica);String coreName = coreProps.getCoreName();boolean reloadedOk = false;- try (HttpSolrClient client = getHttpSolrClient(coreProps.getBaseUrl())) {+ try (SolrClient client = getHttpSolrClient(coreProps.getBaseUrl())) {CoreAdminResponse statusResp = CoreAdminRequest.getStatus(coreName, client);long leaderCoreStartTime = statusResp.getStartTime(coreName).getTime();diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.javaindex d8d3d8869fa..ffd2df472fd 100644--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java@@ -34,7 +34,6 @@ import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.RequestStatusState;@@ -433,7 +432,7 @@ public class FullSolrCloudDistribCmdsTest extends SolrCloudTestCase {}// create client to send our updates to...- try (HttpSolrClient indexClient = getHttpSolrClient(indexingUrl)) {+ try (SolrClient indexClient = getHttpSolrClient(indexingUrl)) {// Sanity check: we should be able to send a bunch of updates that work right now...for (int i = 0; i < 100; i++) {@@ -752,11 +751,11 @@ public class FullSolrCloudDistribCmdsTest extends SolrCloudTestCase {final Slice slice = entry.getValue();log.info("Checking: {} -> {}", shardName, slice);final Replica leader = entry.getValue().getLeader();- try (HttpSolrClient leaderClient = getHttpSolrClient(leader.getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(leader.getCoreUrl())) {final SolrDocumentList leaderResults = leaderClient.query(perReplicaParams).getResults();log.debug("Shard {}: Leader results: {}", shardName, leaderResults);for (Replica replica : slice) {- try (HttpSolrClient replicaClient = getHttpSolrClient(replica.getCoreUrl())) {+ try (SolrClient replicaClient = getHttpSolrClient(replica.getCoreUrl())) {final SolrDocumentList replicaResults =replicaClient.query(perReplicaParams).getResults();if (log.isDebugEnabled()) {diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.javaindex 3b7eecb7094..6006784744c 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionOnCommitTest.java@@ -20,9 +20,9 @@ import java.io.File;import java.lang.invoke.MethodHandles;import java.util.List;import org.apache.http.NoHttpResponseException;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;@@ -190,7 +190,7 @@ public class HttpPartitionOnCommitTest extends BasicDistributedZkTest {String replicaCoreUrl = replica.getCoreUrl();log.info("Sending commit request to: {}", replicaCoreUrl);final RTimer timer = new RTimer();- try (HttpSolrClient client = getHttpSolrClient(replicaCoreUrl)) {+ try (SolrClient client = getHttpSolrClient(replicaCoreUrl)) {try {client.commit();diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.javaindex 42cd7278909..67867a7ebd7 100644--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java@@ -476,19 +476,19 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {if (log.isInfoEnabled()) {log.info("Sending doc 2 to old leader {}", leader.getName());}- try (HttpSolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName)) {+ try (SolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName)) {leaderSolr.add(doc);leaderSolr.close();// if the add worked, then the doc must exist on the new leader- try (HttpSolrClient newLeaderSolr = getHttpSolrClient(currentLeader, testCollectionName)) {+ try (SolrClient newLeaderSolr = getHttpSolrClient(currentLeader, testCollectionName)) {assertDocExists(newLeaderSolr, "2");}} catch (SolrException exc) {// this is ok provided the doc doesn't exist on the current leader- try (HttpSolrClient client = getHttpSolrClient(currentLeader, testCollectionName)) {+ try (SolrClient client = getHttpSolrClient(currentLeader, testCollectionName)) {client.add(doc); // this should work}}@@ -537,8 +537,8 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {throws Exception {Replica leader =ZkStateReader.from(cloudClient).getLeaderRetry(testCollectionName, "shard1", 10000);- HttpSolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName);- List<HttpSolrClient> replicas = new ArrayList<>(notLeaders.size());+ SolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName);+ List<SolrClient> replicas = new ArrayList<SolrClient>(notLeaders.size());for (Replica r : notLeaders) {replicas.add(getHttpSolrClient(r, testCollectionName));@@ -547,7 +547,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {for (int d = firstDocId; d <= lastDocId; d++) {String docId = String.valueOf(d);assertDocExists(leaderSolr, docId);- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {assertDocExists(replicaSolr, docId);}}@@ -555,13 +555,13 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {if (leaderSolr != null) {leaderSolr.close();}- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {replicaSolr.close();}}}- protected HttpSolrClient getHttpSolrClient(Replica replica, String coll) {+ protected SolrClient getHttpSolrClient(Replica replica, String coll) {ZkCoreNodeProps zkProps = new ZkCoreNodeProps(replica);String url = zkProps.getBaseUrl() + "/" + coll;return getHttpSolrClient(url);@@ -570,7 +570,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {// Send doc directly to a server (without going through proxy)protected int sendDoc(int docId, JettySolrRunner leaderJetty)throws IOException, SolrServerException {- try (HttpSolrClient solrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder(leaderJetty.getBaseUrl().toString()).build()) {return sendDoc(docId, solrClient, cloudClient.getDefaultCollection());}@@ -596,22 +596,14 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {* Query the real-time get handler for a specific doc by ID to verify it exists in the provided* server, using distrib=false, so it doesn't route to another replica.*/- protected void assertDocExists(HttpSolrClient solr, String docId) throws Exception {+ protected void assertDocExists(SolrClient solr, String docId) throws Exception {NamedList<?> rsp = realTimeGetDocId(solr, docId);String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);assertTrue(- "Doc with id="- + docId- + " not found in "- + solr.getBaseURL()- + " due to: "- + match- + "; rsp="- + rsp,- match == null);+ "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);}- private NamedList<Object> realTimeGetDocId(HttpSolrClient solr, String docId)+ private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)throws SolrServerException, IOException {QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));return solr.request(qr);diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.javaindex ba317ba03de..6dd13539a8e 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java@@ -23,9 +23,9 @@ import java.util.List;import java.util.Set;import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.ZkStateReader;@@ -125,11 +125,11 @@ public class LeaderFailoverAfterPartitionTest extends HttpPartitionTest {// doc should be on leader and 1 replicasendDoc(5);- try (HttpSolrClient server = getHttpSolrClient(leader, testCollectionName)) {+ try (SolrClient server = getHttpSolrClient(leader, testCollectionName)) {assertDocExists(server, "5");}- try (HttpSolrClient server = getHttpSolrClient(notLeaders.get(1), testCollectionName)) {+ try (SolrClient server = getHttpSolrClient(notLeaders.get(1), testCollectionName)) {assertDocExists(server, "5");}diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.javaindex 0ba7e2d34d0..e99479f5a29 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java@@ -127,7 +127,7 @@ public class LeaderTragicEventTest extends SolrCloudTestCase {Replica oldLeader = dc.getLeader("shard1");log.info("Will crash leader : {}", oldLeader);- try (HttpSolrClient solrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder(dc.getLeader("shard1").getCoreUrl()).build()) {new UpdateRequest().add("id", "99").commit(solrClient, null);fail("Should have injected tragedy");diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.javaindex 899ae3eddfb..f8cac78ef84 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java@@ -30,6 +30,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.TimeUnit;import org.apache.solr.JSONTestUtil;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;@@ -291,7 +292,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {private void addDoc(String collection, int docId, JettySolrRunner solrRunner)throws IOException, SolrServerException {- try (HttpSolrClient solrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {solrClient.add(collection, new SolrInputDocument("id", String.valueOf(docId)));solrClient.commit(collection);@@ -302,17 +303,17 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {List<Replica> notLeaders, String testCollectionName, int firstDocId, int lastDocId)throws Exception {Replica leader = cluster.getZkStateReader().getLeaderRetry(testCollectionName, "shard1", 10000);- HttpSolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName);- List<HttpSolrClient> replicas = new ArrayList<>(notLeaders.size());+ SolrClient leaderSolr = getSolrClient(leader, testCollectionName);+ List<SolrClient> replicas = new ArrayList<>(notLeaders.size());for (Replica r : notLeaders) {- replicas.add(getHttpSolrClient(r, testCollectionName));+ replicas.add(getSolrClient(r, testCollectionName));}try {for (int d = firstDocId; d <= lastDocId; d++) {String docId = String.valueOf(d);assertDocExists(leaderSolr, docId);- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {assertDocExists(replicaSolr, docId);}}@@ -320,34 +321,26 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {if (leaderSolr != null) {leaderSolr.close();}- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {replicaSolr.close();}}}- private void assertDocExists(HttpSolrClient solr, String docId) throws Exception {+ private void assertDocExists(SolrClient solr, String docId) throws Exception {NamedList<?> rsp = realTimeGetDocId(solr, docId);String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);assertTrue(- "Doc with id="- + docId- + " not found in "- + solr.getBaseURL()- + " due to: "- + match- + "; rsp="- + rsp,- match == null);+ "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);}- private NamedList<Object> realTimeGetDocId(HttpSolrClient solr, String docId)+ private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)throws SolrServerException, IOException {QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));return solr.request(qr);}- protected HttpSolrClient getHttpSolrClient(Replica replica, String coll) {+ protected SolrClient getSolrClient(Replica replica, String coll) {ZkCoreNodeProps zkProps = new ZkCoreNodeProps(replica);String url = zkProps.getBaseUrl() + "/" + coll;return getHttpSolrClient(url);diff --git a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.javaindex eaa64252676..c4b6a485406 100644--- a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java@@ -20,11 +20,11 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.util.Map;import java.util.concurrent.TimeUnit;+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.BaseHttpSolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrInputDocument;@@ -134,7 +134,7 @@ public class MigrateRouteKeyTest extends SolrCloudTestCase {DocCollection state = getCollectionState(targetCollection);Replica replica = state.getReplicas().get(0);- try (HttpSolrClient collectionClient = getHttpSolrClient(replica.getCoreUrl())) {+ try (SolrClient collectionClient = getHttpSolrClient(replica.getCoreUrl())) {SolrQuery solrQuery = new SolrQuery("*:*");assertEquals(diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.javaindex 1bfa9aadee0..1af74d73011 100644--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java@@ -27,9 +27,9 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;import org.apache.commons.lang3.StringUtils;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.response.CoreAdminResponse;@@ -116,9 +116,9 @@ public class ReplaceNodeTest extends SolrCloudTestCase {createReplaceNodeRequest(nodeToBeDecommissioned, emptyNode, null).processAndWait("000", cloudClient, 15);ZkStateReader zkStateReader = ZkStateReader.from(cloudClient);- try (HttpSolrClient coreclient =+ try (SolrClient coreClient =getHttpSolrClient(zkStateReader.getBaseUrlForNodeName(nodeToBeDecommissioned))) {- CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreclient);+ CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreClient);assertEquals(0, status.getCoreStatus().size());}@@ -138,9 +138,9 @@ public class ReplaceNodeTest extends SolrCloudTestCase {replaceNodeRequest.setWaitForFinalState(true);replaceNodeRequest.processAndWait("001", cloudClient, 10);- try (HttpSolrClient coreclient =+ try (SolrClient coreClient =getHttpSolrClient(zkStateReader.getBaseUrlForNodeName(emptyNode))) {- CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreclient);+ CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreClient);assertEquals("Expecting no cores but found some: " + status.getCoreStatus(),0,diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.javaindex 042e7293cc2..6b24cc7341d 100644--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java@@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.commons.lang3.StringUtils;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -271,7 +271,7 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {Replica replica, UpdateRequest up, int expectedRf, String collection) throws Exception {ZkCoreNodeProps zkProps = new ZkCoreNodeProps(replica);String url = zkProps.getBaseUrl() + "/" + collection;- try (HttpSolrClient solrServer = getHttpSolrClient(url)) {+ try (SolrClient solrServer = getHttpSolrClient(url)) {NamedList<?> resp = solrServer.request(up);NamedList<?> hdr = (NamedList<?>) resp.get("responseHeader");Integer batchRf = (Integer) hdr.get(UpdateRequest.REPFACT);diff --git a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.javaindex 7a469aaefb9..3884f14134d 100644--- a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java@@ -24,6 +24,7 @@ import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.List;import java.util.Map;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -153,13 +154,13 @@ public class RouteFieldTest extends SolrCloudTestCase {params.add(CommonParams.SORT, "sorter asc");params.add(CommonParams.ROWS, "1000");- HttpSolrClient httpSC = new HttpSolrClient.Builder(urlId).build();- SolrDocumentList docsId = (SolrDocumentList) httpSC.request(request).get("response");- httpSC.close();+ SolrClient solrClient = new HttpSolrClient.Builder(urlId).build();+ SolrDocumentList docsId = (SolrDocumentList) solrClient.request(request).get("response");+ solrClient.close();- httpSC = new HttpSolrClient.Builder(urlRoute).build();- SolrDocumentList docsRoute = (SolrDocumentList) httpSC.request(request).get("response");- httpSC.close();+ solrClient = new HttpSolrClient.Builder(urlRoute).build();+ SolrDocumentList docsRoute = (SolrDocumentList) solrClient.request(request).get("response");+ solrClient.close();assertEquals("We should have the exact same number of docs on each shard",diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.javaindex 30558935015..88f629018ff 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java@@ -28,6 +28,7 @@ import java.util.Map;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.solr.JSONTestUtil;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;@@ -298,7 +299,7 @@ public class TestCloudConsistency extends SolrCloudTestCase {private void addDoc(String collection, int docId, JettySolrRunner solrRunner)throws IOException, SolrServerException {- try (HttpSolrClient solrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder(solrRunner.getBaseUrl().toString()).build()) {solrClient.add(collection,@@ -311,8 +312,8 @@ public class TestCloudConsistency extends SolrCloudTestCase {List<Replica> notLeaders, String testCollectionName, int firstDocId, int lastDocId)throws Exception {Replica leader = cluster.getZkStateReader().getLeaderRetry(testCollectionName, "shard1", 10000);- HttpSolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName);- List<HttpSolrClient> replicas = new ArrayList<>(notLeaders.size());+ SolrClient leaderSolr = getHttpSolrClient(leader, testCollectionName);+ List<SolrClient> replicas = new ArrayList<>(notLeaders.size());for (Replica r : notLeaders) {replicas.add(getHttpSolrClient(r, testCollectionName));@@ -321,7 +322,7 @@ public class TestCloudConsistency extends SolrCloudTestCase {for (int d = firstDocId; d <= lastDocId; d++) {String docId = String.valueOf(d);assertDocExists(leaderSolr, docId);- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {assertDocExists(replicaSolr, docId);}}@@ -329,34 +330,26 @@ public class TestCloudConsistency extends SolrCloudTestCase {if (leaderSolr != null) {leaderSolr.close();}- for (HttpSolrClient replicaSolr : replicas) {+ for (SolrClient replicaSolr : replicas) {replicaSolr.close();}}}- private void assertDocExists(HttpSolrClient solr, String docId) throws Exception {+ private void assertDocExists(SolrClient solr, String docId) throws Exception {NamedList<?> rsp = realTimeGetDocId(solr, docId);String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);assertTrue(- "Doc with id="- + docId- + " not found in "- + solr.getBaseURL()- + " due to: "- + match- + "; rsp="- + rsp,- match == null);+ "Doc with id=" + docId + " not found due to: " + match + "; rsp=" + rsp, match == null);}- private NamedList<Object> realTimeGetDocId(HttpSolrClient solr, String docId)+ private NamedList<Object> realTimeGetDocId(SolrClient solr, String docId)throws SolrServerException, IOException {QueryRequest qr = new QueryRequest(params("qt", "/get", "id", docId, "distrib", "false"));return solr.request(qr);}- protected HttpSolrClient getHttpSolrClient(Replica replica, String coll) {+ protected SolrClient getHttpSolrClient(Replica replica, String coll) {ZkCoreNodeProps zkProps = new ZkCoreNodeProps(replica);String url = zkProps.getBaseUrl() + "/" + coll;return getHttpSolrClient(url);diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.javaindex 12c4c6f7aa1..515dfc3671a 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java@@ -24,7 +24,6 @@ import java.util.Map;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.SolrDocument;@@ -54,19 +53,19 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {private static CloudSolrClient CLOUD_CLIENT;/** A client for talking directly to the leader of shard1 */- private static HttpSolrClient S_ONE_LEADER_CLIENT;+ private static SolrClient S_ONE_LEADER_CLIENT;/** A client for talking directly to the leader of shard2 */- private static HttpSolrClient S_TWO_LEADER_CLIENT;+ private static SolrClient S_TWO_LEADER_CLIENT;/** A client for talking directly to a passive replica of shard1 */- private static HttpSolrClient S_ONE_NON_LEADER_CLIENT;+ private static SolrClient S_ONE_NON_LEADER_CLIENT;/** A client for talking directly to a passive replica of shard2 */- private static HttpSolrClient S_TWO_NON_LEADER_CLIENT;+ private static SolrClient S_TWO_NON_LEADER_CLIENT;/** A client for talking directly to a node that has no piece of the collection */- private static HttpSolrClient NO_COLLECTION_CLIENT;+ private static SolrClient NO_COLLECTION_CLIENT;/** id field doc routing prefix for shard1 */private static final String S_ONE_PRE = "abc!";diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.javaindex 2f2fd10799c..2e4b47e2c22 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPhrasesIdentificationComponent.java@@ -28,7 +28,6 @@ import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -52,7 +51,7 @@ public class TestCloudPhrasesIdentificationComponent extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);+ private static final ArrayList<SolrClient> CLIENTS = new ArrayList<>(5);@BeforeClasspublic static void createMiniSolrCloudCluster() throws Exception {@@ -115,7 +114,7 @@ public class TestCloudPhrasesIdentificationComponent extends SolrCloudTestCase {CLOUD_CLIENT.close();CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {client.close();}CLIENTS.clear();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.javaindex 98ac3baa314..1bc10314931 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPseudoReturnFields.java@@ -30,7 +30,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;import org.apache.solr.client.solrj.response.QueryResponse;@@ -57,7 +56,7 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);+ private static final ArrayList<SolrClient> CLIENTS = new ArrayList<>(5);@BeforeClasspublic static void createMiniSolrCloudCluster() throws Exception {@@ -135,7 +134,7 @@ public class TestCloudPseudoReturnFields extends SolrCloudTestCase {CLOUD_CLIENT.close();CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {client.close();}CLIENTS.clear();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.javaindex 2fc601b52a9..4eb595de125 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java@@ -17,9 +17,9 @@package org.apache.solr.cloud;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.common.cloud.Replica;@@ -49,7 +49,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {public void test() throws Exception {JettySolrRunner node1 = cluster.getJettySolrRunner(0);JettySolrRunner node2 = cluster.getJettySolrRunner(1);- try (HttpSolrClient client1 = getHttpSolrClient(node1.getBaseUrl().toString())) {+ try (SolrClient client1 = getHttpSolrClient(node1.getBaseUrl().toString())) {node2.stop();waitForState("", COLLECTION, (liveNodes, collectionState) -> liveNodes.size() == 1);@@ -63,7 +63,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {node2.start();waitForState("", COLLECTION, clusterShape(1, 2));- try (HttpSolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {long numFound =client.query(COLLECTION, new SolrQuery("q", "*:*", "distrib", "false"))@@ -80,7 +80,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {new UpdateRequest().add("id", "1", "num", "10").commit(client1, COLLECTION);- try (HttpSolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {Object v =client.query(COLLECTION, new SolrQuery("q", "id:1", "distrib", "false"))@@ -112,7 +112,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {node2.start();waitForState("", COLLECTION, clusterShape(1, 2));- try (HttpSolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {v =client.query(COLLECTION, new SolrQuery("q", "id:1", "distrib", "false"))@@ -137,7 +137,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {node2.start();waitForState("", COLLECTION, clusterShape(1, 2));- try (HttpSolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {v =client.query(COLLECTION, new SolrQuery("q", "id:1", "distrib", "false"))@@ -166,7 +166,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {node1.start();waitForState("", COLLECTION, clusterShape(1, 2));- try (HttpSolrClient client = getHttpSolrClient(node1.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(node1.getBaseUrl().toString())) {Object v =client.query(COLLECTION, new SolrQuery("q", "id:1", "distrib", "false"))@@ -175,7 +175,7 @@ public class TestCloudRecovery2 extends SolrCloudTestCase {.get("num");assertEquals("30", v.toString());}- try (HttpSolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(node2.getBaseUrl().toString())) {Object v =client.query(COLLECTION, new SolrQuery("q", "id:1", "distrib", "false"))diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.javaindex 7de9a408e45..54e51841968 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java@@ -20,12 +20,12 @@ package org.apache.solr.cloud;import java.io.IOException;import java.util.List;import java.util.concurrent.TimeUnit;+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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -118,7 +118,7 @@ public class TestLeaderElectionWithEmptyReplica extends SolrCloudTestCase {long numFound = Long.MIN_VALUE;int count = 0;for (Replica replica : shard.getReplicas()) {- HttpSolrClient client =+ SolrClient client =new Builder(replica.getCoreUrl()).withHttpClient(((CloudLegacySolrClient) cloudClient).getHttpClient()).build();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.javaindex b25f58dfbe0..bea102c605b 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java@@ -33,6 +33,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;@@ -218,7 +219,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {expectThrows(SolrServerException.class,() -> {- try (HttpSolrClient client = getRandomizedHttpSolrClient(baseURL)) {+ try (SolrClient client = getRandomizedHttpSolrClient(baseURL)) {CoreAdminRequest req = new CoreAdminRequest();req.setAction(CoreAdminAction.STATUS);client.request(req);@@ -311,14 +312,14 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {assertEquals("http vs https: " + baseURL, ssl ? "https" : "http:", baseURL.substring(0, 5));// verify solr client success with expected protocol- try (HttpSolrClient client = getRandomizedHttpSolrClient(baseURL)) {+ try (SolrClient client = getRandomizedHttpSolrClient(baseURL)) {assertEquals(0, CoreAdminRequest.getStatus(/* all */ null, client).getStatus());}// sanity check the HttpClient used under the hood by our the cluster's CloudSolrClient// ensure it has the necessary protocols/credentials for each jetty server- try (HttpSolrClient client = getRandomizedHttpSolrClient(baseURL)) {+ try (SolrClient client = getRandomizedHttpSolrClient(baseURL)) {assertEquals(0, CoreAdminRequest.getStatus(/* all */ null, client).getStatus());}@@ -329,7 +330,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {expectThrows(SolrServerException.class,() -> {- try (HttpSolrClient client = getRandomizedHttpSolrClient(wrongBaseURL)) {+ try (SolrClient client = getRandomizedHttpSolrClient(wrongBaseURL)) {CoreAdminRequest req = new CoreAdminRequest();req.setAction(CoreAdminAction.STATUS);client.request(req);@@ -420,7 +421,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {** @see #getHttpSolrClient*/- public static HttpSolrClient getRandomizedHttpSolrClient(String url) {+ public static SolrClient getRandomizedHttpSolrClient(String url) {// NOTE: at the moment, SolrTestCaseJ4 already returns "new HttpSolrClient" most of the time,// so this method may seem redundant -- but the point here is to sanity check 2 things:// 1) a direct test that "new HttpSolrClient" works given the current JVM/sysprop defaultsdiff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.javaindex a07e5173dab..9fff0ca7dee 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java@@ -33,11 +33,11 @@ import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;+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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -268,7 +268,7 @@ public class TestPullReplica extends SolrCloudTestCase {log.info("Committed doc {} to leader", numDocs);Slice s = docCollection.getSlices().iterator().next();- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {assertEquals(numDocs, leaderClient.query(new SolrQuery("*:*")).getResults().getNumFound());}log.info(@@ -283,7 +283,7 @@ public class TestPullReplica extends SolrCloudTestCase {waitForNumDocsInAllReplicas(numDocs, pullReplicas);for (Replica r : pullReplicas) {- try (HttpSolrClient pullReplicaClient = getHttpSolrClient(r.getCoreUrl())) {+ try (SolrClient pullReplicaClient = getHttpSolrClient(r.getCoreUrl())) {SolrQuery req = new SolrQuery("qt", "/admin/plugins", "stats", "true");QueryResponse statsResponse = pullReplicaClient.query(req);// The adds gauge metric should be null for pull replicas since they don't process adds@@ -462,14 +462,14 @@ public class TestPullReplica extends SolrCloudTestCase {Slice slice = docCollection.getSlice("shard1");List<String> ids = new ArrayList<>(slice.getReplicas().size());for (Replica rAdd : slice.getReplicas()) {- try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {client.add(new SolrInputDocument("id", String.valueOf(id), "foo_s", "bar"));}SolrDocument docCloudClient =cluster.getSolrClient().getById(collectionName, String.valueOf(id));assertEquals("bar", docCloudClient.getFieldValue("foo_s"));for (Replica rGet : slice.getReplicas()) {- try (HttpSolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {SolrDocument doc = client.getById(String.valueOf(id));assertEquals("bar", doc.getFieldValue("foo_s"));}@@ -479,7 +479,7 @@ public class TestPullReplica extends SolrCloudTestCase {}SolrDocumentList previousAllIdsResult = null;for (Replica rAdd : slice.getReplicas()) {- try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {SolrDocumentList allIdsResult = client.getById(ids);if (previousAllIdsResult != null) {assertTrue(compareSolrDocumentList(previousAllIdsResult, allIdsResult));@@ -510,7 +510,7 @@ public class TestPullReplica extends SolrCloudTestCase {cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "1", "foo", "bar"));cluster.getSolrClient().commit(collectionName);Slice s = docCollection.getSlices().iterator().next();- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {assertEquals(1, leaderClient.query(new SolrQuery("*:*")).getResults().getNumFound());}@@ -564,7 +564,7 @@ public class TestPullReplica extends SolrCloudTestCase {}// Also fails if I send the update to the pull replica explicitly- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(docCollection.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {expectThrows(@@ -613,7 +613,7 @@ public class TestPullReplica extends SolrCloudTestCase {// add docs agincluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "2", "foo", "zoo"));s = docCollection.getSlices().iterator().next();- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {leaderClient.commit();assertEquals(1, leaderClient.query(new SolrQuery("*:*")).getResults().getNumFound());}@@ -680,7 +680,7 @@ public class TestPullReplica extends SolrCloudTestCase {TimeOut t = new TimeOut(REPLICATION_TIMEOUT_SECS, TimeUnit.SECONDS, TimeSource.NANO_TIME);for (Replica r : replicas) {String replicaUrl = r.getCoreUrl();- try (HttpSolrClient replicaClient = getHttpSolrClient(replicaUrl)) {+ try (SolrClient replicaClient = getHttpSolrClient(replicaUrl)) {while (true) {QueryRequest req = new QueryRequest(new SolrQuery(query));if (user != null && pass != null) {diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.javaindex c56ebef14b3..cfd0365bea6 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java@@ -33,7 +33,6 @@ import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;@@ -140,7 +139,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {proxy.close();for (int i = 1; i <= 10; i++) {addDocs(10 + i);- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {assertNumDocs(10 + i, leaderClient);}}@@ -149,7 +148,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {expectThrows(SolrServerException.class,() -> {- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {pullReplicaClient.query(new SolrQuery("*:*")).getResults().getNumFound();@@ -175,7 +174,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {proxy.reopen();}- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {assertNumDocs(20, pullReplicaClient);}@@ -192,13 +191,13 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {SocketProxy proxy = getProxyForReplica(s.getLeader());try {// wait for replication- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {assertNumDocs(10, pullReplicaClient);}proxy.close();expectThrows(SolrException.class, () -> addDocs(1));- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {assertNumDocs(10, pullReplicaClient);}@@ -215,7 +214,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {// the last part of this test.// addDocs(20);// assertNumDocs(20, cluster.getSolrClient(), 300);- // try (HttpSolrClient pullReplicaClient =+ // try (SolrClient pullReplicaClient =// getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {// assertNumDocs(20, pullReplicaClient);// }@@ -228,7 +227,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {addDocs(10);DocCollection docCollection = assertNumberOfReplicas(numShards, 0, numShards, false, true);Slice s = docCollection.getSlices().iterator().next();- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {assertNumDocs(10, pullReplicaClient);}@@ -239,7 +238,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {waitForState("Expecting node to be disconnected", collectionName, activeReplicaCount(1, 0, 0));addDocs(40);waitForState("Expecting node to be reconnected", collectionName, activeReplicaCount(1, 0, 1));- try (HttpSolrClient pullReplicaClient =+ try (SolrClient pullReplicaClient =getHttpSolrClient(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0).getCoreUrl())) {assertNumDocs(40, pullReplicaClient);}diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.javaindex d87133dd35a..a4d070b0c16 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaWithAuth.java@@ -28,12 +28,12 @@ import java.io.IOException;import java.util.EnumSet;import java.util.List;import java.util.Map;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;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.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -88,7 +88,7 @@ public class TestPullReplicaWithAuth extends SolrCloudTestCase {return req;}- private QueryResponse queryWithBasicAuth(HttpSolrClient client, SolrQuery q)+ private QueryResponse queryWithBasicAuth(SolrClient client, SolrQuery q)throws IOException, SolrServerException {return withBasicAuth(new QueryRequest(q)).process(client);}@@ -117,7 +117,7 @@ public class TestPullReplicaWithAuth extends SolrCloudTestCase {ureq.commit(solrClient, collectionName);Slice s = docCollection.getSlices().iterator().next();- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {assertEquals(numDocs,queryWithBasicAuth(leaderClient, new SolrQuery("*:*")).getResults().getNumFound());@@ -127,7 +127,7 @@ public class TestPullReplicaWithAuth extends SolrCloudTestCase {waitForNumDocsInAllReplicas(numDocs, pullReplicas, "*:*", USER, PASS);for (Replica r : pullReplicas) {- try (HttpSolrClient pullReplicaClient = getHttpSolrClient(r.getCoreUrl())) {+ try (SolrClient pullReplicaClient = getHttpSolrClient(r.getCoreUrl())) {QueryResponse statsResponse =queryWithBasicAuth(pullReplicaClient, new SolrQuery("qt", "/admin/plugins", "stats", "true"));diff --git a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.javaindex 745ac196a52..78f165613f2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java@@ -102,7 +102,7 @@ public class TestQueryingOnDownCollection extends SolrCloudTestCase {error.getMessage().contains("No active replicas found for collection: " + COLLECTION_NAME));// run same set of tests on v2 client which uses V2HttpCall- Http2SolrClient v2Client =+ SolrClient v2Client =new Http2SolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build();error =diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.javaindex de240a55f32..b4eb112a3c2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java@@ -77,8 +77,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final List<HttpSolrClient> CLIENTS =- Collections.synchronizedList(new ArrayList<>(5));+ private static final List<SolrClient> CLIENTS = Collections.synchronizedList(new ArrayList<>(5));/** Always included in fl, so we can check what doc we're looking at */private static final FlValidator ID_VALIDATOR = new SimpleFieldValueValidator("id");@@ -186,7 +185,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {CLOUD_CLIENT.close();CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {client.close();}CLIENTS.clear();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.javaindex b69fa28a31d..949f4b29e94 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java@@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.BaseDistributedSearchTestCase;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.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.cloud.ClusterState;@@ -109,7 +109,7 @@ public class TestRandomRequestDistribution extends AbstractFullDistribZkTestBaseassertEquals(1, replicas.size());String baseUrl = replicas.iterator().next().getBaseUrl();if (!baseUrl.endsWith("/")) baseUrl += "/";- try (HttpSolrClient client = getHttpSolrClient(baseUrl + "a1x2", 2000, 5000)) {+ try (SolrClient client = getHttpSolrClient(baseUrl + "a1x2", 2000, 5000)) {long expectedTotalRequests = 0;Set<String> uniqueCoreNames = new LinkedHashSet<>();@@ -220,7 +220,7 @@ public class TestRandomRequestDistribution extends AbstractFullDistribZkTestBaseif (!baseUrl.endsWith("/")) baseUrl += "/";String path = baseUrl + "football";log.info("Firing queries against path={}", path);- try (HttpSolrClient client = getHttpSolrClient(path, 2000, 5000)) {+ try (SolrClient client = getHttpSolrClient(path, 2000, 5000)) {SolrCore leaderCore = null;for (JettySolrRunner jetty : jettys) {diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.javaindex d4138a8cd84..652bfb140dd 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java@@ -35,7 +35,6 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;@@ -78,7 +77,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);+ private static final ArrayList<SolrClient> CLIENTS = new ArrayList<>(5);/*** Service to execute all parallel work@@ -168,7 +167,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {IOUtils.closeQuietly(CLOUD_CLIENT);CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {if (null == client) {log.error("CLIENTS contains a null SolrClient???");}diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.javaindex 819fc679d0f..a6ca6604ed7 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java@@ -28,10 +28,10 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;import org.apache.solr.JSONTestUtil;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -245,7 +245,7 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase {}// For simplicity, we always add out docs directly to NODE0// (where the leader should be) and bypass the proxy...- try (HttpSolrClient client = getHttpSolrClient(NODE0.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(NODE0.getBaseUrl().toString())) {assertEquals(0, client.add(COLLECTION, docs).getStatus());if (commit) {assertEquals(0, client.commit(COLLECTION).getStatus());@@ -258,8 +258,8 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase {* (inclusive) can be found on both the leader and the replica*/private void assertDocsExistInBothReplicas(int firstDocId, int lastDocId) throws Exception {- try (HttpSolrClient leaderSolr = getHttpSolrClient(NODE0.getBaseUrl().toString());- HttpSolrClient replicaSolr = getHttpSolrClient(NODE1.getBaseUrl().toString())) {+ try (SolrClient leaderSolr = getHttpSolrClient(NODE0.getBaseUrl().toString());+ SolrClient replicaSolr = getHttpSolrClient(NODE1.getBaseUrl().toString())) {for (int d = firstDocId; d <= lastDocId; d++) {String docId = String.valueOf(d);assertDocExists("leader", leaderSolr, docId);@@ -272,8 +272,8 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase {* uses distrib=false RTG requests to verify that the specified docId can be found using the* specified solr client*/- private void assertDocExists(- final String clientName, final HttpSolrClient client, final String docId) throws Exception {+ private void assertDocExists(final String clientName, final SolrClient client, final String docId)+ throws Exception {final QueryResponse rsp =(new QueryRequest(params("qt", "/get", "id", docId, "_trace", clientName, "distrib", "false")))diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.javaindex c11160aab65..a195a9fcb59 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java@@ -44,7 +44,6 @@ import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;@@ -260,14 +259,14 @@ public class TestTlogReplica extends SolrCloudTestCase {cluster.getSolrClient().commit(collectionName);Slice s = docCollection.getSlices().iterator().next();- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {assertEquals(1, leaderClient.query(new SolrQuery("*:*")).getResults().getNumFound());}TimeOut t = new TimeOut(REPLICATION_TIMEOUT_SECS, TimeUnit.SECONDS, TimeSource.NANO_TIME);for (Replica r : s.getReplicas(EnumSet.of(Replica.Type.TLOG))) {// TODO: assert replication < REPLICATION_TIMEOUT_SECS- try (HttpSolrClient tlogReplicaClient = getHttpSolrClient(r.getCoreUrl())) {+ try (SolrClient tlogReplicaClient = getHttpSolrClient(r.getCoreUrl())) {while (true) {try {assertEquals(@@ -399,7 +398,7 @@ public class TestTlogReplica extends SolrCloudTestCase {Slice slice = docCollection.getSlice("shard1");List<String> ids = new ArrayList<>(slice.getReplicas().size());for (Replica rAdd : slice.getReplicas()) {- try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {client.add(new SolrInputDocument("id", String.valueOf(id), "foo_s", "bar"));}SolrDocument docCloudClient =@@ -407,7 +406,7 @@ public class TestTlogReplica extends SolrCloudTestCase {assertNotNull(docCloudClient);assertEquals("bar", docCloudClient.getFieldValue("foo_s"));for (Replica rGet : slice.getReplicas()) {- try (HttpSolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {SolrDocument doc = client.getById(String.valueOf(id));assertEquals("bar", doc.getFieldValue("foo_s"));}@@ -417,7 +416,7 @@ public class TestTlogReplica extends SolrCloudTestCase {}SolrDocumentList previousAllIdsResult = null;for (Replica rAdd : slice.getReplicas()) {- try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {SolrDocumentList allIdsResult = client.getById(ids);if (previousAllIdsResult != null) {assertTrue(compareSolrDocumentList(previousAllIdsResult, allIdsResult));@@ -441,7 +440,7 @@ public class TestTlogReplica extends SolrCloudTestCase {cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "1", "foo", "bar"));cluster.getSolrClient().commit(collectionName);Slice s = docCollection.getSlices().iterator().next();- try (HttpSolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {+ try (SolrClient leaderClient = getHttpSolrClient(s.getLeader().getCoreUrl())) {assertEquals(1, leaderClient.query(new SolrQuery("*:*")).getResults().getNumFound());}@@ -986,7 +985,7 @@ public class TestTlogReplica extends SolrCloudTestCase {if (!r.isActive(cluster.getSolrClient().getClusterState().getLiveNodes())) {continue;}- try (HttpSolrClient replicaClient = getHttpSolrClient(r.getCoreUrl())) {+ try (SolrClient replicaClient = getHttpSolrClient(r.getCoreUrl())) {while (true) {try {assertEquals(diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.javaindex f02249e034b..be56310e4a3 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java@@ -28,7 +28,6 @@ import java.util.Set;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.UpdateResponse;@@ -72,19 +71,19 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {private static CloudSolrClient CLOUD_CLIENT;/** A client for talking directly to the leader of shard1 */- private static HttpSolrClient S_ONE_LEADER_CLIENT;+ private static SolrClient S_ONE_LEADER_CLIENT;/** A client for talking directly to the leader of shard2 */- private static HttpSolrClient S_TWO_LEADER_CLIENT;+ private static SolrClient S_TWO_LEADER_CLIENT;/** A client for talking directly to a passive replica of shard1 */- private static HttpSolrClient S_ONE_NON_LEADER_CLIENT;+ private static SolrClient S_ONE_NON_LEADER_CLIENT;/** A client for talking directly to a passive replica of shard2 */- private static HttpSolrClient S_TWO_NON_LEADER_CLIENT;+ private static SolrClient S_TWO_NON_LEADER_CLIENT;/** A client for talking directly to a node that has no piece of the collection */- private static HttpSolrClient NO_COLLECTION_CLIENT;+ private static SolrClient NO_COLLECTION_CLIENT;/** id field doc routing prefix for shard1 */private static final String S_ONE_PRE = "abc!";diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.javaindex ffd62949e89..7bfcf85bea2 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java@@ -40,7 +40,6 @@ import org.apache.solr.SolrTestCaseJ4.SuppressSSL;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -73,8 +72,8 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;- /** one HttpSolrClient for each server */- private static List<HttpSolrClient> NODE_CLIENTS;+ /** one SolrClient for each server */+ private static List<SolrClient> NODE_CLIENTS;@BeforeClasspublic static void createMiniSolrCloudCluster() throws Exception {@@ -109,11 +108,11 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {cluster.waitForActiveCollection(COLLECTION_NAME, numShards, numShards * repFactor);if (NODE_CLIENTS != null) {- for (HttpSolrClient client : NODE_CLIENTS) {+ for (SolrClient client : NODE_CLIENTS) {client.close();}}- NODE_CLIENTS = new ArrayList<HttpSolrClient>(numServers);+ NODE_CLIENTS = new ArrayList<SolrClient>(numServers);for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {URL jettyURL = jetty.getBaseUrl();@@ -132,7 +131,7 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {@AfterClasspublic static void afterClass() throws IOException {if (NODE_CLIENTS != null) {- for (HttpSolrClient client : NODE_CLIENTS) {+ for (SolrClient client : NODE_CLIENTS) {client.close();}}diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.javaindex 68cdbd0338f..1a5fb1f9dc4 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import org.apache.lucene.tests.util.LuceneTestCase;+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.embedded.JettySolrRunner;@@ -947,7 +948,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {getCommonCloudSolrClient();String url = getUrlFromZk(cloudClient.getClusterState(), collectionName);- try (HttpSolrClient collectionClient = getHttpSolrClient(url)) {+ try (SolrClient collectionClient = getHttpSolrClient(url)) {ClusterState clusterState = cloudClient.getClusterState();final DocRouter router = clusterState.getCollection(collectionName).getRouter();@@ -1018,7 +1019,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {getCommonCloudSolrClient();String url = getUrlFromZk(cloudClient.getClusterState(), collectionName);- try (HttpSolrClient collectionClient = getHttpSolrClient(url)) {+ try (SolrClient collectionClient = getHttpSolrClient(url)) {String splitKey = "b!";@@ -1173,7 +1174,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {ZkCoreNodeProps shard1_0 =getLeaderUrlFromZk(AbstractDistribZkTestBase.DEFAULT_COLLECTION, SHARD1_0);QueryResponse response;- try (HttpSolrClient shard1_0Client = getHttpSolrClient(shard1_0.getCoreUrl())) {+ try (SolrClient shard1_0Client = getHttpSolrClient(shard1_0.getCoreUrl())) {response = shard1_0Client.query(query);}long shard10Count = response.getResults().getNumFound();@@ -1181,7 +1182,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {ZkCoreNodeProps shard1_1 =getLeaderUrlFromZk(AbstractDistribZkTestBase.DEFAULT_COLLECTION, SHARD1_1);QueryResponse response2;- try (HttpSolrClient shard1_1Client = getHttpSolrClient(shard1_1.getCoreUrl())) {+ try (SolrClient shard1_1Client = getHttpSolrClient(shard1_1.getCoreUrl())) {response2 = shard1_1Client.query(query);}long shard11Count = response2.getResults().getNumFound();@@ -1204,7 +1205,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {for (Replica replica : slice.getReplicas()) {String coreUrl = new ZkCoreNodeProps(replica).getCoreUrl();QueryResponse response;- try (HttpSolrClient client = getHttpSolrClient(coreUrl)) {+ try (SolrClient client = getHttpSolrClient(coreUrl)) {response = client.query(query);}numFound[c++] = response.getResults().getNumFound();@@ -1258,7 +1259,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {((HttpSolrClient) shardToJetty.get(SHARD1).get(0).client.getSolrClient()).getBaseURL();baseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());- try (HttpSolrClient baseServer = getHttpSolrClient(baseUrl, 30000, 60000 * 5)) {+ try (SolrClient baseServer = getHttpSolrClient(baseUrl, 30000, 60000 * 5)) {NamedList<Object> rsp = baseServer.request(request);if (log.isInfoEnabled()) {log.info("Shard split response: {}", Utils.toJSONString(rsp));diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.javaindex 325e306a8f2..e2d4e5833a1 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestRequestStatusCollectionAPI.java@@ -19,6 +19,7 @@ package org.apache.solr.cloud.api.collections;import java.io.IOException;import java.util.Arrays;import java.util.Map;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;@@ -220,7 +221,7 @@ public class TestRequestStatusCollectionAPI extends BasicDistributedZkTest {((HttpSolrClient) shardToJetty.get(SHARD1).get(0).client.getSolrClient()).getBaseURL();baseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());- try (HttpSolrClient baseServer = getHttpSolrClient(baseUrl, 15000)) {+ try (SolrClient baseServer = getHttpSolrClient(baseUrl, 15000)) {return baseServer.request(request);}}diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.javaindex 859a9ade421..47756af3f9b 100644--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java@@ -310,8 +310,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {throws Exception {JettySolrRunner jetty = cluster.getRandomJetty(random());try (HttpSolrClient client = (HttpSolrClient) jetty.newClient()) {- PackageUtils.uploadKey(- bytes, path, Paths.get(jetty.getCoreContainer().getSolrHome()), client);+ PackageUtils.uploadKey(bytes, path, Paths.get(jetty.getCoreContainer().getSolrHome()));String url = jetty.getBaseURLV2() + "/node/files" + path + "?sync=true";Object resp = Utils.executeGET(client.getHttpClient(), url, null);log.info("sync resp: {} was {}", url, resp);diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.javaindex 6390348802a..a6523454389 100644--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java@@ -39,7 +39,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrDocumentList;@@ -69,7 +68,7 @@ public final class ReplicationTestHelper {return jetty;}- public static HttpSolrClient createNewSolrClient(String baseUrl) {+ public static SolrClient createNewSolrClient(String baseUrl) {try {// set up the client...return SolrTestCaseJ4.getHttpSolrClient(baseUrl, 15000, 90000);@@ -214,11 +213,6 @@ public final class ReplicationTestHelper {assertEquals("OK", response.get("status"));}- public static HttpSolrClient adminClient(SolrClient client) {- String adminUrl = ((HttpSolrClient) client).getBaseURL().replace("/collection1", "");- return SolrTestCaseJ4.getHttpSolrClient(adminUrl);- }-public static void pullFromTo(String srcUrl, String destUrl) throws IOException {URL url;InputStream stream;diff --git a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.javaindex 4027c14a597..fc8dc8a592a 100644--- a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java+++ b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java@@ -27,8 +27,8 @@ import static org.apache.solr.handler.ReplicationTestHelper.rQuery;import java.io.IOException;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.SolrTestCaseJ4.SuppressSSL;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.HealthCheckRequest;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.ModifiableSolrParams;@@ -41,9 +41,9 @@ import org.junit.Test;/** Test for HealthCheckHandler in legacy mode */@SuppressSSL // Currently, unknown why SSL does not work with this testpublic class TestHealthCheckHandlerLegacyMode extends SolrTestCaseJ4 {- HttpSolrClient leaderClientHealthCheck, followerClientHealthCheck;+ SolrClient leaderClientHealthCheck, followerClientHealthCheck;JettySolrRunner leaderJetty, followerJetty;- HttpSolrClient leaderClient, followerClient;+ SolrClient leaderClient, followerClient;ReplicationTestHelper.SolrInstance leader = null, follower = null;private static final String context = "/solr";@@ -240,7 +240,7 @@ public class TestHealthCheckHandlerLegacyMode extends SolrTestCaseJ4 {ReplicationTestHelper.pullFromTo(srcUrl, destUrl);}- private void assertNumFoundWithQuery(HttpSolrClient client, int nDocs) throws Exception {+ private void assertNumFoundWithQuery(SolrClient client, int nDocs) throws Exception {NamedList<Object> queryRsp = rQuery(nDocs, "*:*", client);assertEquals(nDocs, numFound(queryRsp));}diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex 762cac06d45..7c751b7b78a 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -99,7 +99,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {private static final long TIMEOUT = 30000;JettySolrRunner leaderJetty, followerJetty, repeaterJetty;- HttpSolrClient leaderClient, followerClient, repeaterClient;+ SolrClient leaderClient, followerClient, repeaterClient;SolrInstance leader = null, follower = null, repeater = null;static String context = "/solr";@@ -267,14 +267,14 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {params.set("qt", "/admin/cores");QueryRequest req = new QueryRequest(params);- try (HttpSolrClient adminClient = adminClient(s)) {+ try (SolrClient adminClient = adminClient(s)) {NamedList<Object> res = adminClient.request(req);assertNotNull("null response from server", res);return res;}}- private HttpSolrClient adminClient(SolrClient client) {+ private SolrClient adminClient(SolrClient client) {String adminUrl = ((HttpSolrClient) client).getBaseURL().replace("/collection1", "");return getHttpSolrClient(adminUrl);}@@ -1791,7 +1791,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {final long sleepInterval = 200;long timeSlept = 0;- try (HttpSolrClient adminClient = adminClient(client)) {+ try (SolrClient adminClient = adminClient(client)) {SolrParams p = params("action", "status", "core", "collection1");while (timeSlept < TIMEOUT) {QueryRequest req = new QueryRequest(p);diff --git a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.javaindex cf087509401..c0f12ebd5fd 100644--- a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java@@ -20,8 +20,8 @@ package org.apache.solr.handler;import java.io.File;import org.apache.commons.io.FileUtils;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.common.util.NamedList;import org.junit.Test;@@ -39,7 +39,7 @@ public class V2StandaloneTest extends SolrTestCaseJ4 {new JettySolrRunner(solrHomeTmp.getAbsolutePath(), buildJettyConfig("/solr"));jetty.start();- try (HttpSolrClient client = getHttpSolrClient(buildUrl(jetty.getLocalPort(), "/solr/"))) {+ try (SolrClient client = getHttpSolrClient(buildUrl(jetty.getLocalPort(), "/solr/"))) {NamedList<?> res = client.request(new V2Request.Builder("/").build());NamedList<?> header = (NamedList<?>) res.get("responseHeader");assertEquals(0, header.get("status"));diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.javaindex d5c81574f3f..11a11cab478 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java@@ -29,10 +29,10 @@ import java.util.Properties;import org.apache.commons.io.FileUtils;import org.apache.lucene.util.Constants;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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.client.solrj.response.QueryResponse;@@ -310,7 +310,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), buildJettyConfig("/solr"));runner.start();- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl() + "/corex",DEFAULT_CONNECTION_TIMEOUT,@@ -321,7 +321,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {client.commit();}- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl().toString(),DEFAULT_CONNECTION_TIMEOUT,@@ -336,7 +336,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {// 1> has the property persisted (SOLR-11783)// 2> is deleted after rename properly.- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl().toString(),DEFAULT_CONNECTION_TIMEOUT,@@ -351,7 +351,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {"Name should have been persisted!", "brand_new_core_name", props.getProperty("name"));}- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl().toString(),DEFAULT_CONNECTION_TIMEOUT,@@ -383,7 +383,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), buildJettyConfig("/solr"));runner.start();- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl() + "/corex",DEFAULT_CONNECTION_TIMEOUT,@@ -394,7 +394,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {client.commit();}- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl() + "/corex",DEFAULT_CONNECTION_TIMEOUT,@@ -403,7 +403,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {assertEquals(1, result.getResults().getNumFound());}- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl().toString(),DEFAULT_CONNECTION_TIMEOUT,@@ -418,7 +418,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {expectThrows(BaseHttpSolrClient.RemoteSolrException.class,() -> {- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl() + "/corex",DEFAULT_CONNECTION_TIMEOUT,@@ -444,7 +444,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), buildJettyConfig("/solr"));runner.start();- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl() + "/corex",DEFAULT_CONNECTION_TIMEOUT,@@ -456,7 +456,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {}Path dataDir = null;- try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {CoreStatus status = CoreAdminRequest.getCoreStatus("corex", true, client);String dataDirectory = status.getDataDirectory();dataDir = Paths.get(dataDirectory);@@ -468,7 +468,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {FileUtils.copyFile(new File(top, "bad-error-solrconfig.xml"), new File(subHome, "solrconfig.xml"));- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(runner.getBaseUrl().toString(),DEFAULT_CONNECTION_TIMEOUT,diff --git a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.javaindex 9f8d233c424..e71b54de943 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java@@ -23,12 +23,12 @@ import java.io.IOException;import java.util.Arrays;import java.util.Collection;import java.util.Properties;+import org.apache.solr.client.solrj.SolrClient;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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.HealthCheckRequest;@@ -70,22 +70,22 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {req.process(cluster.getSolrClient()).getResponse().get(CommonParams.STATUS));// positive check that our exiting "healthy" node works with direct http client- try (HttpSolrClient httpSolrClient =+ try (SolrClient solrClient =getHttpSolrClient(cluster.getJettySolrRunner(0).getBaseUrl().toString())) {- SolrResponse response = req.process(httpSolrClient);+ SolrResponse response = req.process(solrClient);assertEquals(CommonParams.OK, response.getResponse().get(CommonParams.STATUS));}// successfully create a dummy collection- try (HttpSolrClient httpSolrClient =+ try (SolrClient solrClient =getHttpSolrClient(cluster.getJettySolrRunner(0).getBaseUrl().toString())) {CollectionAdminResponse collectionAdminResponse =CollectionAdminRequest.createCollection("test", "_default", 1, 1).withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory").setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)- .process(httpSolrClient);+ .process(solrClient);assertEquals(0, collectionAdminResponse.getStatus());- SolrResponse response = req.process(httpSolrClient);+ SolrResponse response = req.process(solrClient);assertEquals(CommonParams.OK, response.getResponse().get(CommonParams.STATUS));} finally {cluster.deleteAllCollections();@@ -94,11 +94,10 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {// add a new node for the purpose of negative testingJettySolrRunner newJetty = cluster.startJettySolrRunner();- try (HttpSolrClient httpSolrClient = getHttpSolrClient(newJetty.getBaseUrl().toString())) {+ try (SolrClient solrClient = getHttpSolrClient(newJetty.getBaseUrl().toString())) {// positive check that our (new) "healthy" node works with direct http client- assertEquals(- CommonParams.OK, req.process(httpSolrClient).getResponse().get(CommonParams.STATUS));+ assertEquals(CommonParams.OK, req.process(solrClient).getResponse().get(CommonParams.STATUS));// now "break" our (new) nodenewJetty.getCoreContainer().getZkController().getZkClient().close();@@ -108,7 +107,7 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {expectThrows(BaseHttpSolrClient.RemoteSolrException.class,() -> {- req.process(httpSolrClient);+ req.process(solrClient);});assertTrue(e.getMessage(), e.getMessage().contains("Host Unavailable"));assertEquals(SolrException.ErrorCode.SERVICE_UNAVAILABLE.code, e.code());@@ -119,11 +118,10 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {// add a new node for the purpose of negative testing// negative check that if core container is not available at the nodenewJetty = cluster.startJettySolrRunner();- try (HttpSolrClient httpSolrClient = getHttpSolrClient(newJetty.getBaseUrl().toString())) {+ try (SolrClient solrClient = getHttpSolrClient(newJetty.getBaseUrl().toString())) {// positive check that our (new) "healthy" node works with direct http client- assertEquals(- CommonParams.OK, req.process(httpSolrClient).getResponse().get(CommonParams.STATUS));+ assertEquals(CommonParams.OK, req.process(solrClient).getResponse().get(CommonParams.STATUS));// shutdown the core container of new nodenewJetty.getCoreContainer().shutdown();@@ -133,7 +131,7 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {expectThrows(SolrException.class,() -> {- req.process(httpSolrClient).getResponse().get(CommonParams.STATUS);+ req.process(solrClient).getResponse().get(CommonParams.STATUS);fail("API shouldn't be available, and fail at above request");});assertEquals("Exception code should be 404", 404, thrown.code());@@ -149,11 +147,10 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {// (redundant) positive check that our (previously) exiting "healthy" node (still) works// after getting negative results from our broken node and failed core container- try (HttpSolrClient httpSolrClient =+ try (SolrClient solrClient =getHttpSolrClient(cluster.getJettySolrRunner(0).getBaseUrl().toString())) {- assertEquals(- CommonParams.OK, req.process(httpSolrClient).getResponse().get(CommonParams.STATUS));+ assertEquals(CommonParams.OK, req.process(solrClient).getResponse().get(CommonParams.STATUS));}}@@ -161,9 +158,9 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {public void testHealthCheckHandlerSolrJ() throws IOException, SolrServerException {// positive check of a HealthCheckRequest using http clientHealthCheckRequest req = new HealthCheckRequest();- try (HttpSolrClient httpSolrClient =+ try (SolrClient solrClient =getHttpSolrClient(cluster.getJettySolrRunner(0).getBaseUrl().toString())) {- HealthCheckResponse rsp = req.process(httpSolrClient);+ HealthCheckResponse rsp = req.process(solrClient);assertEquals(CommonParams.OK, rsp.getNodeStatus());}}@@ -183,14 +180,14 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {// add a new node for the purpose of negative testingJettySolrRunner newJetty = cluster.startJettySolrRunner();- try (HttpSolrClient httpSolrClient = getHttpSolrClient(newJetty.getBaseUrl().toString())) {+ try (SolrClient solrClient = getHttpSolrClient(newJetty.getBaseUrl().toString())) {// positive check that our (new) "healthy" node works with direct http clientassertEquals(CommonParams.OK,new V2Request.Builder("/node/health").build()- .process(httpSolrClient)+ .process(solrClient).getResponse().get(CommonParams.STATUS));@@ -202,7 +199,7 @@ public class HealthCheckHandlerTest extends SolrCloudTestCase {expectThrows(BaseHttpSolrClient.RemoteSolrException.class,() -> {- new V2Request.Builder("/node/health").build().process(httpSolrClient);+ new V2Request.Builder("/node/health").build().process(solrClient);});assertTrue(e.getMessage(), e.getMessage().contains("Host Unavailable"));assertEquals(SolrException.ErrorCode.SERVICE_UNAVAILABLE.code, e.code());diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.javaindex a4f2e96b927..bf95cbbc302 100644--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java@@ -31,7 +31,6 @@ import org.apache.solr.SolrJettyTestBase;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.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;@@ -73,7 +72,7 @@ public class DistributedDebugComponentTest extends SolrJettyTestBase {shard2 = urlCollection2.replaceAll("https?://", "");// create second core- try (HttpSolrClient nodeClient = getHttpSolrClient(url)) {+ try (SolrClient nodeClient = getHttpSolrClient(url)) {CoreAdminRequest.Create req = new CoreAdminRequest.Create();req.setCoreName("collection2");req.setConfigSet("collection1");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 83d773a014f..8381e272910 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@@ -18,6 +18,7 @@ package org.apache.solr.handler.component;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;@@ -166,8 +167,8 @@ public class DistributedQueryElevationComponentTest extends BaseDistributedSearc// Force javabin formatfinal String clientUrl = ((HttpSolrClient) clients.get(0)).getBaseURL();- HttpSolrClient client = getHttpSolrClient(clientUrl);- client.setParser(new BinaryResponseParser());+ SolrClient client = getHttpSolrClient(clientUrl);+ ((HttpSolrClient) client).setParser(new BinaryResponseParser());SolrQuery solrQuery =new SolrQuery("XXXX").setParam("qt", "/elevate")diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.javaindex cbe361a3bf3..f9faeb0ce95 100644--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java@@ -22,6 +22,7 @@ import java.util.Collection;import java.util.Iterator;import java.util.List;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;@@ -156,7 +157,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {Replica replica = getRandomEntry(slice.getReplicas());JettySolrRunner jetty = miniCluster.getReplicaJetty(replica);// Use the replica's core URL to avoid ZK communication- try (HttpSolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {+ try (SolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {jetty.getCoreContainer().getZkController().getZkClient().close();rsp = req.process(client);assertFalse(rsp.getResponseHeader().getBooleanArg("zkConnected"));@@ -203,11 +204,11 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {Replica disconnectedReplica = getRandomEntry(disconnectedSlice.getReplicas());JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);// Use the replica's core URL to avoid ZK communication- try (HttpSolrClient httpSolrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder(disconnectedReplica.getCoreUrl()).build()) {ignoreException("ZooKeeper is not connected");disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();- req.process(httpSolrClient);+ req.process(solrClient);fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");} catch (Exception e) {@@ -260,13 +261,13 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {connectedSlice = getRandomEntry(slices);}Replica connectedReplica = connectedSlice.getReplicas().iterator().next();- try (HttpSolrClient httpSolrClient =+ try (SolrClient solrClient =new HttpSolrClient.Builder(connectedReplica.getCoreUrl()).build()) {ignoreException("ZooKeeper is not connected");ignoreException("no active servers hosting shard:");JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();- req.process(httpSolrClient);+ req.process(solrClient);fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");} catch (Exception e) {diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.javaindex 5dccdde4f70..3bb73f59e8b 100644--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java@@ -27,9 +27,9 @@ import java.util.Properties;import java.util.regex.Pattern;import org.apache.commons.io.FileUtils;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.NoOpResponseParser;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -54,17 +54,17 @@ public class TestRawTransformer extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static JettySolrRunner JSR;- private static HttpSolrClient CLIENT;+ private static SolrClient CLIENT;@BeforeClasspublic static void beforeClass() throws Exception {if (random().nextBoolean()) {initStandalone();JSR.start();- CLIENT = (HttpSolrClient) JSR.newClient();+ CLIENT = JSR.newClient();} else {initCloud();- CLIENT = (HttpSolrClient) JSR.newClient();+ CLIENT = JSR.newClient();JSR = null;}initIndex();diff --git a/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java b/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.javaindex 3aa53058924..b2509d8fff7 100644--- a/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java+++ b/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java@@ -23,7 +23,6 @@ import java.util.List;import java.util.Map;import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.schema.SchemaRequest;import org.apache.solr.client.solrj.response.schema.SchemaResponse;@@ -62,7 +61,7 @@ public class ManagedSchemaRoundRobinCloudTest extends SolrCloudTestCase {@Testpublic void testAddFieldsRoundRobin() throws Exception {- List<HttpSolrClient> clients = new ArrayList<>(NUM_SHARDS);+ List<SolrClient> clients = new ArrayList<>(NUM_SHARDS);try {for (int shardNum = 0; shardNum < NUM_SHARDS; ++shardNum) {clients.add(diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java b/solr/core/src/test/org/apache/solr/search/TestSolrJ.javaindex d9d7fe27f45..398329ea641 100644--- a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java+++ b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java@@ -25,7 +25,6 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.util.RTimer;@@ -164,7 +163,7 @@ public class TestSolrJ extends SolrTestCaseJ4 {public void doCommitPerf() throws Exception {- try (HttpSolrClient client = getHttpSolrClient("http://127.0.0.1:8983/solr")) {+ try (SolrClient client = getHttpSolrClient("http://127.0.0.1:8983/solr")) {final RTimer timer = new RTimer();diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.javaindex ca4a1afb05b..0c7f0fab9e0 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java@@ -33,7 +33,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -86,7 +85,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);+ private static final ArrayList<SolrClient> CLIENTS = new ArrayList<>(5);@BeforeClasspublic static void createMiniSolrCloudCluster() throws Exception {@@ -195,7 +194,7 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase {CLOUD_CLIENT.close();CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {client.close();}CLIENTS.clear();diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.javaindex 93cdab162fa..69fafaf05ca 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java@@ -36,7 +36,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -109,7 +108,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);+ private static final ArrayList<SolrClient> CLIENTS = new ArrayList<>(5);@BeforeClasspublic static void createMiniSolrCloudCluster() throws Exception {@@ -246,7 +245,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {CLOUD_CLIENT.close();CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {client.close();}CLIENTS.clear();diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.javaindex 5efe02a2664..235578d82d0 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKGEquiv.java@@ -38,7 +38,6 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;@@ -100,7 +99,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {/** A basic client for operations at the cloud level, default collection will be set */private static CloudSolrClient CLOUD_CLIENT;/** One client per node */- private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);+ private static final ArrayList<SolrClient> CLIENTS = new ArrayList<>(5);@BeforeClasspublic static void createMiniSolrCloudCluster() throws Exception {@@ -236,7 +235,7 @@ public class TestCloudJSONFacetSKGEquiv extends SolrCloudTestCase {CLOUD_CLIENT.close();CLOUD_CLIENT = null;}- for (HttpSolrClient client : CLIENTS) {+ for (SolrClient client : CLIENTS) {client.close();}CLIENTS.clear();diff --git a/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.java b/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.javaindex 5c3a67f1dad..17d50adb004 100644--- a/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.java+++ b/solr/core/src/test/org/apache/solr/security/AuthWithShardHandlerFactoryOverrideTest.java@@ -16,6 +16,7 @@*/package org.apache.solr.security;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.Http2SolrClient;@@ -81,7 +82,7 @@ public class AuthWithShardHandlerFactoryOverrideTest extends SolrCloudAuthTestCa@Testpublic void collectionTest() throws Exception {- try (Http2SolrClient client =+ try (SolrClient client =new Http2SolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build()) {@@ -101,7 +102,7 @@ public class AuthWithShardHandlerFactoryOverrideTest extends SolrCloudAuthTestCa@Testpublic void aliasTest() throws Exception {- try (Http2SolrClient client =+ try (SolrClient client =new Http2SolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build()) {diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.javaindex 9706b4f4eac..65e209795d9 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java@@ -44,7 +44,6 @@ import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;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.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -224,7 +223,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {CollectionAdminRequest.Reload reload = CollectionAdminRequest.reloadCollection(COLLECTION);- try (HttpSolrClient solrClient = getHttpSolrClient(baseUrl)) {+ try (SolrClient solrClient = getHttpSolrClient(baseUrl)) {expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> solrClient.request(reload));reload.setMethod(SolrRequest.METHOD.POST);diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.javaindex 418be28ada6..8b6708fe825 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthOnSingleNodeTest.java@@ -17,6 +17,7 @@package org.apache.solr.security;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;@@ -50,7 +51,7 @@ public class BasicAuthOnSingleNodeTest extends SolrCloudAuthTestCase {@Testpublic void basicTest() throws Exception {- try (Http2SolrClient client =+ try (SolrClient client =new Http2SolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build()) {@@ -67,7 +68,7 @@ public class BasicAuthOnSingleNodeTest extends SolrCloudAuthTestCase {@Testpublic void testDeleteSecurityJsonZnode() throws Exception {- try (Http2SolrClient client =+ try (SolrClient client =new Http2SolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build()) {try {diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.javaindex e7f8427cafe..bf1092604d6 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java@@ -37,9 +37,9 @@ import org.apache.http.entity.ByteArrayEntity;import org.apache.http.message.AbstractHttpMessage;import org.apache.http.message.BasicHeader;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.params.MapSolrParams;import org.apache.solr.common.util.Utils;import org.apache.solr.handler.admin.SecurityConfHandler;@@ -88,14 +88,14 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {String authcPrefix = "/admin/authentication";String authzPrefix = "/admin/authorization";- HttpClient cl = null;- HttpSolrClient httpSolrClient = null;+ HttpClient httpClient = null;+ SolrClient solrClient = null;try {- cl = HttpClientUtil.createClient(null);+ httpClient = HttpClientUtil.createClient(null);String baseUrl = buildUrl(jetty.getLocalPort(), "/solr");- httpSolrClient = getHttpSolrClient(baseUrl);+ solrClient = getHttpSolrClient(baseUrl);- verifySecurityStatus(cl, baseUrl + authcPrefix, "/errorMessages", null, 20);+ verifySecurityStatus(httpClient, baseUrl + authcPrefix, "/errorMessages", null, 20);// Write security.json locally. Should cause security to be initializedsecurityConfHandler.persistConf(@@ -103,18 +103,22 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {.setData(Utils.fromJSONString(STD_CONF.replaceAll("'", "\""))));securityConfHandler.securityConfEdited();verifySecurityStatus(- cl, baseUrl + authcPrefix, "authentication/class", "solr.BasicAuthPlugin", 20);+ httpClient, baseUrl + authcPrefix, "authentication/class", "solr.BasicAuthPlugin", 20);String command = "{\n" + "'set-user': {'harry':'HarryIsCool'}\n" + "}";- doHttpPost(cl, baseUrl + authcPrefix, command, null, null, 401);- verifySecurityStatus(cl, baseUrl + authcPrefix, "authentication.enabled", "true", 20);+ doHttpPost(httpClient, baseUrl + authcPrefix, command, null, null, 401);+ verifySecurityStatus(httpClient, baseUrl + authcPrefix, "authentication.enabled", "true", 20);command = "{\n" + "'set-user': {'harry':'HarryIsUberCool'}\n" + "}";- doHttpPost(cl, baseUrl + authcPrefix, command, "solr", "SolrRocks");+ doHttpPost(httpClient, baseUrl + authcPrefix, command, "solr", "SolrRocks");verifySecurityStatus(- cl, baseUrl + authcPrefix, "authentication/credentials/harry", NOT_NULL_PREDICATE, 20);+ httpClient,+ baseUrl + authcPrefix,+ "authentication/credentials/harry",+ NOT_NULL_PREDICATE,+ 20);// Read file from SOLR_HOME and verify that it contains our new userassertTrue(@@ -123,28 +127,27 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {// Edit authorizationverifySecurityStatus(- cl, baseUrl + authzPrefix, "authorization/permissions[1]/role", null, 20);+ httpClient, baseUrl + authzPrefix, "authorization/permissions[1]/role", null, 20);doHttpPost(- cl,+ httpClient,baseUrl + authzPrefix,"{'set-permission': {'name': 'update', 'role':'updaterole'}}","solr","SolrRocks");command = "{\n" + "'set-permission': {'name': 'read', 'role':'solr'}\n" + "}";- doHttpPost(cl, baseUrl + authzPrefix, command, "solr", "SolrRocks");+ doHttpPost(httpClient, baseUrl + authzPrefix, command, "solr", "SolrRocks");try {- httpSolrClient.query(- "collection1", new MapSolrParams(Collections.singletonMap("q", "foo")));+ solrClient.query("collection1", new MapSolrParams(Collections.singletonMap("q", "foo")));fail("Should return a 401 response");} catch (Exception e) {// Test that the second doPost request to /security/authorization went throughverifySecurityStatus(- cl, baseUrl + authzPrefix, "authorization/permissions[2]/role", "solr", 20);+ httpClient, baseUrl + authzPrefix, "authorization/permissions[2]/role", "solr", 20);}} finally {- if (cl != null) {- HttpClientUtil.close(cl);- httpSolrClient.close();+ if (httpClient != null) {+ HttpClientUtil.close(httpClient);+ solrClient.close();}}}diff --git a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.javaindex 7d897ea621c..4660006d56e 100644--- a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java+++ b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java@@ -40,9 +40,9 @@ import org.apache.http.client.HttpClient;import org.apache.http.client.methods.HttpGet;import org.apache.http.message.BasicHeader;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.CommandOperation;import org.apache.solr.common.util.Utils;@@ -87,14 +87,14 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {final String user = "admin";final String pass = "SolrRocks";- HttpClient cl = null;- HttpSolrClient httpSolrClient = null;+ HttpClient httpClient = null;+ SolrClient solrClient = null;try {- cl = HttpClientUtil.createClient(null);+ httpClient = HttpClientUtil.createClient(null);String baseUrl = buildUrl(jetty.getLocalPort(), "/solr");- httpSolrClient = getHttpSolrClient(baseUrl);+ solrClient = getHttpSolrClient(baseUrl);- verifySecurityStatus(cl, baseUrl + authcPrefix, "/errorMessages", null, 5);+ verifySecurityStatus(httpClient, baseUrl + authcPrefix, "/errorMessages", null, 5);// Initialize security.json with multiple auth plugins configuredString multiAuthPluginSecurityJson =@@ -106,9 +106,15 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {.setData(Utils.fromJSONString(multiAuthPluginSecurityJson)));securityConfHandler.securityConfEdited();verifySecurityStatus(- cl, baseUrl + authcPrefix, "authentication/class", "solr.MultiAuthPlugin", 5, user, pass);+ httpClient,+ baseUrl + authcPrefix,+ "authentication/class",+ "solr.MultiAuthPlugin",+ 5,+ user,+ pass);verifySecurityStatus(- cl,+ httpClient,baseUrl + authzPrefix,"authorization/class","solr.MultiAuthRuleBasedAuthorizationPlugin",@@ -117,32 +123,32 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {pass);// anonymous requests are blocked by all plugins- int statusCode = doHttpGetAnonymous(cl, baseUrl + "/admin/info/system");+ int statusCode = doHttpGetAnonymous(httpClient, baseUrl + "/admin/info/system");assertEquals("anonymous get succeeded but should not have", 401, statusCode);// update blockUnknown to allow anonymous for the basic pluginString command = "{\n" + "'set-property': { 'basic': {'blockUnknown':false} }\n" + "}";- doHttpPost(cl, baseUrl + authcPrefix, command, user, pass, 200);- statusCode = doHttpGetAnonymous(cl, baseUrl + "/admin/info/system");+ doHttpPost(httpClient, baseUrl + authcPrefix, command, user, pass, 200);+ statusCode = doHttpGetAnonymous(httpClient, baseUrl + "/admin/info/system");assertEquals("anonymous get failed but should have succeeded", 200, statusCode);// For the multi-auth plugin, every command is wrapped with an object that identifies the// "scheme"command = "{\n" + "'set-user': {'harry':'HarryIsCool'}\n" + "}";// no scheme identified!- doHttpPost(cl, baseUrl + authcPrefix, command, user, pass, 400);+ doHttpPost(httpClient, baseUrl + authcPrefix, command, user, pass, 400);command = "{\n" + "'set-user': { 'foo': {'harry':'HarryIsCool'} }\n" + "}";// no "foo" scheme configured- doHttpPost(cl, baseUrl + authcPrefix, command, user, pass, 400);+ doHttpPost(httpClient, baseUrl + authcPrefix, command, user, pass, 400);command = "{\n" + "'set-user': { 'basic': {'harry':'HarryIsCool'} }\n" + "}";// no creds, should fail ...- doHttpPost(cl, baseUrl + authcPrefix, command, null, null, 401);+ doHttpPost(httpClient, baseUrl + authcPrefix, command, null, null, 401);// with basic creds, should pass ...- doHttpPost(cl, baseUrl + authcPrefix, command, user, pass, 200);+ doHttpPost(httpClient, baseUrl + authcPrefix, command, user, pass, 200);verifySecurityStatus(- cl,+ httpClient,baseUrl + authcPrefix,"authentication/schemes[0]/credentials/harry",NOT_NULL_PREDICATE,@@ -152,13 +158,13 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {// authz command but missing the "scheme" wrappercommand = "{\n" + "'set-user-role': {'harry':['users']}\n" + "}";- doHttpPost(cl, baseUrl + authzPrefix, command, user, pass, 400);+ doHttpPost(httpClient, baseUrl + authzPrefix, command, user, pass, 400);// add "harry" to the "users" role ...command = "{\n" + "'set-user-role': { 'basic': {'harry':['users']} }\n" + "}";- doHttpPost(cl, baseUrl + authzPrefix, command, user, pass, 200);+ doHttpPost(httpClient, baseUrl + authzPrefix, command, user, pass, 200);verifySecurityStatus(- cl,+ httpClient,baseUrl + authzPrefix,"authorization/schemes[0]/user-role/harry",NOT_NULL_PREDICATE,@@ -168,14 +174,20 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {// give the users role a custom permissionverifySecurityStatus(- cl, baseUrl + authzPrefix, "authorization/permissions[6]", NULL_PREDICATE, 5, user, pass);+ httpClient,+ baseUrl + authzPrefix,+ "authorization/permissions[6]",+ NULL_PREDICATE,+ 5,+ user,+ pass);command ="{\n"+ "'set-permission': { 'name':'k8s-zk', 'role':'users', 'collection':null, 'path':'/admin/zookeeper/status' }\n"+ "}";- doHttpPost(cl, baseUrl + authzPrefix, command, user, pass, 200);+ doHttpPost(httpClient, baseUrl + authzPrefix, command, user, pass, 200);verifySecurityStatus(- cl,+ httpClient,baseUrl + authzPrefix,"authorization/permissions[6]/path",new ExpectedValuePredicate("/admin/zookeeper/status"),@@ -187,9 +199,9 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {"{\n"+ "'update-permission': { 'index':'7', 'name':'k8s-zk', 'role':'users', 'collection':null, 'path':'/admin/zookeeper/status2' }\n"+ "}";- doHttpPost(cl, baseUrl + authzPrefix, command, user, pass, 200);+ doHttpPost(httpClient, baseUrl + authzPrefix, command, user, pass, 200);verifySecurityStatus(- cl,+ httpClient,baseUrl + authzPrefix,"authorization/permissions[6]/path",new ExpectedValuePredicate("/admin/zookeeper/status2"),@@ -199,16 +211,22 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {// delete the permissioncommand = "{\n" + "'delete-permission': 7\n" + "}";- doHttpPost(cl, baseUrl + authzPrefix, command, user, pass, 200);+ doHttpPost(httpClient, baseUrl + authzPrefix, command, user, pass, 200);verifySecurityStatus(- cl, baseUrl + authzPrefix, "authorization/permissions[6]", NULL_PREDICATE, 5, user, pass);+ httpClient,+ baseUrl + authzPrefix,+ "authorization/permissions[6]",+ NULL_PREDICATE,+ 5,+ user,+ pass);// delete the usercommand = "{\n" + "'delete-user': { 'basic': 'harry' }\n" + "}";- doHttpPost(cl, baseUrl + authcPrefix, command, user, pass, 200);+ doHttpPost(httpClient, baseUrl + authcPrefix, command, user, pass, 200);verifySecurityStatus(- cl,+ httpClient,baseUrl + authcPrefix,"authentication/schemes[0]/credentials/harry",NULL_PREDICATE,@@ -220,9 +238,13 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {command = "{\n" + "'set-property': { 'mock': { 'blockUnknown':false } }\n" + "}";doHttpPostWithHeader(- cl, baseUrl + authcPrefix, command, new BasicHeader("Authorization", "mock foo"), 200);+ httpClient,+ baseUrl + authcPrefix,+ command,+ new BasicHeader("Authorization", "mock foo"),+ 200);verifySecurityStatus(- cl,+ httpClient,baseUrl + authcPrefix,"authentication/schemes[1]/blockUnknown",new ExpectedValuePredicate(Boolean.FALSE),@@ -230,11 +252,11 @@ public class MultiAuthPluginTest extends SolrTestCaseJ4 {user,pass);} finally {- if (cl != null) {- HttpClientUtil.close(cl);+ if (httpClient != null) {+ HttpClientUtil.close(httpClient);}- if (httpSolrClient != null) {- httpSolrClient.close();+ if (solrClient != null) {+ solrClient.close();}}}diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.javaindex 2b25874dd48..81905a81f33 100644--- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java+++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java@@ -506,13 +506,13 @@ public class SolrCmdDistributorTest extends BaseDistributedSearchTestCase {try (SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(streamingClients, 0)) {streamingClients.setExp(Exp.CONNECT_EXCEPTION);ArrayList<Node> nodes = new ArrayList<>();- final HttpSolrClient solrclient1 = (HttpSolrClient) clients.get(0);+ final HttpSolrClient solrClient1 = (HttpSolrClient) clients.get(0);final AtomicInteger retries = new AtomicInteger();ZkNodeProps nodeProps =new ZkNodeProps(ZkStateReader.BASE_URL_PROP,- solrclient1.getBaseURL(),+ solrClient1.getBaseURL(),ZkStateReader.CORE_NAME_PROP,"");Node retryNode;diff --git a/solr/core/src/test/org/apache/solr/util/TestExportTool.java b/solr/core/src/test/org/apache/solr/util/TestExportTool.javaindex c5824463518..5e86e83347d 100644--- a/solr/core/src/test/org/apache/solr/util/TestExportTool.java+++ b/solr/core/src/test/org/apache/solr/util/TestExportTool.java@@ -29,6 +29,7 @@ import java.util.Map;import java.util.function.Predicate;import org.apache.lucene.tests.util.TestUtil;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.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.AbstractUpdateRequest;@@ -160,7 +161,7 @@ public class TestExportTool extends SolrCloudTestCase {long totalDocsFromCores = 0;for (Slice slice : coll.getSlices()) {Replica replica = slice.getLeader();- try (HttpSolrClient client = new HttpSolrClient.Builder(replica.getBaseUrl()).build()) {+ try (SolrClient client = new HttpSolrClient.Builder(replica.getBaseUrl()).build()) {long count = ExportTool.getDocCount(replica.getCoreName(), client);docCounts.put(replica.getCoreName(), count);totalDocsFromCores += count;diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.javaindex 2aa20cfb6f2..7b1c0aff652 100644--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java@@ -38,11 +38,11 @@ import org.apache.commons.exec.DefaultExecutor;import org.apache.commons.exec.ExecuteResultHandler;import org.apache.lucene.tests.util.LuceneTestCase;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.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.cloud.MiniSolrCloudCluster;import org.apache.solr.common.SolrInputDocument;@@ -398,7 +398,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {exampleSolrHomeDir.isDirectory());if ("techproducts".equals(exampleName)) {- HttpSolrClient solrClient =+ SolrClient solrClient =getHttpSolrClient("http://localhost:" + bindPort + "/solr/" + exampleName);try {SolrQuery query = new SolrQuery("*:*");diff --git a/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.javaindex 977a2fef7ca..3ad04a8102a 100644--- a/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java+++ b/solr/modules/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java@@ -31,6 +31,7 @@ import java.util.concurrent.Future;import org.apache.solr.analytics.AnalyticsRequestManager;import org.apache.solr.analytics.AnalyticsRequestParser;import org.apache.solr.analytics.TimeExceededStubException;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;@@ -203,7 +204,7 @@ public class AnalyticsShardRequestManager {*/protected class AnalyticsShardRequester implements Callable<SolrException> {private String baseUrl;- HttpSolrClient client;+ SolrClient client;/*** Create a requester for analytics shard data.diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.javaindex 6277f676689..7a4a939bcc7 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java@@ -79,8 +79,8 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {}}- private String getDelegationToken(- final String renewer, final String user, HttpSolrClient solrClient) throws Exception {+ private String getDelegationToken(final String renewer, final String user, SolrClient solrClient)+ throws Exception {DelegationTokenRequest.Get get =new DelegationTokenRequest.Get(renewer) {@Override@@ -95,7 +95,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {}private long renewDelegationToken(- final String token, final int expectedStatusCode, final String user, HttpSolrClient client)+ final String token, final int expectedStatusCode, final String user, SolrClient client)throws Exception {DelegationTokenRequest.Renew renew =new DelegationTokenRequest.Renew(token) {@@ -123,7 +123,7 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {}}- private void cancelDelegationToken(String token, int expectedStatusCode, HttpSolrClient client)+ private void cancelDelegationToken(String token, int expectedStatusCode, SolrClient client)throws Exception {DelegationTokenRequest.Cancel cancel = new DelegationTokenRequest.Cancel(token);try {diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.javaindex 61964e1a9c6..f295d2a5c6e 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestImpersonationWithHadoopAuth.java@@ -209,7 +209,7 @@ public class TestImpersonationWithHadoopAuth extends SolrCloudTestCase {// try a command to each node, one of them must be forwardedfor (JettySolrRunner jetty : cluster.getJettySolrRunners()) {- try (HttpSolrClient client =+ try (SolrClient client =new HttpSolrClient.Builder(jetty.getBaseUrl().toString() + "/" + collectionName).build()) {ModifiableSolrParams params = new ModifiableSolrParams();diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.javaindex 7449614ff4a..68cee00598b 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java@@ -36,7 +36,6 @@ import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.cloud.AbstractBasicDistributedZkTestBase;import org.apache.solr.common.cloud.ClusterState;@@ -186,7 +185,7 @@ public class StressHdfsTest extends AbstractBasicDistributedZkTestBase {int i = 0;for (SolrClient client : clients) {- try (HttpSolrClient c =+ try (SolrClient c =getHttpSolrClient(getBaseUrl(client) + "/" + DELETE_DATA_DIR_COLLECTION, 30000)) {int docCnt = random().nextInt(1000) + 1;for (int j = 0; j < docCnt; j++) {diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.javaindex 5e7a0196b75..1ff9729c775 100644--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.java+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/handler/TestHdfsBackupRestoreCore.java@@ -38,8 +38,8 @@ import org.apache.lucene.tests.util.QuickPatchThreadsFilter;import org.apache.lucene.tests.util.TestUtil;import org.apache.solr.SolrIgnoredThreadsFilter;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.SolrInputDocument;@@ -200,7 +200,7 @@ public class TestHdfsBackupRestoreCore extends SolrCloudTestCase {String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();final String shardBackupId = new ShardBackupId("standalone", BackupId.zero()).getIdAsString();- try (HttpSolrClient leaderClient = getHttpSolrClient(replicaBaseUrl)) {+ try (SolrClient leaderClient = getHttpSolrClient(replicaBaseUrl)) {// Create a backup.if (testViaReplicationHandler) {log.info("Running Backup via replication handler");diff --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 f299c5acc29..cdd3c093681 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@@ -143,7 +143,7 @@ public class LBHttpSolrClient extends LBSolrClient {@Overrideprotected SolrClient getClient(String baseUrl) {- HttpSolrClient client = urlToClient.get(baseUrl);+ SolrClient client = urlToClient.get(baseUrl);if (client == null) {return makeSolrClient(baseUrl);} else {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.javaindex 3cab721a583..c35edfcdf72 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java@@ -100,20 +100,20 @@ public class SolrClientCache implements Serializable {}@Deprecated(since = "9.0")- public synchronized HttpSolrClient getHttpSolrClient(String host) {- HttpSolrClient client;- if (solrClients.containsKey(host)) {- client = (HttpSolrClient) solrClients.get(host);+ public synchronized SolrClient getHttpSolrClient(String baseUrl) {+ SolrClient client;+ if (solrClients.containsKey(baseUrl)) {+ client = solrClients.get(baseUrl);} else {HttpSolrClient.Builder builder =- new HttpSolrClient.Builder(host)+ new HttpSolrClient.Builder(baseUrl).withSocketTimeout(socketTimeout).withConnectionTimeout(conTimeout);if (httpClient != null) {builder = builder.withHttpClient(httpClient);}client = builder.build();- solrClients.put(host, client);+ solrClients.put(baseUrl, client);}return client;}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.javaindex b9009075b62..6ba0048b876 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java@@ -36,8 +36,8 @@ import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.stream.Stream;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.StreamComparator;@@ -429,7 +429,7 @@ public class FeaturesSelectionStream extends TupleStream implements Expressiblepublic NamedList<?> call() throws Exception {ModifiableSolrParams params = new ModifiableSolrParams();- HttpSolrClient solrClient = cache.getHttpSolrClient(baseUrl);+ SolrClient solrClient = cache.getHttpSolrClient(baseUrl);params.add(DISTRIB, "false");params.add("fq", "{!igain}");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.javaindex 803e2c3a26f..31bcc69a9c3 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java@@ -31,8 +31,8 @@ import java.util.Map;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.StreamComparator;@@ -411,7 +411,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible {public NamedList<?> call() throws Exception {ModifiableSolrParams params = new ModifiableSolrParams();- HttpSolrClient solrClient = cache.getHttpSolrClient(baseUrl);+ SolrClient solrClient = cache.getHttpSolrClient(baseUrl);params.add(DISTRIB, "false");params.add("fq", "{!significantTerms}");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.javaindex 91183396fdb..eb9d220df4b 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java@@ -25,6 +25,7 @@ import java.util.Iterator;import java.util.List;import java.util.Map;import org.apache.http.client.methods.CloseableHttpResponse;+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.HttpSolrClient;@@ -61,7 +62,7 @@ public class SolrStream extends TupleStream {private boolean trace;private Map<String, String> fieldMappings;private transient TupleStreamParser tupleStreamParser;- private transient HttpSolrClient client;+ private transient SolrClient client;private transient SolrClientCache cache;private String slice;private long checkpoint = -1;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.javaindex 3bc1fbd5656..c4338b3c690 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java@@ -29,10 +29,10 @@ import java.util.Map;import java.util.Map.Entry;import java.util.Optional;import java.util.stream.Collectors;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.ClusterStateProvider;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.StreamComparator;@@ -261,7 +261,7 @@ public class StatsStream extends TupleStream implements Expressible, ParallelMet}} else {List<String> shards = shardsMap.get(collection);- HttpSolrClient client = cache.getHttpSolrClient(shards.get(0));+ SolrClient client = cache.getHttpSolrClient(shards.get(0));if (shards.size() > 1) {String shardsParam = getShardString(shards);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.javaindex ca9a404543f..57c370e7b9b 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java@@ -35,9 +35,9 @@ import java.util.Set;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.io.ClassificationEvaluation;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;@@ -672,7 +672,7 @@ public class TextLogitStream extends TupleStream implements Expressible {public Tuple call() throws Exception {ModifiableSolrParams params = new ModifiableSolrParams();- HttpSolrClient solrClient = cache.getHttpSolrClient(baseUrl);+ SolrClient solrClient = cache.getHttpSolrClient(baseUrl);params.add(DISTRIB, "false");params.add("fq", "{!tlogit}");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.javaindex 5564e38bd53..cc4175c9036 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java@@ -39,8 +39,8 @@ import java.util.TreeSet;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.stream.Collectors;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.comp.ComparatorOrder;import org.apache.solr.client.solrj.io.comp.FieldComparator;@@ -509,10 +509,10 @@ public class TopicStream extends CloudSolrStream implements Expressible {for (Replica replica : replicas) {if (replica.getState() == Replica.State.ACTIVE&& liveNodes.contains(replica.getNodeName())) {- HttpSolrClient httpClient =+ SolrClient solrClient =streamContext.getSolrClientCache().getHttpSolrClient(replica.getCoreUrl());try {- SolrDocument doc = httpClient.getById(id);+ SolrDocument doc = solrClient.getById(id);if (doc != null) {@SuppressWarnings({"unchecked"})List<String> checkpoints = (List<String>) doc.getFieldValue("checkpoint_ss");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 cc9d037a232..6fb9a2dbf66 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@@ -110,7 +110,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {@Monster("Only useful to verify the performance of serialization+ deserialization")// ant -Dtestcase=SolrExampleBinaryTest -Dtests.method=testQueryPerf -Dtests.monster=true testpublic void testQueryPerf() throws Exception {- HttpSolrClient client = (HttpSolrClient) getSolrClient();+ SolrClient client = getSolrClient();client.deleteByQuery("*:*");client.commit();ArrayList<SolrInputDocument> docs = new ArrayList<>();@@ -438,7 +438,7 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {if (jetty != null) {// check system wide system handler + "/admin/info/system"String url = jetty.getBaseUrl().toString();- try (HttpSolrClient adminClient = getHttpSolrClient(url)) {+ try (SolrClient adminClient = getHttpSolrClient(url)) {SolrQuery q = new SolrQuery();q.set("qt", "/admin/info/system");QueryResponse rsp = adminClient.query(q);diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.javaindex f6d096baa6d..27452186ccb 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java@@ -22,7 +22,6 @@ import org.apache.http.impl.client.CloseableHttpClient;import org.apache.solr.SolrTestCase;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.junit.Test;/**@@ -41,7 +40,7 @@ public class SolrExceptionTest extends SolrTestCase {// switched to a local address to avoid going out on the net, ns lookup issues, etc.// set a 1ms timeout to let the connection fail faster.httpClient = HttpClientUtil.createClient(null);- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient("http://" + SolrTestCaseJ4.DEAD_HOST_1 + "/solr/", httpClient, 1)) {SolrQuery query = new SolrQuery("test123");client.query(query);diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.javaindex 2885f49e0de..7403d472c9e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java@@ -33,7 +33,6 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.Http2SolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;@@ -100,7 +99,7 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {docs.add(doc);}SolrResponseBase resp;- try (HttpSolrClient client = getHttpSolrClient(solrInstance.getUrl())) {+ try (SolrClient client = getHttpSolrClient(solrInstance.getUrl())) {resp = client.add(docs);assertEquals(0, resp.getStatus());resp = client.commit();diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.javaindex 3f2b378193f..8057b6d2c76 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java@@ -34,7 +34,6 @@ import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.HttpClientUtil;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.LBHttpSolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.client.solrj.response.SolrResponseBase;@@ -101,7 +100,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {docs.add(doc);}SolrResponseBase resp;- try (HttpSolrClient client = getHttpSolrClient(solrInstance.getUrl(), httpClient)) {+ try (SolrClient client = getHttpSolrClient(solrInstance.getUrl(), httpClient)) {resp = client.add(docs);assertEquals(0, resp.getStatus());resp = client.commit();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 3b8228a7b41..b3c70e780cb 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@@ -53,6 +53,7 @@ import org.apache.http.impl.cookie.BasicClientCookie;import org.apache.http.protocol.HttpContext;import org.apache.solr.SolrJettyTestBase;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.SolrRequest;import org.apache.solr.client.solrj.SolrRequest.METHOD;@@ -207,7 +208,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {@Testpublic void testTimeout() throws Exception {SolrQuery q = new SolrQuery("*:*");- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(jetty.getBaseUrl().toString() + "/slow/foo", DEFAULT_CONNECTION_TIMEOUT, 2000)) {SolrServerException e =@@ -228,7 +229,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {ErrorCode.UNKNOWN,ErrorCode.getErrorCode(status));- try (HttpSolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {+ try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {DebugServlet.setErrorCode(status);SolrQuery q = new SolrQuery("foo");SolrException e = expectThrows(SolrException.class, () -> client.query(q, METHOD.GET));@@ -438,7 +439,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {@Testpublic void testGetById() throws Exception {DebugServlet.clear();- try (HttpSolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {+ try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {Collection<String> ids = Collections.singletonList("a");expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> client.getById("a"));expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> client.getById(ids, null));@@ -539,14 +540,14 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {final SolrQuery q = new SolrQuery("*:*");final String clientUrl = jetty.getBaseUrl().toString() + "/debug/foo";- try (HttpSolrClient client = getHttpSolrClient(clientUrl)) {+ try (SolrClient client = getHttpSolrClient(clientUrl)) {// verify request header gets setDebugServlet.clear();expectThrows(BaseHttpSolrClient.RemoteSolrException.class, () -> client.query(q));assertNull(DebugServlet.headers.toString(), DebugServlet.headers.get("Accept-Encoding"));}- try (HttpSolrClient client = getHttpSolrClient(clientUrl, null, null, true)) {+ try (SolrClient client = getHttpSolrClient(clientUrl, null, null, true)) {try {client.query(q);} catch (BaseHttpSolrClient.RemoteSolrException ignored) {@@ -554,7 +555,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {assertNotNull(DebugServlet.headers.get("Accept-Encoding"));}- try (HttpSolrClient client = getHttpSolrClient(clientUrl, null, null, false)) {+ try (SolrClient client = getHttpSolrClient(clientUrl, null, null, false)) {try {client.query(q);} catch (BaseHttpSolrClient.RemoteSolrException ignored) {@@ -589,8 +590,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {}// verify compressed response can be handled- try (HttpSolrClient client =- getHttpSolrClient(jetty.getBaseUrl().toString() + "/collection1")) {+ try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString() + "/collection1")) {QueryResponse response = client.query(new SolrQuery("foo"));assertEquals(0, response.getStatus());}@@ -599,7 +599,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {@Testpublic void testCollectionParameters() throws IOException, SolrServerException {- try (HttpSolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString())) {+ try (SolrClient client = getHttpSolrClient(jetty.getBaseUrl().toString())) {SolrInputDocument doc = new SolrInputDocument();doc.addField("id", "collection");client.add("collection1", doc);@@ -611,7 +611,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {}final String collection1Url = jetty.getBaseUrl().toString() + "/collection1";- try (HttpSolrClient client = getHttpSolrClient(collection1Url)) {+ try (SolrClient client = getHttpSolrClient(collection1Url)) {assertEquals(1, client.query(new SolrQuery("id:collection")).getResults().getNumFound());}}@@ -619,17 +619,14 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {@Testpublic void testGetRawStream() throws SolrServerException, IOException {CloseableHttpClient client = HttpClientUtil.createClient(null);- try {- HttpSolrClient solrClient =- getHttpSolrClient(jetty.getBaseUrl().toString() + "/collection1", client, null);+ try (SolrClient solrClient =+ getHttpSolrClient(jetty.getBaseUrl().toString() + "/collection1", client, null); ) {+QueryRequest req = new QueryRequest();NamedList<?> response = solrClient.request(req);InputStream stream = (InputStream) response.get("stream");assertNotNull(stream);stream.close();- } finally {- HttpClientUtil.close(client);- ;}}@@ -690,7 +687,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {HttpClientUtil.addRequestInterceptor(cookieSettingRequestInterceptor);final String clientUrl = jetty.getBaseUrl().toString() + "/debug/foo";- try (HttpSolrClient server = getHttpSolrClient(clientUrl)) {+ try (SolrClient server = getHttpSolrClient(clientUrl)) {SolrQuery q = new SolrQuery("foo");q.setParam("a", "\u1234");@@ -825,7 +822,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {assertEquals(2, createdClient.getInvariantParams().getParams("fq").length);}- try (HttpSolrClient createdClient =+ try (SolrClient createdClient =new HttpSolrClient.Builder().withBaseSolrUrl(jetty.getBaseUrl().toString()).withKerberosDelegationToken("mydt")diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.javaindex 8a4877f5142..6cf26e440b6 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java@@ -39,7 +39,7 @@ public class CloudHttp2SolrClientBuilderTest extends SolrTestCase {@Testpublic void testSingleZkHostSpecified() throws IOException {- try (CloudHttp2SolrClient createdClient =+ try (CloudSolrClient createdClient =new CloudHttp2SolrClient.Builder(Collections.singletonList(ANY_ZK_HOST), Optional.of(ANY_CHROOT)).build()) {@@ -57,7 +57,7 @@ public class CloudHttp2SolrClientBuilderTest extends SolrTestCase {final List<String> zkHostList = new ArrayList<>();zkHostList.add(ANY_ZK_HOST);zkHostList.add(ANY_OTHER_ZK_HOST);- try (CloudHttp2SolrClient createdClient =+ try (CloudSolrClient createdClient =new CloudHttp2SolrClient.Builder(zkHostList, Optional.of(ANY_CHROOT)).build()) {try (ZkClientClusterStateProvider zkClientClusterStateProvider =ZkClientClusterStateProvider.from(createdClient)) {@@ -74,7 +74,7 @@ public class CloudHttp2SolrClientBuilderTest extends SolrTestCase {final ArrayList<String> zkHosts = new ArrayList<>();zkHosts.add(ANY_ZK_HOST);zkHosts.add(ANY_OTHER_ZK_HOST);- try (CloudHttp2SolrClient createdClient =+ try (CloudSolrClient createdClient =new CloudHttp2SolrClient.Builder(zkHosts, Optional.of(ANY_CHROOT)).build()) {try (ZkClientClusterStateProvider zkClientClusterStateProvider =ZkClientClusterStateProvider.from(createdClient)) {@@ -88,7 +88,7 @@ public class CloudHttp2SolrClientBuilderTest extends SolrTestCase {@Testpublic void testByDefaultConfiguresClientToSendUpdatesOnlyToShardLeaders() throws IOException {- try (CloudHttp2SolrClient createdClient =+ try (CloudSolrClient createdClient =new CloudHttp2SolrClient.Builder(Collections.singletonList(ANY_ZK_HOST), Optional.of(ANY_CHROOT)).build()) {@@ -98,7 +98,7 @@ public class CloudHttp2SolrClientBuilderTest extends SolrTestCase {@Testpublic void testIsDirectUpdatesToLeadersOnlyDefault() throws IOException {- try (CloudHttp2SolrClient createdClient =+ try (CloudSolrClient createdClient =new CloudHttp2SolrClient.Builder(Collections.singletonList(ANY_ZK_HOST), Optional.of(ANY_CHROOT)).build()) {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.javaindex 8962d0f9f9a..c4210bab7b4 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java@@ -68,7 +68,7 @@ public class CloudHttp2SolrClientMultiConstructorTest extends SolrTestCase {clientChroot = "/mychroot";}- try (CloudHttp2SolrClient client =+ try (CloudSolrClient client =new CloudHttp2SolrClient.Builder(new ArrayList<>(hosts), Optional.ofNullable(clientChroot)).build()) {try (ZkClientClusterStateProvider zkClientClusterStateProvider =diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientRetryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientRetryTest.javaindex ff255cb5329..d9b5074402c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientRetryTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientRetryTest.java@@ -52,7 +52,7 @@ public class CloudHttp2SolrClientRetryTest extends SolrCloudTestCase {@Testpublic void testRetry() throws Exception {String collectionName = "testRetry";- try (CloudHttp2SolrClient solrClient =+ try (CloudSolrClient solrClient =new CloudHttp2SolrClient.Builder(Collections.singletonList(cluster.getZkServer().getZkAddress()), Optional.empty()).build()) {diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.javaindex 82810416b8e..e6776e16d6a 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java@@ -87,8 +87,8 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {private static final int TIMEOUT = 30;private static final int NODE_COUNT = 3;- private static CloudHttp2SolrClient httpBasedCloudSolrClient = null;- private static CloudHttp2SolrClient zkBasedCloudSolrClient = null;+ private static CloudSolrClient httpBasedCloudSolrClient = null;+ private static CloudSolrClient zkBasedCloudSolrClient = null;@BeforeClasspublic static void setupCluster() throws Exception {@@ -136,7 +136,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {}/** Randomly return the cluster's ZK based CSC, or HttpClusterProvider based CSC. */- private CloudHttp2SolrClient getRandomClient() {+ private CloudSolrClient getRandomClient() {// return random().nextBoolean()? zkBasedCloudSolrClient : httpBasedCloudSolrClient;return httpBasedCloudSolrClient;}@@ -199,7 +199,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {.process(cluster.getSolrClient());cluster.waitForActiveCollection(COLLECTION2, 2, 2);- CloudHttp2SolrClient client = getRandomClient();+ CloudSolrClient client = getRandomClient();SolrInputDocument doc = new SolrInputDocument("id", "1", "title_s", "my doc");client.add(COLLECTION, doc);client.commit(COLLECTION);@@ -278,7 +278,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {params.add("q", "id:" + id);params.add("distrib", "false");QueryRequest queryRequest = new QueryRequest(params);- try (HttpSolrClient solrClient = getHttpSolrClient(url)) {+ try (SolrClient solrClient = getHttpSolrClient(url)) {QueryResponse queryResponse = queryRequest.process(solrClient);SolrDocumentList docList = queryResponse.getResults();assertEquals(1, docList.getNumFound());@@ -324,7 +324,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {params.add("q", "id:" + id);params.add("distrib", "false");QueryRequest queryRequest = new QueryRequest(params);- try (HttpSolrClient solrClient = getHttpSolrClient(url)) {+ try (SolrClient solrClient = getHttpSolrClient(url)) {QueryResponse queryResponse = queryRequest.process(solrClient);SolrDocumentList docList = queryResponse.getResults();assertEquals(1, docList.getNumFound());@@ -453,8 +453,8 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {}@SuppressWarnings("deprecation")- private void queryWithShardsPreferenceRules(- CloudHttp2SolrClient cloudClient, String collectionName) throws Exception {+ private void queryWithShardsPreferenceRules(CloudSolrClient cloudClient, String collectionName)+ throws Exception {SolrQuery qRequest = new SolrQuery("*:*");ModifiableSolrParams qParams = new ModifiableSolrParams();@@ -531,7 +531,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {}private void queryReplicaType(- CloudHttp2SolrClient cloudClient, Replica.Type typeToQuery, String collectionName)+ CloudSolrClient cloudClient, Replica.Type typeToQuery, String collectionName)throws Exception {SolrQuery qRequest = new SolrQuery("*:*");@@ -593,7 +593,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {throws SolrServerException, IOException {NamedList<Object> resp;- try (HttpSolrClient client = getHttpSolrClient(baseUrl + "/" + collectionName, 15000, 60000)) {+ try (SolrClient client = getHttpSolrClient(baseUrl + "/" + collectionName, 15000, 60000)) {ModifiableSolrParams params = new ModifiableSolrParams();params.set("qt", "/admin/mbeans");params.set("stats", "true");@@ -752,7 +752,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {BaseHttpSolrClient.RemoteSolrException sse = null;final String url = r.getBaseUrl() + "/" + COLLECTION;- try (HttpSolrClient solrClient = getHttpSolrClient(url)) {+ try (SolrClient solrClient = getHttpSolrClient(url)) {if (log.isInfoEnabled()) {log.info("should work query, result {}", solrClient.query(q));@@ -912,7 +912,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {CollectionAdminRequest.createCollection(COLLECTION, "conf", 2, 1).process(cluster.getSolrClient());cluster.waitForActiveCollection(COLLECTION, 2, 2);- CloudHttp2SolrClient client = httpBasedCloudSolrClient;+ CloudSolrClient client = httpBasedCloudSolrClient;SolrInputDocument doc = new SolrInputDocument("id", "1", "title_s", "my doc");new UpdateRequest().add(doc).commit(client, COLLECTION);assertEquals(1, client.query(COLLECTION, params("q", "*:*")).getResults().getNumFound());@@ -920,7 +920,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {@Testpublic void testCollectionDoesntExist() throws Exception {- CloudHttp2SolrClient client = getRandomClient();+ CloudSolrClient client = getRandomClient();SolrInputDocument doc = new SolrInputDocument("id", "1", "title_s", "my doc");try {client.add("boguscollectionname", doc);@@ -1058,7 +1058,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {}private void queryWithPreferReplicaTypes(- CloudHttp2SolrClient cloudClient, String preferReplicaTypes, String collectionName)+ CloudSolrClient cloudClient, String preferReplicaTypes, String collectionName)throws Exception {SolrQuery qRequest = new SolrQuery("*:*");ModifiableSolrParams qParams = new ModifiableSolrParams();diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.javaindex d9107e23afe..cde2962c20c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java@@ -281,7 +281,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {params.add("q", "id:" + id);params.add("distrib", "false");QueryRequest queryRequest = new QueryRequest(params);- try (HttpSolrClient solrClient = getHttpSolrClient(url)) {+ try (SolrClient solrClient = getHttpSolrClient(url)) {QueryResponse queryResponse = queryRequest.process(solrClient);SolrDocumentList docList = queryResponse.getResults();assertEquals(1, docList.getNumFound());@@ -327,7 +327,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {params.add("q", "id:" + id);params.add("distrib", "false");QueryRequest queryRequest = new QueryRequest(params);- try (HttpSolrClient solrClient = getHttpSolrClient(url)) {+ try (SolrClient solrClient = getHttpSolrClient(url)) {QueryResponse queryResponse = queryRequest.process(solrClient);SolrDocumentList docList = queryResponse.getResults();assertEquals(1, docList.getNumFound());@@ -596,7 +596,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {throws SolrServerException, IOException {NamedList<Object> resp;- try (HttpSolrClient client = getHttpSolrClient(baseUrl + "/" + collectionName, 15000, 60000)) {+ try (SolrClient client = getHttpSolrClient(baseUrl + "/" + collectionName, 15000, 60000)) {ModifiableSolrParams params = new ModifiableSolrParams();params.set("qt", "/admin/mbeans");params.set("stats", "true");@@ -760,7 +760,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {BaseHttpSolrClient.RemoteSolrException sse = null;final String url = r.getBaseUrl() + "/" + COLLECTION;- try (HttpSolrClient solrClient = getHttpSolrClient(url)) {+ try (SolrClient solrClient = getHttpSolrClient(url)) {if (log.isInfoEnabled()) {log.info("should work query, result {}", solrClient.query(q));diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClusterStateSSLTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClusterStateSSLTest.javaindex 93e959d96b2..db385e26b83 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClusterStateSSLTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClusterStateSSLTest.java@@ -92,7 +92,7 @@ public class HttpClusterStateSSLTest extends SolrCloudTestCase {}// http2- try (CloudHttp2SolrClient http2BasedClient =+ try (CloudSolrClient http2BasedClient =new CloudHttp2SolrClient.Builder(Collections.singletonList(url0.toExternalForm())).build()) {ClusterStateProvider csp = http2BasedClient.getClusterStateProvider();diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.javaindex f458906b13f..de5a93b56d5 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientConPoolTest.java@@ -26,6 +26,7 @@ import org.apache.http.impl.client.CloseableHttpClient;import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;import org.apache.http.pool.PoolStats;import org.apache.solr.SolrJettyTestBase;+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.embedded.JettySolrRunner;@@ -122,7 +123,7 @@ public class HttpSolrClientConPoolTest extends SolrJettyTestBase {public void testLBClient() throws IOException, SolrServerException {PoolingHttpClientConnectionManager pool = HttpClientUtil.createPoolingConnectionManager();- final HttpSolrClient client1;+ final SolrClient client1;int threadCount = atLeast(2);final ExecutorService threads =ExecutorUtil.newMDCAwareFixedThreadPool(diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.javaindex faf8d681a28..5291964db9c 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java@@ -27,9 +27,9 @@ import java.util.HashSet;import java.util.List;import java.util.Set;import org.apache.lucene.tests.util.LuceneTestCase;+import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.impl.InputStreamResponseParser;import org.apache.solr.client.solrj.io.SolrClientCache;import org.apache.solr.client.solrj.io.Tuple;@@ -1234,7 +1234,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {JettySolrRunner runner = runners.get(0);String url = runner.getBaseUrl().toString();- HttpSolrClient client = getHttpSolrClient(url);+ SolrClient client = getHttpSolrClient(url);ModifiableSolrParams params = new ModifiableSolrParams();String expr =diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.javaindex 197ce8eb351..3ff70ae5375 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestV2Request.java@@ -92,7 +92,7 @@ public class TestV2Request extends SolrCloudTestCase {@Testpublic void testHttpSolrClient() throws Exception {- HttpSolrClient solrClient =+ SolrClient solrClient =new HttpSolrClient.Builder(cluster.getJettySolrRunner(0).getBaseUrl().toString()).build();doTest(solrClient);solrClient.close();@@ -198,8 +198,7 @@ public class TestV2Request extends SolrCloudTestCase {.withMethod(SolrRequest.METHOD.GET).build();- try (HttpSolrClient client1 =- new HttpSolrClient.Builder().withBaseSolrUrl(testServer).build()) {+ try (SolrClient client1 = new HttpSolrClient.Builder().withBaseSolrUrl(testServer).build()) {V2Response rsp = v2r.process(client1);assertEquals("0", rsp._getStr("responseHeader/status", null));}diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.javaindex 7105ac68a6d..42d3f6e7960 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java@@ -32,7 +32,6 @@ import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.embedded.JettyConfig;import org.apache.solr.client.solrj.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.util.DirectoryUtil;import org.apache.solr.util.ExternalPaths;import org.eclipse.jetty.servlet.ServletHolder;@@ -158,7 +157,7 @@ public abstract class SolrJettyTestBase extends SolrTestCaseJ4 {try {// setup the client...final String url = jetty.getBaseUrl().toString() + "/" + "collection1";- final HttpSolrClient client = getHttpSolrClient(url, DEFAULT_CONNECTION_TIMEOUT);+ final SolrClient client = getHttpSolrClient(url, DEFAULT_CONNECTION_TIMEOUT);return client;} catch (final Exception ex) {throw new RuntimeException(ex);diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.javaindex d94d994a5be..24488e60685 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java@@ -203,7 +203,7 @@ public abstract class AbstractBasicDistributedZk2TestBase extends AbstractFullDiassertEquals(docs - 1, results.getResults().getNumFound());}- try (HttpSolrClient qclient = getHttpSolrClient(baseUrl + "/onenodecollection")) {+ try (SolrClient qclient = getHttpSolrClient(baseUrl + "/onenodecollection")) {QueryResponse results = qclient.query(query);assertEquals(docs - 1, results.getResults().getNumFound());@@ -421,7 +421,7 @@ public abstract class AbstractBasicDistributedZk2TestBase extends AbstractFullDicheckShardConsistency(true, false);// try a backup command- try (final HttpSolrClient client =+ try (final SolrClient client =getHttpSolrClient((String) shardToJetty.get(SHARD2).get(0).info.get("base_url"))) {final String backupName = "the_backup";ModifiableSolrParams params = new ModifiableSolrParams();diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.javaindex 4facbab196c..ee3e50d1fb1 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java@@ -916,7 +916,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDisfor (Slice slice : dColl.getActiveSlices()) {long sliceDocCount = -1;for (Replica rep : slice.getReplicas()) {- try (HttpSolrClient one = getHttpSolrClient(rep.getCoreUrl())) {+ try (SolrClient one = getHttpSolrClient(rep.getCoreUrl())) {SolrQuery query = new SolrQuery("*:*");query.setDistrib(false);QueryResponse resp = one.query(query);@@ -1045,7 +1045,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDisprivate void testStopAndStartCoresInOneInstance() throws Exception {JettySolrRunner jetty = jettys.get(0);- try (final HttpSolrClient httpSolrClient = (HttpSolrClient) jetty.newClient(15000, 60000)) {+ try (final SolrClient httpSolrClient = (HttpSolrClient) jetty.newClient(15000, 60000)) {ThreadPoolExecutor executor = null;try {executor =@@ -1304,7 +1304,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDisString collection = elements[elements.length - 1];String urlString = url.toString();urlString = urlString.substring(0, urlString.length() - collection.length() - 1);- try (HttpSolrClient client = getHttpSolrClient(urlString, 15000, 60000)) {+ try (SolrClient client = getHttpSolrClient(urlString, 15000, 60000)) {ModifiableSolrParams params = new ModifiableSolrParams();// params.set("qt", "/admin/metrics?prefix=UPDATE.updateHandler®istry=solr.core." +// collection);@@ -1401,7 +1401,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDis.getLeader("shard1"));// now test that unloading a core gets us a new leader- try (HttpSolrClient unloadClient =+ try (SolrClient unloadClient =getHttpSolrClient(jettys.get(0).getBaseUrl().toString(), 15000, 60000)) {Unload unloadCmd = new Unload(true);unloadCmd.setCoreName(props.getCoreName());@@ -1545,7 +1545,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDisfinal String shardId) {Callable<Object> call =() -> {- try (HttpSolrClient client = getHttpSolrClient(baseUrl)) {+ try (SolrClient client = getHttpSolrClient(baseUrl)) {// client.setConnectionTimeout(15000);Create createCmd = new Create();createCmd.setRoles("none");@@ -1712,7 +1712,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDisprotected SolrClient createNewSolrClient(String collection, String baseUrl) {try {// setup the server...- HttpSolrClient client = getHttpSolrClient(baseUrl + "/" + collection);+ SolrClient client = getHttpSolrClient(baseUrl + "/" + collection);return client;} catch (Exception ex) {@@ -1724,7 +1724,7 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDisString collection, String baseUrl, int connectionTimeoutMillis, int socketTimeoutMillis) {try {// setup the server...- HttpSolrClient client =+ SolrClient client =getHttpSolrClient(baseUrl + "/" + collection, connectionTimeoutMillis, socketTimeoutMillis);diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.javaindex dfb467a40a2..0fb2f012fa6 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java@@ -1123,7 +1123,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes}controlClient.add(doc);- HttpSolrClient client = (HttpSolrClient) clients.get(serverNumber);+ SolrClient client = clients.get(serverNumber);UpdateRequest ureq = new UpdateRequest();ureq.add(doc);@@ -2192,7 +2192,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes// setup the server...String baseUrl = buildUrl(port);String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + coreName;- HttpSolrClient client = getHttpSolrClient(url, DEFAULT_CONNECTION_TIMEOUT, 60000);+ SolrClient client = getHttpSolrClient(url, DEFAULT_CONNECTION_TIMEOUT, 60000);return client;} catch (Exception ex) {throw new RuntimeException(ex);@@ -2205,7 +2205,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes// setup the server...String baseUrl = buildUrl(port);String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + coreName;- HttpSolrClient client = getHttpSolrClient(url, connectionTimeoutMillis, socketTimeoutMillis);+ SolrClient client = getHttpSolrClient(url, connectionTimeoutMillis, socketTimeoutMillis);return client;} catch (Exception ex) {throw new RuntimeException(ex);@@ -2215,7 +2215,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTesprotected SolrClient createNewSolrClient(String collection, String baseUrl) {try {// setup the server...- HttpSolrClient client =+ SolrClient client =getHttpSolrClient(baseUrl + "/" + collection, DEFAULT_CONNECTION_TIMEOUT, 60000);return client;} catch (Exception ex) {@@ -2563,7 +2563,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTesZkCoreNodeProps coreProps = new ZkCoreNodeProps(replica);String coreName = coreProps.getCoreName();boolean reloadedOk = false;- try (HttpSolrClient client = getHttpSolrClient(coreProps.getBaseUrl())) {+ try (SolrClient client = getHttpSolrClient(coreProps.getBaseUrl())) {CoreAdminResponse statusResp = CoreAdminRequest.getStatus(coreName, client);long leaderCoreStartTime = statusResp.getStartTime(coreName).getTime();@@ -2747,7 +2747,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes}protected long getIndexVersion(Replica replica) throws IOException {- try (HttpSolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {+ try (SolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {ModifiableSolrParams params = new ModifiableSolrParams();params.set("qt", "/replication");params.set(ReplicationHandler.COMMAND, ReplicationHandler.CMD_SHOW_COMMITS);@@ -2794,7 +2794,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes}protected void logReplicationDetails(Replica replica, StringBuilder builder) throws IOException {- try (HttpSolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {+ try (SolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {ModifiableSolrParams params = new ModifiableSolrParams();params.set("qt", "/replication");params.set(ReplicationHandler.COMMAND, ReplicationHandler.CMD_DETAILS);diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.javaindex 973f4581829..58a0b928150 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java@@ -30,7 +30,6 @@ import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.response.CoreAdminResponse;@@ -365,7 +364,7 @@ public abstract class AbstractMoveReplicaTestBase extends SolrCloudTestCase {private int getNumOfCores(CloudSolrClient cloudClient, String nodeName, String collectionName, String replicaType)throws IOException, SolrServerException {- try (HttpSolrClient coreclient =+ try (SolrClient coreclient =getHttpSolrClient(ZkStateReader.from(cloudClient).getBaseUrlForNodeName(nodeName))) {CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreclient);if (status.getCoreStatus().size() == 0) {diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.javaindex 58c086c96d4..17f03224525 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java@@ -25,6 +25,7 @@ import java.util.Set;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.stream.Collectors;+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.HttpSolrClient;@@ -101,7 +102,7 @@ public abstract class AbstractSyncSliceTestBase extends AbstractFullDistribZkTesbaseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());// we only set the connect timeout, not so timeout- try (HttpSolrClient baseClient = getHttpSolrClient(baseUrl, 30000)) {+ try (SolrClient baseClient = getHttpSolrClient(baseUrl, 30000)) {baseClient.request(request);}diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.javaindex 4d2de9eaaa6..b5f824cb9a7 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java@@ -26,10 +26,10 @@ import java.util.Set;import java.util.concurrent.SynchronousQueue;import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;+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.embedded.JettySolrRunner;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;import org.apache.solr.common.SolrInputDocument;@@ -159,7 +159,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDifinal String unloadCmdCoreName1 = (unloadInOrder ? coreName1 : coreName2);final String unloadCmdCoreName2 = (unloadInOrder ? coreName2 : coreName1);- try (HttpSolrClient adminClient = getHttpSolrClient(buildUrl(jettys.get(0).getLocalPort()))) {+ try (SolrClient adminClient = getHttpSolrClient(buildUrl(jettys.get(0).getLocalPort()))) {// now unload one of the twoUnload unloadCmd = new Unload(false);unloadCmd.setCoreName(unloadCmdCoreName1);@@ -241,7 +241,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDiRandom random = random();if (random.nextBoolean()) {- try (HttpSolrClient collectionClient = getHttpSolrClient(leaderProps.getCoreUrl())) {+ try (SolrClient collectionClient = getHttpSolrClient(leaderProps.getCoreUrl())) {// lets try and use the solrj client to index and retrieve a couple// documentsSolrInputDocument doc1 =@@ -269,7 +269,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDi// so that we start with some versions when we reload...TestInjection.skipIndexWriterCommitOnClose = true;- try (HttpSolrClient addClient =+ try (SolrClient addClient =getHttpSolrClient(jettys.get(2).getBaseUrl() + "/unloadcollection_shard1_replica3", 30000)) {@@ -284,8 +284,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDi// collectionClient.commit();// unload the leader- try (HttpSolrClient collectionClient =- getHttpSolrClient(leaderProps.getBaseUrl(), 15000, 30000)) {+ try (SolrClient collectionClient = getHttpSolrClient(leaderProps.getBaseUrl(), 15000, 30000)) {Unload unloadCmd = new Unload(false);unloadCmd.setCoreName(leaderProps.getCoreName());@@ -309,7 +308,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDi// ensure there is a leaderzkStateReader.getLeaderRetry("unloadcollection", "shard1", 15000);- try (HttpSolrClient addClient =+ try (SolrClient addClient =getHttpSolrClient(jettys.get(1).getBaseUrl() + "/unloadcollection_shard1_replica2", 30000, 90000)) {@@ -332,8 +331,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDi// unload the leader againleaderProps = getLeaderUrlFromZk("unloadcollection", "shard1");- try (HttpSolrClient collectionClient =- getHttpSolrClient(leaderProps.getBaseUrl(), 15000, 30000)) {+ try (SolrClient collectionClient = getHttpSolrClient(leaderProps.getBaseUrl(), 15000, 30000)) {Unload unloadCmd = new Unload(false);unloadCmd.setCoreName(leaderProps.getCoreName());@@ -364,7 +362,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDilong found1, found3;- try (HttpSolrClient adminClient =+ try (SolrClient adminClient =getHttpSolrClient(jettys.get(1).getBaseUrl() + "/unloadcollection_shard1_replica2", 15000, 30000)) {adminClient.commit();@@ -373,7 +371,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDifound1 = adminClient.query(q).getResults().getNumFound();}- try (HttpSolrClient adminClient =+ try (SolrClient adminClient =getHttpSolrClient(jettys.get(2).getBaseUrl() + "/unloadcollection_shard1_replica3", 15000, 30000)) {adminClient.commit();@@ -382,7 +380,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDifound3 = adminClient.query(q).getResults().getNumFound();}- try (HttpSolrClient adminClient =+ try (SolrClient adminClient =getHttpSolrClient(jettys.get(3).getBaseUrl() + "/unloadcollection_shard1_replica4", 15000, 30000)) {adminClient.commit();@@ -399,7 +397,7 @@ public abstract class AbstractUnloadDistributedZkTestBase extends AbstractFullDiprivate void testUnloadLotsOfCores() throws Exception {JettySolrRunner jetty = jettys.get(0);int shards = TEST_NIGHTLY ? 2 : 1;- try (final HttpSolrClient adminClient = (HttpSolrClient) jetty.newClient(15000, 60000)) {+ try (final SolrClient adminClient = jetty.newClient(15000, 60000)) {int numReplicas = atLeast(3);ThreadPoolExecutor executor =new ExecutorUtil.MDCAwareThreadPoolExecutor(diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.javaindex f9a17b86275..9cc1d623457 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java@@ -31,11 +31,11 @@ import java.util.concurrent.atomic.AtomicReference;import java.util.function.Predicate;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;+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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.common.cloud.CollectionStatePredicate;@@ -292,7 +292,7 @@ public class SolrCloudTestCase extends SolrTestCaseJ4 {protected static CoreStatus getCoreStatus(Replica replica)throws IOException, SolrServerException {JettySolrRunner jetty = cluster.getReplicaJetty(replica);- try (HttpSolrClient client =+ try (SolrClient client =getHttpSolrClient(jetty.getBaseUrl().toString(),((CloudLegacySolrClient) cluster.getSolrClient()).getHttpClient())) {diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.javaindex 1b7fd4693f7..8adc026d1d6 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java@@ -42,11 +42,11 @@ import javax.management.MBeanServer;import javax.management.MBeanServerFactory;import javax.management.ObjectName;import org.apache.lucene.tests.util.TestUtil;+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.embedded.JettySolrRunner;import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;import org.apache.solr.client.solrj.request.CoreStatus;@@ -573,7 +573,7 @@ public abstract class AbstractCollectionsAPIDistributedZkTestBase extends SolrClfor (Replica replica : shard) {ZkCoreNodeProps coreProps = new ZkCoreNodeProps(replica);CoreStatus coreStatus;- try (HttpSolrClient server = getHttpSolrClient(coreProps.getBaseUrl())) {+ try (SolrClient server = getHttpSolrClient(coreProps.getBaseUrl())) {coreStatus = CoreAdminRequest.getCoreStatus(coreProps.getCoreName(), false, server);}long before = coreStatus.getCoreStartTime().getTime();@@ -662,7 +662,7 @@ public abstract class AbstractCollectionsAPIDistributedZkTestBase extends SolrClnewReplica = grabNewReplica(response, getCollectionState(collectionName));assertNotNull(newReplica);- try (HttpSolrClient coreclient = getHttpSolrClient(newReplica.getBaseUrl())) {+ try (SolrClient coreclient = getHttpSolrClient(newReplica.getBaseUrl())) {CoreAdminResponse status = CoreAdminRequest.getStatus(newReplica.getStr("core"), coreclient);NamedList<Object> coreStatus = status.getCoreStatus(newReplica.getStr("core"));String instanceDirStr = (String) coreStatus.get("instanceDir");