Author: ningjiang
Date: Fri Oct 19 14:29:38 2012
New Revision: 1400117
URL: http://svn.apache.org/viewvc?rev=1400117&view=rev
Log:
CAMEL-5713 support the addressRange option in camel-smpp with thanks to Francois
Modified:
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
Modified:
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java?rev=1400117&r1=1400116&r2=1400117&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
(original)
+++
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
Fri Oct 19 14:29:38 2012
@@ -51,6 +51,7 @@ public class SmppConfiguration implement
private byte destAddrTon = TypeOfNumber.UNKNOWN.value();
private byte sourceAddrNpi = NumberingPlanIndicator.UNKNOWN.value();
private byte destAddrNpi = NumberingPlanIndicator.UNKNOWN.value();
+ private String addressRange = "";
private byte protocolId = (byte) 0;
private byte priorityFlag = (byte) 1;
private byte replaceIfPresentFlag = ReplaceIfPresentFlag.DEFAULT.value();
@@ -344,6 +345,14 @@ public class SmppConfiguration implement
this.sessionStateListener = sessionStateListener;
}
+ public String getAddressRange() {
+ return addressRange;
+ }
+
+ public void setAddressRange(String addressRange) {
+ this.addressRange = addressRange;
+ }
+
@Override
public String toString() {
return "SmppConfiguration[usingSSL=" + usingSSL
@@ -363,6 +372,7 @@ public class SmppConfiguration implement
+ ", destAddrTon=" + destAddrTon
+ ", sourceAddrNpi=" + sourceAddrNpi
+ ", destAddrNpi=" + destAddrNpi
+ + ", addressRange=" + addressRange
+ ", protocolId=" + protocolId
+ ", priorityFlag=" + priorityFlag
+ ", replaceIfPresentFlag=" + replaceIfPresentFlag
Modified:
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java?rev=1400117&r1=1400116&r2=1400117&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
(original)
+++
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
Fri Oct 19 14:29:38 2012
@@ -95,8 +95,9 @@ public class SmppConsumer extends Defaul
session.connectAndBind(this.configuration.getHost(),
this.configuration.getPort(),
new BindParameter(BindType.BIND_RX,
this.configuration.getSystemId(),
this.configuration.getPassword(),
this.configuration.getSystemType(),
- TypeOfNumber.UNKNOWN, NumberingPlanIndicator.UNKNOWN,
""));
-
+ TypeOfNumber.UNKNOWN, NumberingPlanIndicator.UNKNOWN,
+ configuration.getAddressRange()));
+
return session;
}
Modified:
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java?rev=1400117&r1=1400116&r2=1400117&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
(original)
+++
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
Fri Oct 19 14:29:38 2012
@@ -49,6 +49,7 @@ public class SmppConfigurationTest {
assertEquals("1717", configuration.getDestAddr());
assertEquals(0x00, configuration.getDestAddrNpi());
assertEquals(0x00, configuration.getDestAddrTon());
+ assertEquals("", configuration.getAddressRange());
assertEquals(new Integer(5000), configuration.getEnquireLinkTimer());
assertEquals("localhost", configuration.getHost());
assertEquals("password", configuration.getPassword());
@@ -177,6 +178,7 @@ public class SmppConfigurationTest {
+ "destAddrTon=0, "
+ "sourceAddrNpi=0, "
+ "destAddrNpi=0, "
+ + "addressRange=, "
+ "protocolId=0, "
+ "priorityFlag=1, "
+ "replaceIfPresentFlag=0, "
Modified:
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java?rev=1400117&r1=1400116&r2=1400117&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
(original)
+++
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
Fri Oct 19 14:29:38 2012
@@ -122,6 +122,31 @@ public class SmppConsumerTest {
}
@Test
+ public void addressRangeFromConfigurationIsUsed() throws Exception {
+ resetToNice(endpoint, session);
+
+ configuration.setAddressRange("(111*|222*|333*)");
+
+ expect(session.connectAndBind(
+ "localhost",
+ new Integer(2775),
+ new BindParameter(
+ BindType.BIND_RX,
+ "smppclient",
+ "password",
+ "cp",
+ TypeOfNumber.UNKNOWN,
+ NumberingPlanIndicator.UNKNOWN,
+ "(111*|222*|333*)"))).andReturn("1");
+
+ replay(endpoint, processor, session);
+
+ consumer.doStart();
+
+ verify(endpoint, processor, session);
+ }
+
+ @Test
public void getterShouldReturnTheSetValues() {
assertSame(endpoint, consumer.getEndpoint());
assertSame(configuration, consumer.getConfiguration());
