Skip to content

polishing #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2025
Merged

polishing #595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a30f2
polishing
chillaq Aug 22, 2025
91c30b1
Merge branch 'development' into polish-dev
chillaq Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions client/src/main/java/io/split/client/SplitFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ private static HttpClientBuilder setupProxy(HttpClientBuilder httpClientbuilder,

private static HttpClientBuilder useLegacyProxyConfiguration(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
HttpHost proxyHost = config.proxy();
httpClientbuilder = addProxyHost(httpClientbuilder, proxyHost);
addProxyHost(httpClientbuilder, proxyHost);
if (config.proxyUsername() != null && config.proxyPassword() != null) {
return addProxyBasicAuth(httpClientbuilder, proxyHost, config.proxyUsername(), config.proxyPassword());
}
Expand All @@ -646,7 +646,7 @@ private static HttpClientBuilder useLegacyProxyConfiguration(HttpClientBuilder h

private static HttpClientBuilder useProxyConfiguration(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
HttpHost proxyHost = config.proxyConfiguration().getHost();
httpClientbuilder = addProxyHost(httpClientbuilder, proxyHost);
addProxyHost(httpClientbuilder, proxyHost);
if (config.proxyConfiguration().getProxyCredentialsProvider() == null) {
return httpClientbuilder;
}
Expand All @@ -663,10 +663,9 @@ private static HttpClientBuilder useProxyConfiguration(HttpClientBuilder httpCli
return httpClientbuilder;
}

private static HttpClientBuilder addProxyHost(HttpClientBuilder httpClientbuilder, HttpHost proxyHost) {
private static void addProxyHost(HttpClientBuilder httpClientbuilder, HttpHost proxyHost) {
DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxyHost);
httpClientbuilder.setRoutePlanner(routePlanner);
return httpClientbuilder;
}

private static HttpClientBuilder addProxyBasicAuth(HttpClientBuilder httpClientbuilder, HttpHost proxyHost, String userName, String password) {
Expand Down