Added change entry and tidy code

apache · May 20, 2024 · 9777aad · 9777aad
1 parent 7d2e878
commit 9777aad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -116,6 +116,9 @@ Improvements
 * SOLR-17274: Allow JSON atomic updates to use multiple modifiers or a modifier like 'set' as a field name
   if child docs are not enabled. (Calvin Smith, David Smiley)
 
+* SOLR-17300: Http2SolrClient.Builder.withHttpClient now copies HttpListenerFactory (e.g. for auth, metrics, traces, etc.)
+  (Sanjay Dutt, David Smiley)
+
 Optimizations
 ---------------------
 * SOLR-17257: Both Minimize Cores and the Affinity replica placement strategies would over-gather

diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTestWithAuth.java
@@ -33,7 +33,6 @@
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.RequestStatusState;
-import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.Slice;
@@ -73,13 +72,8 @@ public void testRecoveryWithAuthEnabled() throws Exception {
       UpdateRequest commitReq = new UpdateRequest();
       withBasicAuth(commitReq);
       for (int i = 0; i < 500; i++) {
-        SolrInputDocument doc = new SolrInputDocument();
-        String[] fields = {"id", i + "", "name", "name = " + i};
-        for (int j = 0; j < fields.length; j += 2) {
-          doc.addField(fields[j], fields[j + 1]);
-        }
         UpdateRequest req = new UpdateRequest();
-        withBasicAuth(req).add(doc);
+        withBasicAuth(req).add(sdoc("id", i, "name", "name = " + i));
         req.process(solrClient, collection);
         if (i % 10 == 0) {
           commitReq.commit(solrClient, collection);