Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-6556] Support system property proxy settings for HTTP(S) client 

(cherry picked from commit 746a839809)
This commit is contained in:
amarkevich 2018-02-26 11:51:15 +03:00 committed by Jean-Baptiste Onofré
parent d16d7cd172
commit 1ced34a383
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
View File

@ -414,4 +414,10 @@ public class HttpClientTransport extends HttpTransportSupport {
public WireFormat getWireFormat() {
return getTextWireFormat();
}
@Override
protected String getSystemPropertyPrefix() {
return "http.";
}
}

25
activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java
View File

@ -27,10 +27,16 @@ import org.apache.activemq.transport.util.TextWireFormat;
*
*/
public abstract class HttpTransportSupport extends TransportThreadSupport {
private static final int DEFAULT_PROXY_PORT = 8080;
private static final String PROPERTY_PROXY_HOST = "proxyHost";
private static final String PROPERTY_PROXY_PORT = "proxyPort";
private static final String PROPERTY_PROXY_USER = "proxyUser";
private static final String PROPERTY_PROXY_PASSWORD = "proxyPassword";
private TextWireFormat textWireFormat;
private URI remoteUrl;
private String proxyHost;
private int proxyPort = 8080;
private Integer proxyPort;
private String proxyUser;
private String proxyPassword;
@ -62,7 +68,7 @@ public abstract class HttpTransportSupport extends TransportThreadSupport {
}
public String getProxyHost() {
return proxyHost;
return proxyHost != null ? proxyHost : getSystemProperty(PROPERTY_PROXY_HOST);
}
public void setProxyHost(String proxyHost) {
@ -70,7 +76,9 @@ public abstract class HttpTransportSupport extends TransportThreadSupport {
}
public int getProxyPort() {
return proxyPort;
return proxyPort != null ? proxyPort
: (getSystemProperty(PROPERTY_PROXY_PORT) != null
? Integer.parseInt(getSystemProperty(PROPERTY_PROXY_PORT)) : DEFAULT_PROXY_PORT);
}
public void setProxyPort(int proxyPort) {
@ -78,7 +86,7 @@ public abstract class HttpTransportSupport extends TransportThreadSupport {
}
public String getProxyUser() {
return proxyUser;
return proxyUser != null ? proxyUser : getSystemProperty(PROPERTY_PROXY_USER);
}
public void setProxyUser(String proxyUser) {
@ -86,10 +94,17 @@ public abstract class HttpTransportSupport extends TransportThreadSupport {
}
public String getProxyPassword() {
return proxyPassword;
return proxyPassword != null ? proxyPassword : getSystemProperty(PROPERTY_PROXY_PASSWORD);
}
public void setProxyPassword(String proxyPassword) {
this.proxyPassword = proxyPassword;
}
protected abstract String getSystemPropertyPrefix();
private String getSystemProperty(String propertyName) {
return System.getProperty(getSystemPropertyPrefix() + propertyName);
}
}

6
activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java
View File

@ -75,4 +75,10 @@ public class HttpsClientTransport extends HttpClientTransport {
}
}
@Override
protected String getSystemPropertyPrefix() {
return "https.";
}
}