refactor: extract shared SolrClientHelper and fix idle-timeout gap in ZK path

- Extract applyAuthAndProxy into SolrClientHelper to eliminate identical
  auth/proxy logic duplicated between SolrEmitter and SolrPipesIterator;
  helper reads proxy from HttpClientFactory directly (both callers already
  copy proxy config into the factory before building the Jetty client)
- Add missing withIdleTimeout to the ZK (CloudSolrClient) path in both
  classes so all three timeouts (request, connection, idle) are applied
  consistently across both ZK and LB paths

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: srujana-kuntumalla

tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java

@@ -40,6 +40,7 @@
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.pipes.api.emitter.AbstractEmitter;
 import org.apache.tika.pipes.api.emitter.EmitData;
+import org.apache.tika.pipes.plugin.solr.SolrClientHelper;
 import org.apache.tika.plugins.ExtensionConfig;
 import org.apache.tika.utils.StringUtils;
 
@@ -110,18 +111,19 @@ private static SolrClient buildSolrClient(SolrEmitterConfig config) throws TikaC
         if (config.solrUrls() == null || config.solrUrls().isEmpty()) {
             // Use ZooKeeper-based CloudSolrClient
             HttpJettySolrClient.Builder jettyClientBuilder = new HttpJettySolrClient.Builder();
-            applyAuthAndProxy(jettyClientBuilder, httpClientFactory, config.proxyHost(), config.proxyPort());
+            SolrClientHelper.applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
             jettyClientBuilder
                     .withRequestTimeout(httpClientFactory.getRequestTimeoutMillis(), TimeUnit.MILLISECONDS)
-                    .withConnectionTimeout(config.getConnectionTimeoutMillisOrDefault(), TimeUnit.MILLISECONDS);
+                    .withConnectionTimeout(config.getConnectionTimeoutMillisOrDefault(), TimeUnit.MILLISECONDS)
+                    .withIdleTimeout(config.getSocketTimeoutMillisOrDefault(), TimeUnit.MILLISECONDS);
 
             return new CloudSolrClient.Builder(config.solrZkHosts(), Optional.ofNullable(config.solrZkChroot()))
                     .withInternalClientBuilder(jettyClientBuilder)
                     .build();
         } else {
             // Use direct URL-based LBJettySolrClient
             HttpJettySolrClient.Builder jettyClientBuilder = new HttpJettySolrClient.Builder();
-            applyAuthAndProxy(jettyClientBuilder, httpClientFactory, config.proxyHost(), config.proxyPort());
+            SolrClientHelper.applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
             jettyClientBuilder
                     .withRequestTimeout(httpClientFactory.getRequestTimeoutMillis(), TimeUnit.MILLISECONDS)
                     .withConnectionTimeout(config.getConnectionTimeoutMillisOrDefault(), TimeUnit.MILLISECONDS)
@@ -134,20 +136,6 @@ private static SolrClient buildSolrClient(SolrEmitterConfig config) throws TikaC
         }
     }
 
