This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new bad307e5a3e Rename CloudHttp2SolrClient.withInternalClientBuilder
(#3632)
bad307e5a3e is described below
commit bad307e5a3ed5ba5168d1cfb17b94d9393942058
Author: David Smiley <[email protected]>
AuthorDate: Fri Oct 10 20:52:43 2025 -0400
Rename CloudHttp2SolrClient.withInternalClientBuilder (#3632)
to withHttpClientBuilder
(kept with deprecations)
---
solr/core/src/java/org/apache/solr/cli/CLIUtils.java | 2 +-
solr/core/src/java/org/apache/solr/cli/ExportTool.java | 2 +-
.../solr/prometheus/exporter/SolrClientFactory.java | 2 +-
.../org/apache/solr/client/solrj/io/SolrClientCache.java | 2 +-
.../solr/client/solrj/impl/CloudHttp2SolrClient.java | 16 ++++++++++------
.../solrj/impl/CloudHttp2SolrClientBuilderTest.java | 8 ++++----
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
b/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
index 7bde598f1d2..c04e02fc160 100644
--- a/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
+++ b/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
@@ -268,7 +268,7 @@ public final class CLIUtils {
public static CloudHttp2SolrClient getCloudHttp2SolrClient(
String zkHost, Http2SolrClient.Builder builder) {
return new CloudHttp2SolrClient.Builder(Collections.singletonList(zkHost),
Optional.empty())
- .withInternalClientBuilder(builder)
+ .withHttpClientBuilder(builder)
.build();
}
diff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java
b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
index 0120cba94b6..af2cf6ba590 100644
--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
@@ -257,7 +257,7 @@ public class ExportTool extends ToolBase {
solrClient =
new CloudHttp2SolrClient.Builder(Collections.singletonList(baseurl))
- .withInternalClientBuilder(builder)
+ .withHttpClientBuilder(builder)
.build();
NamedList<Object> response =
solrClient.request(
diff --git
a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
index 76e722b6d9a..adb308ea2ee 100644
---
a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
+++
b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
@@ -76,7 +76,7 @@ public class SolrClientFactory {
.collect(Collectors.toList());
CloudSolrClient client =
new CloudHttp2SolrClient.Builder(zkHosts,
Optional.ofNullable(parser.getChrootPath()))
- .withInternalClientBuilder(newHttp2SolrClientBuilder(null,
settings, configuration))
+ .withHttpClientBuilder(newHttp2SolrClientBuilder(null, settings,
configuration))
.withResponseParser(new InputStreamResponseParser("json"))
.build();
diff --git
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
index 6b0bf7f77f2..ec94c7d5aa9 100644
---
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
+++
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
@@ -106,7 +106,7 @@ public class SolrClientCache implements Closeable {
builder.canUseZkACLs(canUseACLs);
// using internal builder to ensure the internal client gets closed
builder =
- builder.withInternalClientBuilder(
+ builder.withHttpClientBuilder(
newHttp2SolrClientBuilder(null, http2SolrClient,
basicAuthCredentials));
var client = builder.build();
try {
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
index bf88ca3541f..028d8b675c5 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
@@ -368,19 +368,18 @@ public class CloudHttp2SolrClient extends CloudSolrClient
{
}
/**
- * Set the internal http client.
+ * Set the internal {@link Http2SolrClient}.
*
- * <p>Note: closing the httpClient instance is at the responsibility of
the caller.
+ * <p>Note: closing the client instance is the responsibility of the
caller.
*
- * @param httpClient http client
* @return this
*/
- public Builder withHttpClient(Http2SolrClient httpClient) {
+ public Builder withHttpClient(Http2SolrClient httpSolrClient) {
if (this.internalClientBuilder != null) {
throw new IllegalStateException(
"The builder can't accept an httpClient AND an
internalClientBuilder, only one of those can be provided");
}
- this.httpClient = httpClient;
+ this.httpClient = httpSolrClient;
return this;
}
@@ -392,7 +391,7 @@ public class CloudHttp2SolrClient extends CloudSolrClient {
* @param internalClientBuilder the builder to use for creating the
internal http client.
* @return this
*/
- public Builder withInternalClientBuilder(Http2SolrClient.Builder
internalClientBuilder) {
+ public Builder withHttpClientBuilder(Http2SolrClient.Builder
internalClientBuilder) {
if (this.httpClient != null) {
throw new IllegalStateException(
"The builder can't accept an httpClient AND an
internalClientBuilder, only one of those can be provided");
@@ -401,6 +400,11 @@ public class CloudHttp2SolrClient extends CloudSolrClient {
return this;
}
+ @Deprecated(since = "9.10")
+ public Builder withInternalClientBuilder(Http2SolrClient.Builder
internalClientBuilder) {
+ return withHttpClientBuilder(internalClientBuilder);
+ }
+
/**
* Sets the Zk connection timeout
*
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java
index 0846dfefc6c..2530beb34a0 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java
@@ -128,14 +128,14 @@ public class CloudHttp2SolrClientBuilderTest extends
SolrCloudTestCase {
new CloudHttp2SolrClient.Builder(
Collections.singletonList(ANY_ZK_HOST),
Optional.of(ANY_CHROOT))
.withHttpClient(mock(Http2SolrClient.class))
- .withInternalClientBuilder(mock(Http2SolrClient.Builder.class))
+ .withHttpClientBuilder(mock(Http2SolrClient.Builder.class))
.build());
expectThrows(
IllegalStateException.class,
() ->
new CloudHttp2SolrClient.Builder(
Collections.singletonList(ANY_ZK_HOST),
Optional.of(ANY_CHROOT))
- .withInternalClientBuilder(mock(Http2SolrClient.Builder.class))
+ .withHttpClientBuilder(mock(Http2SolrClient.Builder.class))
.withHttpClient(mock(Http2SolrClient.class))
.build());
}
@@ -148,7 +148,7 @@ public class CloudHttp2SolrClientBuilderTest extends
SolrCloudTestCase {
CloudHttp2SolrClient.Builder clientBuilder =
new CloudHttp2SolrClient.Builder(
Collections.singletonList(ANY_ZK_HOST),
Optional.of(ANY_CHROOT))
- .withInternalClientBuilder(http2ClientBuilder);
+ .withHttpClientBuilder(http2ClientBuilder);
verify(http2ClientBuilder, never()).build();
try (CloudHttp2SolrClient client = clientBuilder.build()) {
assertEquals(http2Client, client.getHttpClient());
@@ -218,7 +218,7 @@ public class CloudHttp2SolrClientBuilderTest extends
SolrCloudTestCase {
if (httpClient != null) {
clientBuilder.withHttpClient(httpClient);
} else if (internalClientBuilder != null) {
- clientBuilder.withInternalClientBuilder(internalClientBuilder);
+ clientBuilder.withHttpClientBuilder(internalClientBuilder);
}
try (CloudHttp2SolrClient client = clientBuilder.build()) {
