SOLR-18188: Remove org.apache.solr.client.solrj.apache; update tests to use Jetty equivalents by dsmiley · Pull Request #4451 · apache/solr

dsmiley · 2026-05-19T16:05:11Z

https://issues.apache.org/jira/browse/SOLR-18188

This branch/PR originated on the HttpSolrClient refactor / re-addition, whcih is related. That aspect has since merged; brought this branch up to date. I'll want to take chunks of work here and commit separately (other PRs) so we don't lose context on why some tests or test infra changed in non-obvious ways.

As of this writing: tests pass, even with SSL. "nightly" tests have failures.

Not going to be a good use of time to review this massive thing so I suggest not reviewing except for the things I call out in a self-review.

WILL NOT COMPILE Not widely updating anything yet; just touch this source file.

WILL NOT COMPILE Enhanced our clients to use it.

# Conflicts: # solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java # solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java # solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java # solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java # solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java # solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java # solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java # solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java # solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java # solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerFailureTest.java # solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java # solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java # solr/core/src/test/org/apache/solr/pkg/TestPackages.java # solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java # solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClientBase.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java # solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java # solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java # solr/test-framework/src/java/org/apache/solr/client/solrj/apache/ConcurrentUpdateSolrClient.java # solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java # solr/test-framework/src/java/org/apache/solr/client/solrj/apache/SolrClientBuilder.java # solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java # solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java # solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java # solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java # solr/test-framework/src/java/org/apache/solr/cloud/AbstractUnloadDistributedZkTestBase.java # solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java

Rename HttpSolrClientBuilderBase.java to HttpSolrClient.BuilderBase (inner class)

# Conflicts: # solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc

…ient # Conflicts: # solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java # solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java # solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java # solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java # solr/solrj/src/test/org/apache/solr/client/solrj/response/InputStreamResponseParserTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java # solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java

# Conflicts: # solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java # solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java # solr/core/src/test/org/apache/solr/handler/admin/api/ClusterPropsAPITest.java # solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java # solr/core/src/test/org/apache/solr/pkg/TestPackages.java # solr/core/src/test/org/apache/solr/search/TestCoordinatorRole.java # solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java # solr/core/src/test/org/apache/solr/servlet/SecurityHeadersTest.java # solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java # solr/solrj-streaming/gradle.lockfile # solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleCborTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java # solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java # solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java # solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java # solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java # solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java # solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/BasicHttpSolrClientTest.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/ConnectionReuseTest.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientBuilderTest.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/HttpSolrClientConPoolTest.java # solr/test-framework/src/test/org/apache/solr/client/solrj/apache/LBHttpSolrClientTest.java

# Conflicts: # changelog/unreleased/SOLR-17968-HttpSolrClient.yml # solr/solrj/src/java/org/apache/solr/client/solrj/impl/CollectionScopedSolrClient.java # solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java # solr/solrj/src/test/org/apache/solr/client/solrj/impl/ClusterStateProviderTest.java # solr/test-framework/src/java/org/apache/solr/client/solrj/apache/HttpApacheSolrClient.java

The race condition was that chaosMonkey.expireSession() starts a background coreZkRegister thread, but waitForRecoveriesToFinish() returned immediately because the node hadn't re-joined live_nodes yet (non-live replicas in DOWN state are ignored). The fix increases blockUntilConnected from 50ms to 30s and replaces waitForRecoveriesToFinish with a waitForState that explicitly waits for the expired node to be back in live_nodes and all live replicas to be ACTIVE. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

And add other lockfiles

