SOLR-17541: LBSolrClient implementations should agree on 'getClient()' semantics

solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java

@@ -374,17 +374,13 @@ PublicKey fetchPublicKeyFromRemote(String nodename) {
     }
   }
 
-  @Override
-  public void setup(Http2SolrClient.Builder httpClientBuilder, Http2SolrClient client) {
-    setup(client, httpClientBuilder);
-  }
-
   @Override
   public void setup(Http2SolrClient client) {
-    setup(client, null);
+    setup(null, client);
   }
 
-  private void setup(Http2SolrClient client, Http2SolrClient.Builder builder) {
+  @Override
+  public void setup(Http2SolrClient.Builder httpClientBuilder, Http2SolrClient client) {
     final HttpListenerFactory.RequestResponseListener listener =
         new HttpListenerFactory.RequestResponseListener() {
           private static final String CACHED_REQUEST_USER_KEY = "cachedRequestUser";
@@ -443,8 +439,8 @@ private Optional<String> getUserFromJettyRequest(Request request) {
     if (client != null) {
       client.addListenerFactory(() -> listener);
     }
-    if (builder != null) {
-      builder.addListenerFactory(() -> listener);
+    if (httpClientBuilder != null) {
+      httpClientBuilder.addListenerFactory(() -> listener);
     }
   }