From 45b9e1094982d344e2d84040b61f96b01aeac544 Mon Sep 17 00:00:00 2001 From: jdyer1 Date: Wed, 18 Dec 2024 15:06:39 -0600 Subject: [PATCH] remove silly duplicate method --- .../solr/security/PKIAuthenticationPlugin.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java index 6a129a137e9..63d94349ed3 100644 --- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java +++ b/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 getUserFromJettyRequest(Request request) { if (client != null) { client.addListenerFactory(() -> listener); } - if (builder != null) { - builder.addListenerFactory(() -> listener); + if (httpClientBuilder != null) { + httpClientBuilder.addListenerFactory(() -> listener); } }