SOLR-18038: Remove deprecated LocalSolrQueryRequest and use SolrQueryRequestBase by epugh · Pull Request #4101 · apache/solr

epugh · 2026-02-04T10:40:34Z

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

Description

Migrate from LocalSolrQueryRequest to SolrQueryRequestBase by making SolrQueryRequestBase no longer abstract and including all functionality previously unique to LocalSolrQueryRequest

Solution

Beyond the direct conversion, I've also looked for places we used a NamedList and replaced them with ModifiableSolrParams.

There is this "six parameter" pattern that remains, primarily in tests, but it's done via ModifiableSolrParams method.

Some anonymous subclasses of SolrQueryRequestBase are now explicit. CSVRequest was trivial and could be removed now that SolrQueryRequestBase isn't abstract.

_BIG QUESTION: SHould we rename SolrQueryRequestBase to just SolrQueryRequest and eliminate the interface SolrQueryRequest?

Tests

I've re-run the tests.

… used This lets us replace LocalSolrQueryRequest

epugh · 2026-02-04T10:41:22Z

solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java

    } else {
      stream = new ContentStreamBase.ByteArrayStream(streamBytes, source, "text/csv");
    }
-    return (new SampleCSVLoader(new CSVRequest(params), maxDocsToLoad)).loadDocs(stream);


Here we deleted a trivial class!

epugh · 2026-02-04T10:42:09Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

 * longer in use.
 */
