Skip to content

polishing #587

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
chillaq merged 4 commits into from
Jul 23, 2025
Merged

polishing #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f952109
polishing
chillaq Jul 18, 2025
392d663
polishing
chillaq Jul 18, 2025
e228e1d
polish
chillaq Jul 18, 2025
77c681a
polishing
chillaq Jul 18, 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: 7 additions & 0 deletions client/src/main/java/io/split/client/SplitClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.split.storages.enums.OperationMode;
import io.split.storages.enums.StorageMode;
import org.apache.hc.core5.http.HttpHost;
import org.slf4j.LoggerFactory;
import pluggable.CustomStorageWrapper;

import java.io.IOException;
Expand All @@ -28,6 +29,7 @@
*/
public class SplitClientConfig {

private static final org.slf4j.Logger _log = LoggerFactory.getLogger(SplitClientConfig.class);
public static final String LOCALHOST_DEFAULT_FILE = "split.yaml";
public static final String SDK_ENDPOINT = "https://sdk.split.io";
public static final String EVENTS_ENDPOINT = "https://events.split.io";
Expand Down Expand Up @@ -1140,6 +1142,11 @@ private void verifyProxy() {
if (_proxyConfiguration == null)
return;

if (_proxyPort != -1) {
_log.warn("Both the deprecated proxy configuration methods (`proxyHost`, `proxyPort`, `proxyUsername`, or `proxyPassword`) " +
"and the new `ProxyConfiguration` builder are being used. `ProxyConfiguration` will take precedence.");
}

if (!(_proxyConfiguration.getHost().getSchemeName().equals(HttpScheme.HTTP) ||
_proxyConfiguration.getHost().getSchemeName().equals(HttpScheme.HTTPS))) {
throw new IllegalArgumentException("Proxy scheme must be either http or https.");
Expand Down
78 changes: 43 additions & 35 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 @@ -628,48 +628,56 @@ private static SSLContext buildSSLContext(SplitClientConfig config) throws IOExc

private static HttpClientBuilder setupProxy(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
_log.info("Initializing Split SDK with proxy settings");
HttpHost proxyHost;
if (config.proxyConfiguration() != null && config.proxyConfiguration().getHost() != null) {
proxyHost = config.proxyConfiguration().getHost();
if (config.proxyConfiguration() != null) {
return useProxyConfiguration(httpClientbuilder, config);
} else {
_log.warn("`proxyHost`, `proxyPort` configuration methods are deprecated. Please use `ProxyConfiguration` builder instead.");
proxyHost = config.proxy();
return useLegacyProxyConfiguration(httpClientbuilder, config);
}
DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxyHost);
httpClientbuilder.setRoutePlanner(routePlanner);
}

if ((config.proxyUsername() != null && config.proxyPassword() != null) ||
(config.proxyConfiguration() != null && config.proxyConfiguration().getProxyCredentialsProvider() != null &&
config.proxyConfiguration().getProxyCredentialsProvider() instanceof io.split.client.dtos.BasicCredentialsProvider)) {
_log.debug("Proxy setup using credentials");
String userName;
String password;
if (config.proxyUsername() == null && config.proxyPassword() == null) {
io.split.client.dtos.BasicCredentialsProvider basicAuth =
(io.split.client.dtos.BasicCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider();
userName = basicAuth.getUsername();
password = basicAuth.getPassword();
} else {
_log.warn("`proxyUsername` and `proxyPassword` configuration methods are deprecated. " +
"Please use `ProxyConfiguration` builder instead.");
userName = config.proxyUsername();
password = config.proxyPassword();
}
BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
AuthScope siteScope = new AuthScope(proxyHost.getHostName(), proxyHost.getPort());
Credentials siteCreds = new UsernamePasswordCredentials(userName,
password.toCharArray());
credsProvider.setCredentials(siteScope, siteCreds);
httpClientbuilder.setDefaultCredentialsProvider(credsProvider);
private static HttpClientBuilder useLegacyProxyConfiguration(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
HttpHost proxyHost = config.proxy();
httpClientbuilder = addProxyHost(httpClientbuilder, proxyHost);
if (config.proxyUsername() != null && config.proxyPassword() != null) {
return addProxyBasicAuth(httpClientbuilder, proxyHost, config.proxyUsername(), config.proxyPassword());
}

return httpClientbuilder;
}

if (config.proxyConfiguration() != null &&
config.proxyConfiguration().getProxyCredentialsProvider() instanceof io.split.client.dtos.BearerCredentialsProvider) {
_log.debug("Proxy setup using Bearer token");
httpClientbuilder.setDefaultCredentialsProvider(new HttpClientDynamicCredentials(
(BearerCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider()));
private static HttpClientBuilder useProxyConfiguration(HttpClientBuilder httpClientbuilder, SplitClientConfig config) {
HttpHost proxyHost = config.proxyConfiguration().getHost();
httpClientbuilder = addProxyHost(httpClientbuilder, proxyHost);
if (config.proxyConfiguration().getProxyCredentialsProvider() == null) {
return httpClientbuilder;
}

if (config.proxyConfiguration().getProxyCredentialsProvider() instanceof io.split.client.dtos.BasicCredentialsProvider) {
io.split.client.dtos.BasicCredentialsProvider basicAuth =
(io.split.client.dtos.BasicCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider();
return addProxyBasicAuth(httpClientbuilder, proxyHost, basicAuth.getUsername(), basicAuth.getPassword());
}

_log.debug("Proxy setup using Bearer token");
httpClientbuilder.setDefaultCredentialsProvider(new HttpClientDynamicCredentials(
(BearerCredentialsProvider) config.proxyConfiguration().getProxyCredentialsProvider()));
return httpClientbuilder;
}

private static HttpClientBuilder 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) {
_log.debug("Proxy setup using Basic authentication");
BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
AuthScope siteScope = new AuthScope(proxyHost.getHostName(), proxyHost.getPort());
Credentials siteCreds = new UsernamePasswordCredentials(userName,
password.toCharArray());
credsProvider.setCredentials(siteScope, siteCreds);
httpClientbuilder.setDefaultCredentialsProvider(credsProvider);
return httpClientbuilder;
}

Expand Down