First patch. Still working on some cleanup and fix the failing TestCryptoKeys test.

I have moved the entire functionality into a class called SolrCall which represents a call to Solr. SolrDispatchFilter is now just reduced to a proxy which just creates a SolrCall and passes the control over there

more cleanup

Updated patch with a few changes.

I'm trying to see if there's a way to avoid re-processing during a RETRY but I think that can also come in later.

Changed the access of most variables in SolrCall to be private and added a getter for path as it's accessed from the SDF.

Some more refactoring, it's still WIP but I'll continue to build on this tomorrow morning. Still need to move stuff into smaller methods and document.

This moves things into a 3 stage process for HttpSolrCall (renamed SolrCall).

• Construct - Initialize variables
• Set context - Sets the path, handler, etc. still working on populating it with processed information e.g. collection name etc.
• {.call()}} - This also calls setContext and then processes the request or returns RETRY/FORWARD/etc. action. to the filter.

Please separate out the SOLR-7275 changes and let's stay true to the description of the ticket

Updated patch, without the SolrRequestContext and a few more methods extracted out. I've just moved the methods out with some comments around the call and haven't really changed much as I wouldn't want to make this an invasive change.
We can revisit this once after the first commit I think.

Fixes an NPE.

Commit 1677644 from Anshum Gupta in branch 'dev/trunk'
[ https://svn.apache.org/r1677644 ]

SOLR-7484: Refactor SolrDispatchFilter to extract all Solr specific implementation detail to HttpSolrCall and also extract methods from within the current SDF.doFilter(..) logic making things easier to manage. HttpSolrCall converts the processing to a 3-step process i.e. Construct, Init, and Call so the context of the request would be available after Init and before the actual call operation.

Commit 1677660 from Anshum Gupta in branch 'dev/branches/branch_5x'
[ https://svn.apache.org/r1677660 ]

SOLR-7484: Refactor SolrDispatchFilter to extract all Solr specific implementation detail to HttpSolrCall and also extract methods from within the current SDF.doFilter(..) logic making things easier to manage. HttpSolrCall converts the processing to a 3-step process i.e. Construct, Init, and Call so the context of the request would be available after Init and before the actual call operation.(merge from trunk)

should you not remove those redundant cases in switch ?

Sure, I'll commit that patch. Thanks.

Commit 1678071 from Anshum Gupta in branch 'dev/trunk'
[ https://svn.apache.org/r1678071 ]

SOLR-7484: Cleaning up redundant switch cases from the code

Commit 1678073 from Anshum Gupta in branch 'dev/branches/branch_5x'
[ https://svn.apache.org/r1678073 ]

SOLR-7484: Cleaning up redundant switch cases from the code (merge from trunk)

Here is a simple patch that puts back the ability to override sendError() and execute()

Previously this was exposed on SolrDispatchFilter, but now we need to make it possible to send a custom HttpSolrCall

Commit 1683024 from Ryan McKinley in branch 'dev/branches/branch_5x'
[ https://svn.apache.org/r1683024 ]

SOLR-7484: make it possible to override sendError and execute

Commit 1683025 from Ryan McKinley in branch 'dev/trunk'
[ https://svn.apache.org/r1683025 ]

Merged revision(s) 1683024 from lucene/dev/branches/branch_5x:
SOLR-7484: make it possible to override sendError and execute
........

ryan: these changes should be tracked in a distinct jira with it's own entry in CHANGES.txt to keep clear what functionality was included in 5.2 and what came later.

See SOLR-7623 for an issue to track the functional regression

(thanks Chris Hostetter (Unused))

Closing it as it's already released.