This is an automated email from the ASF dual-hosted git repository. jenniferdai pushed a commit to branch proxy in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit ddb8c5f48ef872631fcd8a4813e8190966ff07f9 Author: Jennifer Dai <[email protected]> AuthorDate: Wed Sep 4 14:15:28 2019 -0700 Adding a constructor to create the HttpClient with a proxy --- .../apache/pinot/common/utils/FileUploadDownloadClient.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java index 288e64c..fbe707b 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/FileUploadDownloadClient.java @@ -38,6 +38,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; +import org.apache.http.HttpHost; import org.apache.http.HttpVersion; import org.apache.http.NameValuePair; import org.apache.http.StatusLine; @@ -122,6 +123,16 @@ public class FileUploadDownloadClient implements Closeable { _httpClient = HttpClients.custom().setSSLContext(sslContext).build(); } + /** + * Construct the client with optional {@link SSLContext} for HTTPS and a potential proxy. + * + * @param sslContext SSL context + * @param proxy + */ + public FileUploadDownloadClient(@Nullable SSLContext sslContext, @Nullable HttpHost proxy) { + _httpClient = HttpClients.custom().setSSLContext(sslContext).setProxy(proxy).build(); + } + private static URI getURI(String scheme, String host, int port, String path) throws URISyntaxException { return new URI(scheme, null, host, port, path, null, null); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
