Author: cmueller
Date: Wed Mar 27 16:00:56 2013
New Revision: 1461680
URL: http://svn.apache.org/r1461680
Log:
CAMEL-6117: Allow empty service_type and system_type
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1461680&r1=1461679&r2=1461680&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Wed Mar 27 16:00:56 2013
@@ -52,11 +52,17 @@ public class SmppComponent extends Defau
SmppConfiguration config = this.configuration.copy();
config.configureFromURI(new URI(uri));
+ // TODO Camel 3.0 cmueller: We should change the default in Camel 3.0
to '' so that we can remove this special handling
// special handling to set the system type to an empty string
if (parameters.containsKey("systemType") &&
parameters.get("systemType") == null) {
config.setSystemType("");
parameters.remove("systemType");
}
+ // special handling to set the service type to an empty string
+ if (parameters.containsKey("serviceType") &&
parameters.get("serviceType") == null) {
+ config.setServiceType("");
+ parameters.remove("serviceType");
+ }
setProperties(config, parameters);
return createEndpoint(uri, config);
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1461680&r1=1461679&r2=1461680&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Wed Mar 27 16:00:56 2013
@@ -125,13 +125,15 @@ public class SmppComponentTest {
}
@Test
- public void allowEmptySystemTypeOption() throws Exception {
+ public void allowEmptySystemTypeAndServiceTypeOption() throws Exception {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("systemType", null);
- Endpoint endpoint =
component.createEndpoint("smpp://smppclient@localhost:2775", "?systemType=",
parameters);
+ parameters.put("serviceType", null);
+ Endpoint endpoint =
component.createEndpoint("smpp://smppclient@localhost:2775",
"?systemType=&serviceType=", parameters);
SmppEndpoint smppEndpoint = (SmppEndpoint) endpoint;
assertEquals("", smppEndpoint.getConfiguration().getSystemType());
+ assertEquals("", smppEndpoint.getConfiguration().getServiceType());
}
@Test
