THausherr commented on code in PR #2894:
URL: https://github.com/apache/tika/pull/2894#discussion_r3430660070
##########
tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIterator.java:
##########
@@ -180,27 +181,40 @@ private SolrClient createSolrClient() throws
TikaConfigException {
List<String> solrZkHosts = config.getSolrZkHosts() != null ?
config.getSolrZkHosts() : Collections.emptyList();
if (solrUrls.isEmpty()) {
- //TODO -- there's more that we need to pass through, including ssl
etc.
- Http2SolrClient.Builder http2SolrClientBuilder = new
Http2SolrClient.Builder();
- if (!StringUtils.isBlank(httpClientFactory.getUserName())) {
-
http2SolrClientBuilder.withBasicAuthCredentials(httpClientFactory.getUserName(),
httpClientFactory.getPassword());
- }
- http2SolrClientBuilder
+ HttpJettySolrClient.Builder jettyClientBuilder = new
HttpJettySolrClient.Builder();
+ applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
+ jettyClientBuilder
.withRequestTimeout(httpClientFactory.getRequestTimeoutMillis(),
TimeUnit.MILLISECONDS)
.withConnectionTimeout(config.getConnectionTimeoutMillis(),
TimeUnit.MILLISECONDS);
-
- Http2SolrClient http2SolrClient = http2SolrClientBuilder.build();
return new CloudSolrClient.Builder(solrZkHosts,
Optional.ofNullable(config.getSolrZkChroot()))
- .withHttpClient(http2SolrClient)
+ .withInternalClientBuilder(jettyClientBuilder)
.build();
+ }
+ HttpJettySolrClient.Builder jettyClientBuilder = new
HttpJettySolrClient.Builder();
+ applyAuthAndProxy(jettyClientBuilder, httpClientFactory);
+ jettyClientBuilder
+
.withRequestTimeout(httpClientFactory.getRequestTimeoutMillis(),
TimeUnit.MILLISECONDS)
+ .withConnectionTimeout(config.getConnectionTimeoutMillis(),
TimeUnit.MILLISECONDS)
+ .withIdleTimeout(config.getSocketTimeoutMillis(),
TimeUnit.MILLISECONDS);
+ HttpJettySolrClient jettyClient = jettyClientBuilder.build();
+ LBSolrClient.Endpoint[] endpoints = solrUrls.stream()
+ .map(LBSolrClient.Endpoint::new)
+ .toArray(LBSolrClient.Endpoint[]::new);
+ 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);
}
Review Comment:
ignore
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
