This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from a3b5af4e55f SOLR-18005: ConcurrentUpdateJettySolrClient (#3885)
add 2c55000296b SOLR-18005 SolrJ: consolidate Jetty-using classes to a
jetty package (#3901)
No new revisions were added by this update.
Summary of changes:
...dhttp2solrclient-builder- now also can work.yml | 2 +-
... => SOLR-18005-MoveToJettyPackageAndRename.yml} | 2 +-
.../org/apache/solr/bench/MiniClusterState.java | 6 +-
.../apache/solr/bench/search/StreamingSearch.java | 10 +-
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 4 +-
solr/bin/solr.in.cmd | 4 +-
solr/bin/solr.in.sh | 4 +-
.../src/java/org/apache/solr/cli/CLIUtils.java | 19 +-
.../src/java/org/apache/solr/cli/CreateTool.java | 8 +-
.../src/java/org/apache/solr/cli/DeleteTool.java | 8 +-
.../src/java/org/apache/solr/cli/ExportTool.java | 8 +-
.../java/org/apache/solr/cli/HealthcheckTool.java | 3 +-
.../src/java/org/apache/solr/cli/PostLogsTool.java | 6 +-
.../java/org/apache/solr/cli/RunExampleTool.java | 4 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 7 +-
.../java/org/apache/solr/cloud/SyncStrategy.java | 6 +-
.../java/org/apache/solr/cloud/ZkController.java | 10 +-
.../api/collections/CollectionHandlingUtils.java | 6 +-
.../java/org/apache/solr/core/CoreContainer.java | 6 +-
.../apache/solr/core/HttpSolrClientProvider.java | 10 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 8 +-
.../org/apache/solr/handler/SolrConfigHandler.java | 10 +-
.../org/apache/solr/handler/admin/ColStatus.java | 6 +-
.../apache/solr/handler/admin/api/SyncShard.java | 4 +-
.../handler/component/HttpShardHandlerFactory.java | 6 +-
.../handler/component/IterativeMergeStrategy.java | 4 +-
.../org/apache/solr/security/BasicAuthPlugin.java | 4 +-
.../solr/security/HttpClientBuilderPlugin.java | 4 +-
.../solr/security/PKIAuthenticationPlugin.java | 6 +-
.../org/apache/solr/update/PeerSyncWithLeader.java | 4 +-
.../apache/solr/update/StreamingSolrClients.java | 10 +-
.../org/apache/solr/update/UpdateShardHandler.java | 14 +-
.../stats/InstrumentedHttpListenerFactory.java | 2 +-
.../test/org/apache/solr/cli/TestExportTool.java | 4 +-
.../test/org/apache/solr/cloud/OverseerTest.java | 8 +-
.../apache/solr/cloud/RecoveryZkTestWithAuth.java | 3 +-
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 24 +-
.../solr/cloud/TestQueryingOnDownCollection.java | 4 +-
.../org/apache/solr/cloud/ZkControllerTest.java | 8 +-
.../solr/core/snapshots/TestSolrCoreSnapshots.java | 6 +-
.../apache/solr/handler/ReplicationTestHelper.java | 6 +-
.../org/apache/solr/handler/TestHttpRequestId.java | 10 +-
.../TestUserManagedReplicationWithAuth.java | 6 +-
.../solr/packagemanager/TestPackageManager.java | 4 +-
.../apache/solr/search/TestCoordinatorRole.java | 4 +-
.../AuthWithShardHandlerFactoryOverrideTest.java | 6 +-
.../solr/security/BasicAuthOnSingleNodeTest.java | 6 +-
.../TestSimplePropagatorDistributedTracing.java | 9 +-
.../manager/consumer/KafkaCrossDcConsumer.java | 3 +-
.../apache/solr/security/jwt/JWTAuthPlugin.java | 4 +-
.../examples/UsingSolrJRefGuideExamplesTest.java | 12 +-
.../pages/basic-authentication-plugin.adoc | 14 +-
.../deployment-guide/pages/enabling-ssl.adoc | 6 +-
.../modules/deployment-guide/pages/solrj.adoc | 8 +-
.../pages/major-changes-in-solr-10.adoc | 6 +
.../pages/major-changes-in-solr-8.adoc | 3 +-
.../solr/client/solrj/io/SolrClientCache.java | 46 ++-
.../client/solrj/io/sql/DatabaseMetaDataImpl.java | 4 +-
.../solr/client/solrj/impl/NodeValueFetcher.java | 4 +-
.../client/solrj/impl/SolrClientCloudManager.java | 8 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 19 +-
.../solr/common/cloud/NodesSysPropsCacher.java | 6 +-
.../client/solrj/impl/NodeValueFetcherTest.java | 6 +-
.../apache/solr/client/solrj/embedded/package.html | 22 --
.../client/solrj/impl/CloudHttp2SolrClient.java | 380 +--------------------
.../solr/client/solrj/impl/CloudSolrClient.java | 370 ++++++++++++++++++++
.../solrj/impl/ConcurrentUpdateBaseSolrClient.java | 8 +-
.../solrj/impl/HttpClientBuilderFactory.java | 5 +-
...Provider.java => HttpClusterStateProvider.java} | 9 +-
.../solr/client/solrj/impl/HttpJdkSolrClient.java | 15 +-
.../solr/client/solrj/impl/HttpSolrClientBase.java | 7 +-
.../solrj/impl/HttpSolrClientBuilderBase.java | 30 +-
.../solr/client/solrj/impl/LBSolrClient.java | 7 +-
.../{impl => jetty}/AuthenticationStoreHolder.java | 2 +-
.../client/solrj/jetty/CloudJettySolrClient.java | 66 ++++
.../ConcurrentUpdateJettySolrClient.java | 28 +-
.../HttpJettySolrClient.java} | 151 ++++----
.../solrj/{impl => jetty}/HttpListenerFactory.java | 6 +-
.../solr/client/solrj/jetty/LBJettySolrClient.java | 7 +-
.../PreemptiveBasicAuthClientBuilderFactory.java | 9 +-
.../solrj/{embedded => jetty}/SSLConfig.java | 2 +-
.../{util => jetty}/SolrBasicAuthentication.java | 2 +-
.../client/solrj/SolrExampleBinaryHttp2Test.java | 4 +-
.../solrj/embedded/SolrExampleJettyTest.java | 2 +-
.../SolrExampleStreamingBinaryHttp2Test.java | 6 +-
.../embedded/SolrExampleStreamingHttp2Test.java | 14 +-
.../solrj/embedded/SolrExampleXMLHttp2Test.java | 6 +-
.../impl/CloudHttp2SolrClientBuilderTest.java | 83 ++---
.../CloudHttp2SolrClientMultiConstructorTest.java | 4 +-
.../solrj/impl/CloudHttp2SolrClientRetryTest.java | 5 +-
.../solrj/impl/CloudHttp2SolrClientTest.java | 25 +-
.../solrj/impl/ClusterStateProviderTest.java | 17 +-
.../client/solrj/impl/HttpClusterStateSSLTest.java | 10 +-
.../solr/client/solrj/impl/LB2SolrClientTest.java | 3 +-
.../client/solrj/impl/LBAsyncSolrClientTest.java | 25 +-
.../impl/SendUpdatesToLeadersOverrideTest.java | 6 +-
...oncurrentUpdateJettySolrClientBadInputTest.java | 6 +-
...ntUpdateJettySolrClientMultiCollectionTest.java | 4 +-
.../ConcurrentUpdateJettySolrClientTest.java | 16 +-
.../HttpJettySolrClientCompatibilityTest.java} | 19 +-
.../HttpJettySolrClientProxyTest.java} | 10 +-
.../HttpJettySolrClientTest.java} | 203 +++++------
...reemptiveBasicAuthClientBuilderFactoryTest.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 18 +-
.../solrj/apache/HttpClusterStateProvider.java | 3 +-
.../solr/client/solrj/apache/HttpSolrClient.java | 6 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 2 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../java/org/apache/solr/embedded/JettyConfig.java | 2 +-
.../org/apache/solr/embedded/JettySolrRunner.java | 2 +-
.../java/org/apache/solr/util/SSLTestConfig.java | 2 +-
.../org/apache/solr/util/SolrJMetricTestUtils.java | 6 +-
.../solrj/apache/CloudSolrClientBuilderTest.java | 14 +-
.../CloudSolrClientMultiConstructorTest.java | 5 +-
115 files changed, 1133 insertions(+), 999 deletions(-)
copy changelog/unreleased/{SOLR-18005-LBAsyncSolrClient.yml =>
SOLR-18005-MoveToJettyPackageAndRename.yml} (67%)
delete mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/embedded/package.html
rename
solr/solrj/src/java/org/apache/solr/client/solrj/impl/{Http2ClusterStateProvider.java
=> HttpClusterStateProvider.java} (85%)
rename solr/solrj/src/java/org/apache/solr/client/solrj/{impl =>
jetty}/AuthenticationStoreHolder.java (98%)
create mode 100644
solr/solrj/src/java/org/apache/solr/client/solrj/jetty/CloudJettySolrClient.java
rename solr/solrj/src/java/org/apache/solr/client/solrj/{impl =>
jetty}/ConcurrentUpdateJettySolrClient.java (85%)
rename
solr/solrj/src/java/org/apache/solr/client/solrj/{impl/Http2SolrClient.java =>
jetty/HttpJettySolrClient.java} (87%)
rename solr/solrj/src/java/org/apache/solr/client/solrj/{impl =>
jetty}/HttpListenerFactory.java (92%)
rename solr/solrj/src/java/org/apache/solr/client/solrj/{impl =>
jetty}/PreemptiveBasicAuthClientBuilderFactory.java (94%)
rename solr/solrj/src/java/org/apache/solr/client/solrj/{embedded =>
jetty}/SSLConfig.java (99%)
rename solr/solrj/src/java/org/apache/solr/client/solrj/{util =>
jetty}/SolrBasicAuthentication.java (98%)
rename solr/solrj/src/test/org/apache/solr/client/solrj/{impl =>
jetty}/ConcurrentUpdateJettySolrClientBadInputTest.java (95%)
rename solr/solrj/src/test/org/apache/solr/client/solrj/{impl =>
jetty}/ConcurrentUpdateJettySolrClientMultiCollectionTest.java (96%)
rename solr/solrj/src/test/org/apache/solr/client/solrj/{impl =>
jetty}/ConcurrentUpdateJettySolrClientTest.java (96%)
rename
solr/solrj/src/test/org/apache/solr/client/solrj/{impl/Http2SolrClientCompatibilityTest.java
=> jetty/HttpJettySolrClientCompatibilityTest.java} (87%)
rename
solr/solrj/src/test/org/apache/solr/client/solrj/{impl/Http2SolrClientProxyTest.java
=> jetty/HttpJettySolrClientProxyTest.java} (92%)
rename
solr/solrj/src/test/org/apache/solr/client/solrj/{impl/Http2SolrClientTest.java
=> jetty/HttpJettySolrClientTest.java} (80%)
rename solr/solrj/src/test/org/apache/solr/client/solrj/{impl =>
jetty}/PreemptiveBasicAuthClientBuilderFactoryTest.java (99%)