dsmiley · 2026-05-20T01:31:40Z

      testOptions += [
          [propName: 'tests.src.home', value: null, description: "See SOLR-14023."],
          [propName: 'solr.tests.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."],
+          [propName: 'tests.ssl', value: false, description: "Force SSL on for all tests that support it (respects @SuppressSSL)."],


I'll create a separate PR for this build convenience thing. It's also debatable it should be elevated to be in this list.

dsmiley · 2026-05-20T01:42:06Z

@@ -1,188 +0,0 @@
-/*


wasn't a test, it's really some benchmark-like thing from ancient times that never should have been merged IMO

dsmiley · 2026-05-20T01:42:42Z

 import org.junit.Test;
 import org.mockito.Mockito;

+@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-17810")


I told the contributor of SOLR-17810 (not quite ready to merge) that this is needed

dsmiley · 2026-05-20T01:43:39Z

      request.setResponseParser(new InputStreamResponseParser(wt));
    }
    result = client.request(request, testCollection);
-    InputStream inputStream = (InputStream) result.get("stream");


This is done in several tests because we must close the stream now. Previously we could get away with not doing so.

dsmiley · 2026-05-20T01:45:06Z

     */
    @SuppressWarnings("unchecked")
    public B withHttpClient(C httpSolrClient) {
+      if (this.baseSolrUrl == null) {


Belongs in another PR.

dsmiley · 2026-05-20T01:47:50Z

-
-/** Apache HttpClient based {@link org.apache.solr.client.solrj.SolrClient} implementations */
-@Deprecated
-package org.apache.solr.client.solrj.apache;


Removing this whole package :-) bye bye HttpSolrClient, CloudLegacySolrClient, etc.

dsmiley · 2026-05-20T01:49:19Z

      IOUtils.closeQuietly(jettySolrClient);
      jettySolrClient = null;

+      if (enableProxy) {


moved; related to a tricky test fix that's kinda related to the transition

dsmiley · 2026-05-20T02:01:06Z

-   * A variant of {@link org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} that will
-   * randomize some internal settings.
-   */
-  public static class RandomizingCloudHttp2SolrClientBuilder extends CloudSolrClient.Builder {


basically I renamed the http2 one to RandomizingCloudSolrClientBuilder

dsmiley · 2026-05-20T02:01:36Z


  protected volatile JettySolrRunner controlJetty;
-  protected final List<SolrClient> clients = Collections.synchronizedList(new ArrayList<>());
+  protected final List<HttpSolrClient> clients = Collections.synchronizedList(new ArrayList<>());


using this more specifc type allows getBaseURL

dsmiley · 2026-05-20T02:03:44Z

-              .setCreateNodeSet(controlJetty.getNodeName())
-              .process(client)
-              .getStatus());
+      RetryUtil.retryOnException(


I don't love the retry but it's needed sometimes

dsmiley and others added 29 commits October 31, 2025 22:28

SOLR-17968: Rename HttpSolrClient to HttpApacheSolrClient

755c6d1

WILL NOT COMPILE Not widely updating anything yet; just touch this source file.

SOLR-17968: HttpSolrClient returns in org.apache.solr.client.solrj

f35170a

WILL NOT COMPILE Enhanced our clients to use it.

Reference HttpApacheSolrClient where appropriate.

7552398

ref guide sample code

1295041

deprecations

93ae2a4

Don't override getBaseURL

829e69c

Change some HttpSolrClient references to HttpApacheSolrClient

22b070a

changelog

561a6d6

HttpApacheSolrClient no longer implements HttpClient

2a435c0

Rename HttpSolrClientBase to HttpSolrClient.

096a5e5

Rename HttpSolrClientBuilderBase.java to HttpSolrClient.BuilderBase (inner class)

Add HttpSolrClient.builder(baseUrl) static method

3705b87

Merge branch 'main' into SOLR-17968-HttpSolrClient

1e2c987

# Conflicts: # solr/solr-ref-guide/modules/indexing-guide/pages/indexing-with-tika.adoc

fix from merge

43589c2

solrj-streaming need not depend on jetty

6b3f53e

Tests...

71472f5

withHttpClient takes baseSolrUrl

00f488a

Tests, switch

d7c767a

Ignore TestRequestRateLimiter for now

aba0816

Stop using HttpClientUtil

68cf3c1

SSLTestConfig no longer depends on Apache httpcomponents

c342722

New build tests.ssl option to force SSL when supported

ba8acfa

Remove package org.apache.solr.client.solrj.apache

47943d6

Drop dependencies

1c46d68

changelog

b14e3ff

github-actions Bot added the documentation Improvements or additions to documentation label May 19, 2026

dsmiley added 3 commits May 19, 2026 21:40

revert httpclient/httpcore LICENSE & NOTICE

b76222f

restore solr/ui/gradle.lockfile

529b0a3

And add other lockfiles

changelog cleanup

1af5b60

github-actions Bot removed the admin-ui label May 20, 2026

dsmiley commented May 20, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SOLR-18188: Remove org.apache.solr.client.solrj.apache; update tests to use Jetty equivalents#4451

SOLR-18188: Remove org.apache.solr.client.solrj.apache; update tests to use Jetty equivalents#4451
dsmiley wants to merge 32 commits into
apache:mainfrom
dsmiley:SOLR-18188-testsStopUsingApacheHttpClient

dsmiley commented May 19, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026 •

edited

Loading

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

dsmiley May 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

dsmiley commented May 19, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dsmiley May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

dsmiley May 20, 2026 •

edited

Loading