-public abstract class SolrQueryRequestBase implements SolrQueryRequest, Closeable {
+public class SolrQueryRequestBase implements SolrQueryRequest, Closeable {


Do we eliminate SolrQueryRequest interface?

epugh · 2026-02-04T10:44:09Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

  protected Map<Object, Object> context;
  protected Iterable<ContentStream> streams;
  protected Map<String, Object> json;
+  protected String userPrincipalName = null;


I investigated why we had to preserve this here when only one class uses it and:

DocExpirationUpdateProcessorFactory is the ONLY built-in component that:

Creates background/scheduled requests (not triggered by HTTP)

Needs authentication (because it makes distributed deletes)

Must identify itself as a node-initiated operation

Other internal requests either:

Don't need authentication (single-node operations)

Are triggered by user requests (already have principal from HTTP)

Use different mechanisms (like HTTP client with PKI headers for inter-node communication)

This is why setUserPrincipalName() exists but is rarely used - it's a special-purpose API for a rare use case!

I wondered about another home for this, or how do we handle secure internode elsewhere...? Any ideas?

epugh · 2026-02-04T10:45:57Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java


+  /**
+   * Utility method to build SolrParams from individual query components. This is a convenience
+   * method for legacy code that needs to construct params from separate query, qtype, start, limit,


how strongly do we want to eliminate this pattern? Actually, on more investigation, it's only used by five classes, though 27 times!

epugh · 2026-02-04T10:46:42Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

  @Override
  public IndexSchema getSchema() {
-    // a request for a core admin will no have a core
+    // a request for a core admin will not have a core


I am not sure what this comment is telling us..

getCore() and getSchema() here (maybe more) are only applicable to requests to a core. Node requests will return null.

I don't think this spot here is the right spot for such a comment. For one thing; this "Base" class implements an interface, so if something about this is to be said, it should be there.

epugh · 2026-02-04T10:47:12Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

+   *
+   * @see PKIAuthenticationPlugin#NODE_IS_USER
+   * @see #getUserPrincipal
+   * @lucene.internal


these tags are copied over from oroginal implementation. Not sure what they mean or why we have them at this point. If there was a better more "supported" way to do this, I'd love to hear about it!

epugh · 2026-02-04T11:10:09Z

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


    assertU("<optimize/>");

-    // test query


These tests are covered by other unit tests that do the same thing. So removed to pare this massive file back.

Copilot

Pull request overview

This PR removes the deprecated LocalSolrQueryRequest by making SolrQueryRequestBase instantiable and migrating production code + tests to use it, including some cleanup of legacy parameter-building patterns.

Changes:

Make SolrQueryRequestBase concrete and move functionality previously unique to LocalSolrQueryRequest into it; delete LocalSolrQueryRequest.
Update many modules/tests to construct requests using SolrQueryRequestBase, frequently switching from NamedList to ModifiableSolrParams.
Minor test refactors/cleanups (imports, signatures, small comment tweaks).

Reviewed changes

Copilot reviewed 80 out of 80 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
solr/test-framework/src/java/org/apache/solr/util/TestHarness.java	Adds a helper to build `SolrParams` for legacy “six-parameter” request construction; updates factory to use `SolrQueryRequestBase`.
solr/test-framework/src/java/org/apache/solr/update/processor/UpdateProcessorTestBase.java	Migrates request creation from `LocalSolrQueryRequest` to `SolrQueryRequestBase`.
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java	Uses `SolrQueryRequestBase` in helpers that previously returned `LocalSolrQueryRequest`.
solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java	Updates test request instantiation; minor method signature cleanup.
solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java	Removes unnecessary checked exceptions/imports in tests.
solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java	Migrates request creation to `SolrQueryRequestBase`.
solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java	Uses `SolrQueryRequestBase` for local init validation request.
solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java	Migrates test request creation to `SolrQueryRequestBase`.
solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java	Switches request param construction from `NamedList` to `ModifiableSolrParams` and `SolrQueryRequestBase`.
solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTestAbstract.java	Adjusts casts/types to `SolrQueryRequestBase` for request handling in tests.
solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringConfigSetsHandlerTest.java	Uses `SolrQueryRequestBase` for test request creation.
solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java	Uses `SolrQueryRequestBase` for test request creation.
solr/modules/cross-dc/src/java/org/apache/solr/crossdc/handler/MirroringConfigSetsHandler.java	Wraps requests using `SolrQueryRequestBase` instead of `LocalSolrQueryRequest`.
solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java	Migrates requests in tests to `SolrQueryRequestBase`.
solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java	Replaces legacy arg-map request construction with `ModifiableSolrParams` + `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/TolerantUpdateProcessorTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/TemplateUpdateProcessorTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactoryTest.java	Moves request params from `NamedList` to `ModifiableSolrParams` and uses `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java	Updates test request types/creation to `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java	Updates test request type; introduces a poorly named variable that shadows the class.
solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java	Updates commented-out legacy snippet to `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/search/SignificantTermsQParserPluginTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java	Uses `SolrQueryRequestBase` in tests; replaces `NamedList` request params.
solr/core/src/test/org/apache/solr/response/TestPushWriter.java	Uses `SolrQueryRequestBase` in writer tests.
solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/response/SmileWriterTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/request/TestSolrRequestInfo.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/admin/api/V2NodeAPIMappingTest.java	Reworks param capture to use `ModifiableSolrParams` + `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java	Updates request instantiation for mapping tests to `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java	Updates request instantiation but drops `getHttpMethod()` behavior needed by `BaseHandlerApiSupport`.
solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java	Uses `SolrQueryRequestBase` for API-framework tests.
solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/V2UpdateAPIMappingTest.java	Uses `SolrQueryRequestBase` for update API mapping tests.
solr/core/src/test/org/apache/solr/handler/V2ClusterAPIMappingTest.java	Uses `SolrQueryRequestBase` for cluster API mapping tests.
solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java	Uses `SolrQueryRequestBase` in tests; minor formatting.
solr/core/src/test/org/apache/solr/handler/RequestHandlerBaseTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java	Uses `SolrQueryRequestBase` in tests.
solr/core/src/test/org/apache/solr/core/TestLazyCores.java	Returns `SolrQueryRequestBase` from helper methods in tests.
solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java	Replaces 6-arg request ctor usage with explicit `ModifiableSolrParams` + `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java	Migrates legacy request construction to `TestHarness.makeParams(...)` + `SolrQueryRequestBase`.
solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java	Updates request creation to `SolrQueryRequestBase`; minor comment tweak.
solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java	Uses `SolrQueryRequestBase` for internal periodic work; minor comment fixes.
solr/core/src/java/org/apache/solr/update/UpdateLog.java	Uses `SolrQueryRequestBase` for internal update-log operations.
solr/core/src/java/org/apache/solr/update/PeerSync.java	Uses `SolrQueryRequestBase` for internal requests during peer sync.
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java	Uses `SolrQueryRequestBase` for internal request context.
solr/core/src/java/org/apache/solr/update/CommitTracker.java	Uses `SolrQueryRequestBase` for internal commit execution.
solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java	Uses `SolrQueryRequestBase` for cross-core parsing request.
solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java	Uses `SolrQueryRequestBase` for cross-core parsing request.
solr/core/src/java/org/apache/solr/schema/IndexSchema.java	Uses `SolrQueryRequestBase` for schema XML writing request context.
solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java	Made concrete; adds principal-name plumbing; removes deprecated `LocalSolrQueryRequest` dependency.
solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java	Small signature/style cleanup in interface (remove redundant `public`).
solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java	Deleted (deprecated class removal).
solr/core/src/java/org/apache/solr/handler/designer/DefaultSampleDocumentsLoader.java	Removes trivial `CSVRequest` subclass; uses `SolrQueryRequestBase` directly.
solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java	Uses `SolrQueryRequestBase` for transformer factory request.
solr/core/src/java/org/apache/solr/handler/admin/api/UpgradeCoreIndex.java	Uses `SolrQueryRequestBase` for internal commit/reindex operations.
solr/core/src/java/org/apache/solr/handler/admin/api/MergeIndexes.java	Wraps request with `SolrQueryRequestBase` when invoking update chain.
solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java	Uses `SolrQueryRequestBase` for split requests.
solr/core/src/java/org/apache/solr/handler/IndexFetcher.java	Uses `SolrQueryRequestBase` for internal commit requests.
solr/core/src/java/org/apache/solr/core/CoreContainer.java	Uses `SolrQueryRequestBase` for internal commit during reload/read-only transitions.
solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java	Uses `SolrQueryRequestBase` for internal commit-and-switch operations.
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java	Uses `SolrQueryRequestBase` for internal commits during recovery.
solr/core/src/java/org/apache/solr/api/Api.java	Minor doc grammar cleanup.

Comments suppressed due to low confidence (1)

solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java:97

The variable name SolrQueryRequestBase shadows the SolrQueryRequestBase type and violates usual lowerCamelCase conventions. This is easy to misread and can confuse IDE navigation; rename it to something like localReq / testReq / solrRequest.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

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

Copilot · 2026-02-04T15:15:08Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.search.SolrIndexSearcher;
+import org.apache.solr.security.PKIAuthenticationPlugin;
 import org.apache.solr.util.RTimerTree;


PKIAuthenticationPlugin is imported but only referenced in Javadoc. If the build enforces no-unused-imports (common with Checkstyle/Spotless), this will fail. Either remove the import and fully-qualify it in the @see, or reference the class in code.

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

Copilot · 2026-02-04T15:15:09Z

solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java

@@ -163,16 +163,32 @@ public List<CommandOperation> getCommands(boolean validateInput) {
          public Map<String, String> getPathTemplateValues() {
            return parts;
          }
-
-          @Override
-          public String getHttpMethod() {
-            return method.toString();
-          }
        };
    api.call(req, rsp);


This test request no longer overrides getHttpMethod() and also doesn't populate req.getContext().put("httpMethod", ...). Since SolrQueryRequest#getHttpMethod()'s default implementation reads and casts the httpMethod context entry, BaseHandlerApiSupport will hit an NPE when it calls req.getHttpMethod(). Set req.getContext().put("httpMethod", method) (where method is the SolrRequest.METHOD enum) or add back a getHttpMethod() override.

Copilot · 2026-02-04T15:15:09Z

solr/core/src/test/org/apache/solr/handler/admin/TestCollectionAPIs.java

+  private SolrQueryRequestBase createTestRequest(
+      SolrParams params,
+      Map<String, String> pathTemplateValues,
+      String httpMethod,
+      String requestBody,
+      Api api) {
+    return new SolrQueryRequestBase(null, params) {
+      @Override
+      public List<CommandOperation> getCommands(boolean validateInput) {
+        if (requestBody == null) return Collections.emptyList();
+        return ApiBag.getCommandOperations(
+            new ContentStreamBase.StringStream(requestBody), api.getCommandSchema(), true);
+      }
+
+      @Override
+      public Map<String, String> getPathTemplateValues() {
+        return pathTemplateValues;
+      }
+    };
+  }


createTestRequest(...) is unused, and it has an unused parameter (httpMethod). Either remove this helper entirely or refactor makeCall(...) to use it (and ensure it sets the request context/overrides needed for getHttpMethod() as well).

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

epugh · 2026-02-07T18:22:04Z

Okay, I think this is ready for review and hopefully merging. The one big thing is do we continue to call this SolrQueryRequestBase that implements SolrQueryRequest? We could always rename in another method too. I think this is a candidate to go to main and branch_10x.

dsmiley

Thanks...
just some small feedback

dsmiley · 2026-02-07T22:42:19Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

  @Override
  public IndexSchema getSchema() {
-    // a request for a core admin will no have a core
+    // a request for a core admin will not have a core


getCore() and getSchema() here (maybe more) are only applicable to requests to a core. Node requests will return null.

dsmiley · 2026-02-07T22:43:23Z

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

  @Override
  public IndexSchema getSchema() {
-    // a request for a core admin will no have a core
+    // a request for a core admin will not have a core


I don't think this spot here is the right spot for such a comment. For one thing; this "Base" class implements an interface, so if something about this is to be said, it should be there.

solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java

dsmiley · 2026-02-07T23:07:07Z

solr/core/src/test/org/apache/solr/handler/admin/V2ApiMappingTest.java

    return captureConvertedV1Request(path, method, v2RequestBody).getParams();
  }

-  protected SolrParams captureConvertedV1Params(


what happened here?

solr/test-framework/src/java/org/apache/solr/util/TestHarness.java

dsmiley · 2026-02-07T23:24:03Z

solr/test-framework/src/java/org/apache/solr/util/TestHarness.java

@@ -434,7 +463,7 @@ public LocalSolrQueryRequest makeRequest(String... q) {
      @SuppressWarnings({"rawtypes"})
      NamedList nl = new NamedList(entries);
      if (nl.get("wt") == null) nl.add("wt", "xml");
-      return new LocalSolrQueryRequest(TestHarness.this.getCore(), nl);
+      return new SolrQueryRequestBase(TestHarness.this.getCore(), nl.toSolrParams());


tiny scope creep request: remove most of these lines with a simple call to SolrTestCaseJ4.params(q). No need for the NamedList

Good eye! I didn't know about that.

dsmiley · 2026-02-07T23:27:58Z

do we continue to call this SolrQueryRequestBase that implements SolrQueryRequest

Versus what? Maybe you mean, do we need the interface vs pervasive class that's used basically everywhere? Yeah. That'd be a major version change though.

epugh · 2026-02-12T11:33:07Z

I am going to update this branch to the latest from main, and look to commit it later today. Please speak up if we need to do other changes.

dsmiley · 2026-02-12T22:27:51Z

solr/test-framework/src/java/org/apache/solr/util/TestHarness.java

+        Map<String, String[]> map = new HashMap<>();
+        for (Map.Entry<String, String> e : args.entrySet()) {
+          map.put(e.getKey(), new String[] {e.getValue()});
+        }
+        if (q[0] != null) map.put(CommonParams.Q, new String[] {q[0]});
+        if (qtype != null) map.put(CommonParams.QT, new String[] {qtype});
+        map.put(CommonParams.START, new String[] {Integer.toString(start)});
+        map.put(CommonParams.ROWS, new String[] {Integer.toString(limit)});
+        return new SolrQueryRequestBase(TestHarness.this.getCore(), new MultiMapSolrParams(map));


ugh; no. You can probably simply tell Claude to use ModifiableSolrParams without creating a new HashMap, and it can probably simplify it a lot.

dsmiley · 2026-02-12T22:39:33Z

solr/test-framework/src/java/org/apache/solr/util/TestHarness.java

-      NamedList nl = new NamedList(entries);
-      if (nl.get("wt") == null) nl.add("wt", "xml");
-      return new LocalSolrQueryRequest(TestHarness.this.getCore(), nl);
+      return new SolrQueryRequestBase(TestHarness.this.getCore(), SolrTestCaseJ4.params(q));


This change appears to ignore args. Don't we have to combine them? Like to consider wt, for example.

See org.apache.solr.common.params.SolrParams#wrapDefaults to combine 2.

Consider taking this feedback holistically with my other comment in this method -- produce a SolrParams of args. And then produce another SolrParams of q. And combine with wrapDefaults, returning from this method in exactly one spot.

I dug a bit, and actually we deal with the args a bit furthur up on line 425 where we iterate over the args populating the map.

ended up refactoring the method to clean it up and make it easier to reason about.

dsmiley · 2026-02-12T22:40:12Z

solr/test-framework/src/java/org/apache/solr/util/TestHarness.java

    @SuppressWarnings({"unchecked"})
-    public LocalSolrQueryRequest makeRequest(String... q) {
+    public SolrQueryRequestBase makeRequest(String... q) {
+      args.computeIfAbsent("wt", k -> "xml");


This is a side-effect, which is unfortunate (it pre-existed, I know). I wonder if we could simply initialize args with it so we don't manipulate args here.

Yeah, I also started looking at if we could just eliminate args in favour of just passing in all the params here...

…olrQueryRequestBase (#4101)" This reverts commit f93ff95.

epugh · 2026-02-13T02:21:47Z

The work in this PR is continued in #4131.

…RequestBase (#4101) Migrate from LocalSolrQueryRequest to SolrQueryRequestBase by making SolrQueryRequestBase no longer abstract and including all functionality previously unique to LocalSolrQueryRequest (cherry picked from commit f93ff95)

epugh added 4 commits February 4, 2026 05:21

Convert abstract SolrQueryResposneBase into regular class that can be…

dcd5737

… used This lets us replace LocalSolrQueryRequest

Mass conversion of LSQR to SQRB

87246ba

Remove LocalSolrQueryRequest

41c25c6

Trival class can be removed now that SolrQueryRequestBase isn't abstract

f638d50

github-actions bot added test-framework client:solrj module:extraction module:ltr tests cat:search cat:cloud cat:index cat:schema module:clustering cat:security module:scripting labels Feb 4, 2026

epugh requested a review from dsmiley February 4, 2026 10:40

epugh added 2 commits February 4, 2026 06:03

Need fewer anonymous inner classes than we thought!

9010feb

lint

7ffe95f

epugh commented Feb 4, 2026

View reviewed changes

epugh added 3 commits February 4, 2026 06:40

typos

a924781

Small code style fixes.

a39810e

Reviewing code again, make LocalPrincipal a record.

7060092

epugh changed the title ~~SOLR-18038: Remove deprecated LocalSolrQueryRequest and just us SolrQueryRequestBase~~ SOLR-18038: Remove deprecated LocalSolrQueryRequest and use SolrQueryRequestBase Feb 4, 2026

epugh added 2 commits February 4, 2026 07:16

Eliminate makeParams where possible, and relocate method to TestHarness

55ca435

lint

4e63c05

github-actions bot added the cat:api label Feb 4, 2026

epugh added 2 commits February 4, 2026 09:27

Merge remote-tracking branch 'upstream/main' into SOLR-18038-v2

df7c02d

sync with latest code

05b3448

epugh requested review from Copilot and risdenk February 4, 2026 15:04

Copilot started reviewing on behalf of epugh February 4, 2026 15:04 View session

add changelog

969501f

Copilot AI reviewed Feb 4, 2026

View reviewed changes

epugh and others added 5 commits February 4, 2026 10:23

More updates needed

b79135f

Update solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java

7c68219

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

remove unused code

89260a5

Merge branch 'SOLR-18038-v2' of github.com:epugh/solr into SOLR-18038-v2

a521afd

precommit issues that need fixing

55541d6

dsmiley reviewed Feb 7, 2026

View reviewed changes

epugh added 4 commits February 7, 2026 21:21

Copy makeParams to the only real test using it..

22a5718

remove extra method that is only used in one place

84086c3

Suggestions based on feedback.

1546d46

json is coming back pretty printed, so skip the }

491ac83

epugh added 2 commits February 12, 2026 06:35

Merge remote-tracking branch 'upstream/main' into SOLR-18038-v2

9c405d9

lint!

1b1dae7

epugh merged commit f93ff95 into apache:main Feb 12, 2026
6 of 7 checks passed

dsmiley reviewed Feb 12, 2026

View reviewed changes

epugh added a commit that referenced this pull request Feb 12, 2026

Revert "SOLR-18038: Remove deprecated LocalSolrQueryRequest and use S…

aae5b3a

…olrQueryRequestBase (#4101)" This reverts commit f93ff95.

Comments

Conversation

epugh commented Feb 4, 2026

Description

Solution

Tests

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!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

epugh commented Feb 7, 2026

Uh oh!

dsmiley left a comment

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!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dsmiley commented Feb 7, 2026

Uh oh!

epugh commented Feb 12, 2026

Uh oh!

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!