You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/04 10:55:46 UTC
camel git commit: CAMEL-9280: Allow passing custom headers to the
proxy server in camel-smpp component. Thanks to Anshu Avinash for the patch.
Repository: camel
Updated Branches:
refs/heads/master 3169b03de -> 8bcbd5b03
CAMEL-9280: Allow passing custom headers to the proxy server in camel-smpp component. Thanks to Anshu Avinash for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bcbd5b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bcbd5b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bcbd5b0
Branch: refs/heads/master
Commit: 8bcbd5b030a59f1fa0c91a15173eb4faf7af1bcb
Parents: 3169b03
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 4 10:55:34 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 4 10:55:34 2016 +0100
----------------------------------------------------------------------
.../camel/component/smpp/SmppConfiguration.java | 25 ++++++++++++++++----
.../component/smpp/SmppConnectionFactory.java | 9 +++++++
.../component/smpp/SmppConfigurationTest.java | 12 ++++++++--
3 files changed, 39 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8bcbd5b0/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
index dec1661..dcf2899 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.smpp;
import java.net.URI;
import java.nio.charset.Charset;
+import java.util.Map;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -97,18 +98,20 @@ public class SmppConfiguration implements Cloneable {
private long reconnectDelay = 5000;
@UriParam
private boolean lazySessionCreation;
- @UriParam
+ @UriParam(label = "proxy")
private String httpProxyHost;
- @UriParam(defaultValue = "3128")
+ @UriParam(label = "proxy", defaultValue = "3128")
private Integer httpProxyPort = 3128;
- @UriParam
+ @UriParam(label = "proxy")
private String httpProxyUsername;
- @UriParam
+ @UriParam(label = "proxy")
private String httpProxyPassword;
- @UriParam
+ @UriParam(label = "advanced")
private SessionStateListener sessionStateListener;
@UriParam(defaultValue = "ALLOW")
private SmppSplittingPolicy splittingPolicy = SmppSplittingPolicy.ALLOW;
+ @UriParam(label = "proxy")
+ private Map<String, String> proxyHeaders;
/**
@@ -637,6 +640,17 @@ public class SmppConfiguration implements Cloneable {
this.splittingPolicy = splittingPolicy;
}
+ /**
+ * These headers will be passed to the proxy server while establishing the connection.
+ */
+ public void setProxyHeaders(Map<String, String> proxyHeaders) {
+ this.proxyHeaders = proxyHeaders;
+ }
+
+ public Map<String, String> getProxyHeaders() {
+ return proxyHeaders;
+ }
+
@Override
public String toString() {
return "SmppConfiguration[usingSSL=" + usingSSL
@@ -672,6 +686,7 @@ public class SmppConfiguration implements Cloneable {
+ ", httpProxyUsername=" + httpProxyUsername
+ ", httpProxyPassword=" + httpProxyPassword
+ ", splittingPolicy=" + splittingPolicy
+ + ", proxyHeaders=" + proxyHeaders
+ "]";
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8bcbd5b0/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
index ff8a57b..cab3301 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
@@ -54,6 +54,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
+import java.util.Map;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
@@ -127,6 +128,14 @@ public final class SmppConnectionFactory implements ConnectionFactory {
out.write(code);
out.write("\r\n".getBytes());
}
+
+ Map<String, String> proxyHeaders = config.getProxyHeaders();
+ if (proxyHeaders != null) {
+ for (Map.Entry<String, String> entry: proxyHeaders.entrySet()) {
+ out.write((entry.getKey() + ": " + entry.getValue()).getBytes());
+ out.write("\r\n".getBytes());
+ }
+ }
out.write("\r\n".getBytes());
out.flush();
http://git-wip-us.apache.org/repos/asf/camel/blob/8bcbd5b0/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
index a5cfed5..6211744 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.smpp;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.SMSCDeliveryReceipt;
import org.jsmpp.bean.TypeOfNumber;
@@ -111,6 +113,7 @@ public class SmppConfigurationTest {
assertEquals("user", configuration.getHttpProxyUsername());
assertEquals("secret", configuration.getHttpProxyPassword());
assertNotNull(configuration.getSessionStateListener());
+ assertEquals("1", configuration.getProxyHeaders().get("X-Proxy-Header"));
}
@Test
@@ -156,6 +159,7 @@ public class SmppConfigurationTest {
assertEquals(config.getHttpProxyUsername(), configuration.getHttpProxyUsername());
assertEquals(config.getHttpProxyPassword(), configuration.getHttpProxyPassword());
assertEquals(config.getSessionStateListener(), configuration.getSessionStateListener());
+ assertEquals(config.getProxyHeaders(), configuration.getProxyHeaders());
}
@Test
@@ -193,7 +197,8 @@ public class SmppConfigurationTest {
+ "httpProxyPort=3128, "
+ "httpProxyUsername=null, "
+ "httpProxyPassword=null, "
- + "splittingPolicy=ALLOW]";
+ + "splittingPolicy=ALLOW, "
+ + "proxyHeaders=null]";
assertEquals(expected, configuration.toString());
}
@@ -231,5 +236,8 @@ public class SmppConfigurationTest {
public void onStateChange(SessionState arg0, SessionState arg1, Object arg2) {
}
});
+ Map<String, String> proxyHeaders = new HashMap<String, String>();
+ proxyHeaders.put("X-Proxy-Header", "1");
+ config.setProxyHeaders(proxyHeaders);
}
-}
\ No newline at end of file
+}