Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Added support to connect using a proxy. #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions src/main/java/com/ecwid/mailchimp/MailChimpClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ public class MailChimpClient implements Closeable {
public MailChimpClient() {
this(new HttpClientConnectionManager());
}

/**
* Constructs a {@code MailChimpClient} object accessing MailChimp API service point
* through the default connection manager (currently {@link HttpClientConnectionManager})
* and proxy.
* @param proxyUrl the proxy url that should be used when trying to connect to server
* @param proxyPort the proxy port
*/
public MailChimpClient(String proxyUrl, int proxyPort) {
this(new HttpClientConnectionManager(proxyUrl, proxyPort));
}

/**
* Constructs a {@code MailChimpClient} object accessing MailChimp API service point
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
package com.ecwid.mailchimp.connection;

import java.io.IOException;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.params.ConnRoutePNames;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.util.EntityUtils;
Expand Down Expand Up @@ -52,8 +53,33 @@ public HttpClientConnectionManager() {
* @param readTimeout the timeout (in milliseconds) when when waiting for the response from the remote server
*/
public HttpClientConnectionManager(int connectTimeout, int readTimeout) {
this(connectTimeout, readTimeout, null, 0);
}

/**
* Constructor.
*
* @param proxyUrl the proxy url that should be used when trying to connect to server
* @param proxyPort the proxy port
*/
public HttpClientConnectionManager(String proxyUrl, int proxyPort) {
this(DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, proxyUrl, proxyPort);
}

/**
* Constructor.
*
* @param connectTimeout the timeout (in milliseconds) when trying to connect to the remote server
* @param readTimeout the timeout (in milliseconds) when when waiting for the response from the remote server
* @param proxyUrl the proxy url that should be used when trying to connect to server
* @param proxyPort the proxy port
*/
public HttpClientConnectionManager(int connectTimeout, int readTimeout, String proxyUrl, int proxyPort) {
setConnectTimeout(connectTimeout);
setReadTimeout(readTimeout);
if (proxyUrl != null && proxyPort != 0) {
setProxy(new HttpHost(proxyUrl, proxyPort));
}
}

@Override
Expand All @@ -77,15 +103,23 @@ public int getConnectTimeout() {
return HttpConnectionParams.getConnectionTimeout(http.getParams());
}

public void setConnectTimeout(int connectTimeout) {
public final void setConnectTimeout(int connectTimeout) {
HttpConnectionParams.setConnectionTimeout(http.getParams(), connectTimeout);
}

public int getReadTimeout() {
return HttpConnectionParams.getSoTimeout(http.getParams());
}

public void setReadTimeout(int readTimeout) {
public final void setReadTimeout(int readTimeout) {
HttpConnectionParams.setSoTimeout(http.getParams(), readTimeout);
}

public HttpHost getProxy() {
return (HttpHost) http.getParams().getParameter(ConnRoutePNames.DEFAULT_PROXY);
}

public final void setProxy(HttpHost proxy) {
http.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
}
}