This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new d98e187 Remove the default password from the camel-smpp component
d98e187 is described below
commit d98e187076716a260eab1a141a062d79bc027959
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jun 28 10:16:09 2019 +0100
Remove the default password from the camel-smpp component
---
.../camel/component/smpp/SmppConfiguration.java | 40 +++++++++++-----------
.../component/smpp/SmppConfigurationTest.java | 16 ++++-----
.../camel/component/smpp/SmppConsumerTest.java | 25 +++++++-------
.../smpp/SmppProducerLazySessionCreationTest.java | 13 +++----
.../camel/component/smpp/SmppProducerTest.java | 21 ++++++------
5 files changed, 59 insertions(+), 56 deletions(-)
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 a596011..aca636e 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
@@ -49,7 +49,7 @@ public class SmppConfiguration implements Cloneable {
@UriParam(label = "security", defaultValue = "smppclient", secret = true)
private String systemId = "smppclient";
@UriParam(label = "security", secret = true)
- private String password = "password";
+ private String password;
@UriParam(label = "common", defaultValue = "cp")
private String systemType = "cp";
@UriParam(label = "codec")
@@ -117,7 +117,7 @@ public class SmppConfiguration implements Cloneable {
/**
* A POJO which contains all necessary configuration parameters for the
SMPP connection
- *
+ *
* @param uri the full URI of the endpoint
*/
public void configureFromURI(URI uri) {
@@ -188,7 +188,7 @@ public class SmppConfiguration implements Cloneable {
public String getPassword() {
return password;
}
-
+
public byte getDataCoding() {
return dataCoding;
}
@@ -207,7 +207,7 @@ public class SmppConfiguration implements Cloneable {
public void setDataCoding(byte dataCoding) {
this.dataCoding = dataCoding;
}
-
+
public byte getAlphabet() {
return alphabet;
}
@@ -477,7 +477,7 @@ public class SmppConfiguration implements Cloneable {
public void setDestAddr(String destAddr) {
this.destAddr = destAddr;
}
-
+
public byte getTypeOfNumber() {
return typeOfNumber;
}
@@ -533,7 +533,7 @@ public class SmppConfiguration implements Cloneable {
public void setUsingSSL(boolean usingSSL) {
this.usingSSL = usingSSL;
}
-
+
public long getInitialReconnectDelay() {
return initialReconnectDelay;
}
@@ -677,30 +677,30 @@ public class SmppConfiguration implements Cloneable {
@Override
public String toString() {
- return "SmppConfiguration[usingSSL=" + usingSSL
+ return "SmppConfiguration[usingSSL=" + usingSSL
+ ", enquireLinkTimer=" + enquireLinkTimer
- + ", host=" + host
- + ", password=" + password
- + ", port=" + port
- + ", systemId=" + systemId
+ + ", host=" + host
+ + ", password=" + password
+ + ", port=" + port
+ + ", systemId=" + systemId
+ ", systemType=" + systemType
+ ", dataCoding=" + dataCoding
+ ", alphabet=" + alphabet
+ ", encoding=" + encoding
+ ", transactionTimer=" + transactionTimer
+ ", registeredDelivery=" + registeredDelivery
- + ", serviceType=" + serviceType
- + ", sourceAddrTon=" + sourceAddrTon
+ + ", serviceType=" + serviceType
+ + ", sourceAddrTon=" + sourceAddrTon
+ ", destAddrTon=" + destAddrTon
- + ", sourceAddrNpi=" + sourceAddrNpi
- + ", destAddrNpi=" + destAddrNpi
+ + ", sourceAddrNpi=" + sourceAddrNpi
+ + ", destAddrNpi=" + destAddrNpi
+ ", addressRange=" + addressRange
+ ", protocolId=" + protocolId
- + ", priorityFlag=" + priorityFlag
- + ", replaceIfPresentFlag=" + replaceIfPresentFlag
- + ", sourceAddr=" + sourceAddr
- + ", destAddr=" + destAddr
- + ", typeOfNumber=" + typeOfNumber
+ + ", priorityFlag=" + priorityFlag
+ + ", replaceIfPresentFlag=" + replaceIfPresentFlag
+ + ", sourceAddr=" + sourceAddr
+ + ", destAddr=" + destAddr
+ + ", typeOfNumber=" + typeOfNumber
+ ", numberingPlanIndicator=" + numberingPlanIndicator
+ ", initialReconnectDelay=" + initialReconnectDelay
+ ", reconnectDelay=" + reconnectDelay
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 b2fbf5f..1509f4b 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
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull;
* @version
*/
public class SmppConfigurationTest {
-
+
private SmppConfiguration configuration;
@Before
@@ -55,7 +55,7 @@ public class SmppConfigurationTest {
assertEquals("", configuration.getAddressRange());
assertEquals(new Integer(5000), configuration.getEnquireLinkTimer());
assertEquals("localhost", configuration.getHost());
- assertEquals("password", configuration.getPassword());
+ assertEquals(null, configuration.getPassword());
assertEquals(new Integer(2775), configuration.getPort());
assertEquals(0x01, configuration.getPriorityFlag());
assertEquals(0x00, configuration.getProtocolId());
@@ -80,11 +80,11 @@ public class SmppConfigurationTest {
assertEquals(null, configuration.getHttpProxyPassword());
assertEquals(null, configuration.getSessionStateListener());
}
-
+
@Test
public void getterShouldReturnTheSetValues() {
setNoneDefaultValues(configuration);
-
+
assertEquals("1919", configuration.getDestAddr());
assertEquals(0x08, configuration.getDestAddrNpi());
assertEquals(0x02, configuration.getDestAddrTon());
@@ -120,7 +120,7 @@ public class SmppConfigurationTest {
@Test
public void getterShouldReturnTheConfigureValuesFromURI() throws
URISyntaxException {
configuration.configureFromURI(new
URI("smpp://client@127.0.0.1:2776"));
-
+
assertEquals("127.0.0.1", configuration.getHost());
assertEquals(new Integer(2776), configuration.getPort());
assertEquals("client", configuration.getSystemId());
@@ -143,7 +143,7 @@ public class SmppConfigurationTest {
public void cloneShouldReturnAnEqualInstance() {
setNoneDefaultValues(configuration);
SmppConfiguration config = configuration.copy();
-
+
assertEquals(config.getDestAddr(), configuration.getDestAddr());
assertEquals(config.getDestAddrNpi(), configuration.getDestAddrNpi());
assertEquals(config.getDestAddrTon(), configuration.getDestAddrTon());
@@ -175,14 +175,14 @@ public class SmppConfigurationTest {
assertEquals(config.getSessionStateListener(),
configuration.getSessionStateListener());
assertEquals(config.getProxyHeaders(),
configuration.getProxyHeaders());
}
-
+
@Test
public void toStringShouldListAllInstanceVariables() {
String expected = "SmppConfiguration["
+ "usingSSL=false, "
+ "enquireLinkTimer=5000, "
+ "host=localhost, "
- + "password=password, "
+ + "password=null, "
+ "port=2775, "
+ "systemId=smppclient, "
+ "systemType=cp, "
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
index fd8a6c1..50d3611 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.when;
* @version
*/
public class SmppConsumerTest {
-
+
private SmppConsumer consumer;
private SmppEndpoint endpoint;
private SmppConfiguration configuration;
@@ -50,16 +50,17 @@ public class SmppConsumerTest {
@Before
public void setUp() {
configuration = new SmppConfiguration();
+ configuration.setPassword("password");
endpoint = mock(SmppEndpoint.class);
processor = mock(Processor.class);
session = mock(SMPPSession.class);
-
+
// the construction of SmppConsumer will trigger the getCamelContext
call
consumer = new SmppConsumer(
- endpoint,
+ endpoint,
configuration,
processor) {
-
+
SMPPSession createSMPPSession() {
return session;
}
@@ -79,9 +80,9 @@ public class SmppConsumerTest {
"");
when(session.connectAndBind("localhost", new Integer(2775),
expectedBindParameter))
.thenReturn("1");
-
+
consumer.doStart();
-
+
verify(session).setEnquireLinkTimer(5000);
verify(session).setTransactionTimer(10000);
verify(session).addSessionStateListener(isA(SessionStateListener.class));
@@ -93,20 +94,20 @@ public class SmppConsumerTest {
public void doStopShouldNotCloseTheSMPPSessionIfItIsNull() throws
Exception {
when(endpoint.getConnectionString())
.thenReturn("smpp://smppclient@localhost:2775");
-
+
consumer.doStop();
}
-
+
@Test
public void doStopShouldCloseTheSMPPSession() throws Exception {
doStartShouldStartANewSmppSession();
reset(endpoint, processor, session);
-
+
when(endpoint.getConnectionString())
.thenReturn("smpp://smppclient@localhost:2775");
-
+
consumer.doStop();
-
+
verify(session).removeSessionStateListener(isA(SessionStateListener.class));
verify(session).unbindAndClose();
}
@@ -139,4 +140,4 @@ public class SmppConsumerTest {
assertSame(endpoint, consumer.getEndpoint());
assertSame(configuration, consumer.getConfiguration());
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index 4a38b45..b4b703d 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
* @version
*/
public class SmppProducerLazySessionCreationTest {
-
+
private SmppProducer producer;
private SmppConfiguration configuration;
private SmppEndpoint endpoint;
@@ -49,9 +49,10 @@ public class SmppProducerLazySessionCreationTest {
public void setUp() {
configuration = new SmppConfiguration();
configuration.setLazySessionCreation(true);
+ configuration.setPassword("password");
endpoint = mock(SmppEndpoint.class);
session = mock(SMPPSession.class);
-
+
producer = new SmppProducer(endpoint, configuration) {
SMPPSession createSMPPSession() {
return session;
@@ -96,10 +97,10 @@ public class SmppProducerLazySessionCreationTest {
when(in.getHeader("CamelSmppSystemId", String.class)).thenReturn(null);
when(in.getHeader("CamelSmppPassword", String.class)).thenReturn(null);
command.execute(exchange);
-
+
producer.doStart();
producer.process(exchange);
-
+
verify(session).setEnquireLinkTimer(5000);
verify(session).setTransactionTimer(10000);
verify(session).addSessionStateListener(isA(SessionStateListener.class));
@@ -131,10 +132,10 @@ public class SmppProducerLazySessionCreationTest {
when(in.getHeader("CamelSmppSystemId",
String.class)).thenReturn("smppclient2");
when(in.getHeader("CamelSmppPassword",
String.class)).thenReturn("password2");
command.execute(exchange);
-
+
producer.doStart();
producer.process(exchange);
-
+
verify(session).connectAndBind("localhost", new Integer(2775),
expectedBindParameter);
}
}
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
index be4e6f1..b92e09a 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.when;
* @version
*/
public class SmppProducerTest {
-
+
private SmppProducer producer;
private SmppConfiguration configuration;
private SmppEndpoint endpoint;
@@ -47,9 +47,10 @@ public class SmppProducerTest {
@Before
public void setUp() {
configuration = new SmppConfiguration();
+ configuration.setPassword("password");
endpoint = mock(SmppEndpoint.class);
session = mock(SMPPSession.class);
-
+
producer = new SmppProducer(endpoint, configuration) {
SMPPSession createSMPPSession() {
return session;
@@ -72,9 +73,9 @@ public class SmppProducerTest {
when(session.connectAndBind("localhost", new Integer(2775),
expectedBindParameters))
.thenReturn("1");
when(endpoint.isSingleton()).thenReturn(true);
-
+
producer.doStart();
-
+
verify(session).setEnquireLinkTimer(5000);
verify(session).setTransactionTimer(10000);
verify(session).addSessionStateListener(isA(SessionStateListener.class));
@@ -89,7 +90,7 @@ public class SmppProducerTest {
producer.doStop();
}
-
+
@Test
public void doStopShouldCloseTheSMPPSession() throws Exception {
when(endpoint.getConnectionString())
@@ -98,11 +99,11 @@ public class SmppProducerTest {
producer.doStart();
producer.doStop();
-
+
verify(session).removeSessionStateListener(isA(SessionStateListener.class));
verify(session).unbindAndClose();
}
-
+
@Test
public void processInOnlyShouldExecuteTheCommand() throws Exception {
SmppBinding binding = mock(SmppBinding.class);
@@ -110,13 +111,13 @@ public class SmppProducerTest {
SmppCommand command = mock(SmppCommand.class);
when(endpoint.getBinding()).thenReturn(binding);
when(binding.createSmppCommand(session, exchange)).thenReturn(command);
-
+
producer.doStart();
producer.process(exchange);
-
+
verify(command).execute(exchange);
}
-
+
@Test
public void getterShouldReturnTheSetValues() {
assertSame(endpoint, producer.getEndpoint());
