Author: cmueller
Date: Wed Mar 27 15:51:09 2013
New Revision: 1461666
URL: http://svn.apache.org/r1461666
Log:
CAMEL-6117: Allow empty system_type
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1461666&r1=1461665&r2=1461666&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Wed Mar 27 15:51:09 2013
@@ -52,6 +52,11 @@ public class SmppComponent extends Defau
SmppConfiguration config = this.configuration.copy();
config.configureFromURI(new URI(uri));
+ // special handling to set the system type to an empty string
+ if (parameters.containsKey("systemType") &&
parameters.get("systemType") == null) {
+ config.setSystemType("");
+ parameters.remove("systemType");
+ }
setProperties(config, parameters);
return createEndpoint(uri, config);
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1461666&r1=1461665&r2=1461666&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Wed Mar 27 15:51:09 2013
@@ -125,6 +125,16 @@ public class SmppComponentTest {
}
@Test
+ public void allowEmptySystemTypeOption() throws Exception {
+ Map<String, String> parameters = new HashMap<String, String>();
+ parameters.put("systemType", null);
+ Endpoint endpoint =
component.createEndpoint("smpp://smppclient@localhost:2775", "?systemType=",
parameters);
+ SmppEndpoint smppEndpoint = (SmppEndpoint) endpoint;
+
+ assertEquals("", smppEndpoint.getConfiguration().getSystemType());
+ }
+
+ @Test
public void createEndpointSmppConfigurationShouldReturnASmppEndpoint()
throws Exception {
SmppConfiguration configuration = new SmppConfiguration();
Endpoint endpoint = component.createEndpoint(configuration);