-    private static void applyAuthAndProxy(HttpJettySolrClient.Builder builder, HttpClientFactory factory,
-                                          String proxyHost, Integer proxyPort) throws TikaConfigException {
-        if (!StringUtils.isBlank(factory.getUserName())) {
-            if (!"basic".equalsIgnoreCase(factory.getAuthScheme())) {
-                throw new TikaConfigException("Only 'basic' auth scheme is supported by HttpJettySolrClient; got: '"
-                        + factory.getAuthScheme() + "'");
-            }
-            builder.withBasicAuthCredentials(factory.getUserName(), factory.getPassword());
-        }
-        if (!StringUtils.isBlank(proxyHost) && proxyPort != null && proxyPort > 0) {
-            builder.withProxyConfiguration(proxyHost, proxyPort, false, false);
-        }
-    }
-
     @Override
     public void emit(String emitKey, List<Metadata> metadataList, ParseContext parseContext) throws IOException {
         if (metadataList == null || metadataList.isEmpty()) {

tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIterator.java

@@ -46,6 +46,7 @@
 import org.apache.tika.pipes.api.emitter.EmitKey;
 import org.apache.tika.pipes.api.fetcher.FetchKey;
 import org.apache.tika.pipes.pipesiterator.PipesIteratorBase;
+import org.apache.tika.pipes.plugin.solr.SolrClientHelper;
 import org.apache.tika.plugins.ExtensionConfig;
 import org.apache.tika.utils.StringUtils;
 
@@ -182,17 +183,18 @@ private SolrClient createSolrClient() throws TikaConfigException {
 
         if (solrUrls.isEmpty()) {
             HttpJettySolrClient.Builder jettyClientBuilder = new HttpJettySolrClient.Builder();
-            applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
+            SolrClientHelper.applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
             jettyClientBuilder
                     .withRequestTimeout(httpClientFactory.getRequestTimeoutMillis(), TimeUnit.MILLISECONDS)
-                    .withConnectionTimeout(config.getConnectionTimeoutMillis(), TimeUnit.MILLISECONDS);
+                    .withConnectionTimeout(config.getConnectionTimeoutMillis(), TimeUnit.MILLISECONDS)
+                    .withIdleTimeout(config.getSocketTimeoutMillis(), TimeUnit.MILLISECONDS);
 
             return new CloudSolrClient.Builder(solrZkHosts, Optional.ofNullable(config.getSolrZkChroot()))
                     .withInternalClientBuilder(jettyClientBuilder)
                     .build();
         }
         HttpJettySolrClient.Builder jettyClientBuilder = new HttpJettySolrClient.Builder();
-        applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
+        SolrClientHelper.applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
         jettyClientBuilder
                 .withRequestTimeout(httpClientFactory.getRequestTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .withConnectionTimeout(config.getConnectionTimeoutMillis(), TimeUnit.MILLISECONDS)
@@ -204,17 +206,4 @@ private SolrClient createSolrClient() throws TikaConfigException {
         return new LBJettySolrClient.Builder(jettyClient, endpoints).build();
     }
 
-    private static void applyAuthAndProxy(HttpJettySolrClient.Builder builder,
-                                          HttpClientFactory factory) throws TikaConfigException {
-        if (!StringUtils.isBlank(factory.getUserName())) {
-            if (!"basic".equalsIgnoreCase(factory.getAuthScheme())) {
-                throw new TikaConfigException("Only 'basic' auth scheme is supported by HttpJettySolrClient; got: '"
-                        + factory.getAuthScheme() + "'");
-            }
-            builder.withBasicAuthCredentials(factory.getUserName(), factory.getPassword());
-        }
-        if (!StringUtils.isBlank(factory.getProxyHost()) && factory.getProxyPort() > 0) {
-            builder.withProxyConfiguration(factory.getProxyHost(), factory.getProxyPort(), false, false);
-        }
-    }
 }

tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/plugin/solr/SolrClientHelper.java

@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.pipes.plugin.solr;
+
+import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
+
+import org.apache.tika.client.HttpClientFactory;
+import org.apache.tika.exception.TikaConfigException;
+import org.apache.tika.utils.StringUtils;
+
+public final class SolrClientHelper {
+
+    private SolrClientHelper() {}
+
+    /**
+     * Applies authentication and proxy settings to a {@link HttpJettySolrClient.Builder}.
+     * Only basic auth is supported; a non-basic auth scheme will throw {@link TikaConfigException}.
+     * Proxy is only configured when both host and a positive port are present on the factory.
+     */
+    public static void applyAuthAndProxy(HttpJettySolrClient.Builder builder,
+                                         HttpClientFactory factory) throws TikaConfigException {
+        if (!StringUtils.isBlank(factory.getUserName())) {
+            if (!"basic".equalsIgnoreCase(factory.getAuthScheme())) {
+                throw new TikaConfigException(
+                        "Only 'basic' auth scheme is supported by HttpJettySolrClient; got: '"
+                                + factory.getAuthScheme() + "'");
+            }
+            builder.withBasicAuthCredentials(factory.getUserName(), factory.getPassword());
+        }
+        if (!StringUtils.isBlank(factory.getProxyHost()) && factory.getProxyPort() > 0) {
+            builder.withProxyConfiguration(factory.getProxyHost(), factory.getProxyPort(), false, false);
+        }
+    }
+}