This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f1d22e2 camel-smpp: fixed deprecation warnings (#4133)
f1d22e2 is described below
commit f1d22e2793fa17566ee4397a30edcf9ef9ba273c
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Aug 26 16:30:45 2020 +0200
camel-smpp: fixed deprecation warnings (#4133)
---
.../component/smpp/AbstractSmppCommandTest.java | 17 +++++++++++--
.../component/smpp/SmppConfigurationTest.java | 28 +++++++++++-----------
.../component/smpp/SmppConnectionFactoryTest.java | 4 ++--
.../camel/component/smpp/SmppConsumerTest.java | 8 +++----
.../smpp/SmppProducerLazySessionCreationTest.java | 8 +++----
.../camel/component/smpp/SmppProducerTest.java | 4 ++--
6 files changed, 41 insertions(+), 28 deletions(-)
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/AbstractSmppCommandTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/AbstractSmppCommandTest.java
index daa95ac..e8f852a 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/AbstractSmppCommandTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/AbstractSmppCommandTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.smpp;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.Message;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
import org.jsmpp.bean.OptionalParameter;
@@ -57,8 +58,20 @@ public class AbstractSmppCommandTest {
Exchange inOnlyExchange = new DefaultExchange(new
DefaultCamelContext(), ExchangePattern.InOnly);
Exchange inOutExchange = new DefaultExchange(new
DefaultCamelContext(), ExchangePattern.InOut);
- assertSame(inOnlyExchange.getIn(),
command.getResponseMessage(inOnlyExchange));
- assertSame(inOutExchange.getOut(),
command.getResponseMessage(inOutExchange));
+ assertSame(command.getResponseMessage(inOnlyExchange),
inOnlyExchange.getIn());
+ /*
+ NOTE: in this test it's important to call the methods in this order:
+ 1. command.getResponseMessage
+ 2. inOutExchange.getMessage
+
+ This is so, because the empty out Message object is created by the
getOut messaged called by
+ command.getResponseMessage. Calling in the inverse order causes the
hasOut check on getMessage()
+ to return false, which, in turns, causes it to return the in
message. Thus failing the test.
+ */
+ Message expectedMessage = command.getResponseMessage(inOutExchange);
+ Message verificationMessage = inOutExchange.getMessage();
+
+ assertSame(expectedMessage, verificationMessage);
}
@Test
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 632d1b2..1b7c664 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
@@ -52,10 +52,10 @@ public class SmppConfigurationTest {
assertEquals(0x00, configuration.getDestAddrNpi());
assertEquals(0x00, configuration.getDestAddrTon());
assertEquals("", configuration.getAddressRange());
- assertEquals(new Integer(5000), configuration.getEnquireLinkTimer());
+ assertEquals(Integer.valueOf(5000),
configuration.getEnquireLinkTimer());
assertEquals("localhost", configuration.getHost());
assertEquals(null, configuration.getPassword());
- assertEquals(new Integer(2775), configuration.getPort());
+ assertEquals(Integer.valueOf(2775), configuration.getPort());
assertEquals(0x01, configuration.getPriorityFlag());
assertEquals(0x00, configuration.getProtocolId());
assertEquals(0x01, configuration.getRegisteredDelivery());
@@ -66,7 +66,7 @@ public class SmppConfigurationTest {
assertEquals(0x00, configuration.getSourceAddrTon());
assertEquals("smppclient", configuration.getSystemId());
assertEquals("", configuration.getSystemType());
- assertEquals(new Integer(10000), configuration.getTransactionTimer());
+ assertEquals(Integer.valueOf(10000),
configuration.getTransactionTimer());
assertEquals("ISO-8859-1", configuration.getEncoding());
assertEquals(0x00, configuration.getNumberingPlanIndicator());
assertEquals(0x00, configuration.getTypeOfNumber());
@@ -74,7 +74,7 @@ public class SmppConfigurationTest {
assertEquals(5000, configuration.getInitialReconnectDelay());
assertEquals(5000, configuration.getReconnectDelay());
assertEquals(null, configuration.getHttpProxyHost());
- assertEquals(new Integer(3128), configuration.getHttpProxyPort());
+ assertEquals(Integer.valueOf(3128), configuration.getHttpProxyPort());
assertEquals(null, configuration.getHttpProxyUsername());
assertEquals(null, configuration.getHttpProxyPassword());
assertEquals(null, configuration.getSessionStateListener());
@@ -87,10 +87,10 @@ public class SmppConfigurationTest {
assertEquals("1919", configuration.getDestAddr());
assertEquals(0x08, configuration.getDestAddrNpi());
assertEquals(0x02, configuration.getDestAddrTon());
- assertEquals(new Integer(5001), configuration.getEnquireLinkTimer());
+ assertEquals(Integer.valueOf(5001),
configuration.getEnquireLinkTimer());
assertEquals("127.0.0.1", configuration.getHost());
assertEquals("secret", configuration.getPassword());
- assertEquals(new Integer(2776), configuration.getPort());
+ assertEquals(Integer.valueOf(2776), configuration.getPort());
assertEquals(0x00, configuration.getPriorityFlag());
assertEquals(0x01, configuration.getProtocolId());
assertEquals(0x00, configuration.getRegisteredDelivery());
@@ -101,7 +101,7 @@ public class SmppConfigurationTest {
assertEquals(0x02, configuration.getSourceAddrTon());
assertEquals("client", configuration.getSystemId());
assertEquals("xx", configuration.getSystemType());
- assertEquals(new Integer(10001), configuration.getTransactionTimer());
+ assertEquals(Integer.valueOf(10001),
configuration.getTransactionTimer());
assertEquals("UTF-8", configuration.getEncoding());
assertEquals(0x08, configuration.getNumberingPlanIndicator());
assertEquals(0x02, configuration.getTypeOfNumber());
@@ -109,7 +109,7 @@ public class SmppConfigurationTest {
assertEquals(5001, configuration.getInitialReconnectDelay());
assertEquals(5002, configuration.getReconnectDelay());
assertEquals("127.0.0.1", configuration.getHttpProxyHost());
- assertEquals(new Integer(3129), configuration.getHttpProxyPort());
+ assertEquals(Integer.valueOf(3129), configuration.getHttpProxyPort());
assertEquals("user", configuration.getHttpProxyUsername());
assertEquals("secret", configuration.getHttpProxyPassword());
assertNotNull(configuration.getSessionStateListener());
@@ -121,7 +121,7 @@ public class SmppConfigurationTest {
configuration.configureFromURI(new
URI("smpp://[email protected]:2776"));
assertEquals("127.0.0.1", configuration.getHost());
- assertEquals(new Integer(2776), configuration.getPort());
+ assertEquals(Integer.valueOf(2776), configuration.getPort());
assertEquals("client", configuration.getSystemId());
}
@@ -134,7 +134,7 @@ public class SmppConfigurationTest {
configuration.configureFromURI(new URI("smpp://?password=pw"));
assertEquals("host", configuration.getHost());
- assertEquals(new Integer(123), configuration.getPort());
+ assertEquals(Integer.valueOf(123), configuration.getPort());
assertEquals("systemId", configuration.getSystemId());
}
@@ -221,10 +221,10 @@ public class SmppConfigurationTest {
config.setDestAddr("1919");
config.setDestAddrNpi(NumberingPlanIndicator.NATIONAL.value());
config.setDestAddrTon(TypeOfNumber.NATIONAL.value());
- config.setEnquireLinkTimer(new Integer(5001));
+ config.setEnquireLinkTimer(Integer.valueOf(5001));
config.setHost("127.0.0.1");
config.setPassword("secret");
- config.setPort(new Integer(2776));
+ config.setPort(Integer.valueOf(2776));
config.setPriorityFlag((byte) 0);
config.setProtocolId((byte) 1);
config.setRegisteredDelivery(SMSCDeliveryReceipt.DEFAULT.value());
@@ -235,7 +235,7 @@ public class SmppConfigurationTest {
config.setSourceAddrTon(TypeOfNumber.NATIONAL.value());
config.setSystemId("client");
config.setSystemType("xx");
- config.setTransactionTimer(new Integer(10001));
+ config.setTransactionTimer(Integer.valueOf(10001));
config.setEncoding("UTF-8");
config.setNumberingPlanIndicator(NumberingPlanIndicator.NATIONAL.value());
config.setTypeOfNumber(TypeOfNumber.NATIONAL.value());
@@ -243,7 +243,7 @@ public class SmppConfigurationTest {
config.setInitialReconnectDelay(5001);
config.setReconnectDelay(5002);
config.setHttpProxyHost("127.0.0.1");
- config.setHttpProxyPort(new Integer(3129));
+ config.setHttpProxyPort(Integer.valueOf(3129));
config.setHttpProxyUsername("user");
config.setHttpProxyPassword("secret");
config.setSessionStateListener(new SessionStateListener() {
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConnectionFactoryTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConnectionFactoryTest.java
index f190318..31229f0 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConnectionFactoryTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConnectionFactoryTest.java
@@ -52,7 +52,7 @@ public class SmppConnectionFactoryTest {
public void createConnectionWithProxyHost() throws IOException {
SmppConfiguration configuration = new SmppConfiguration();
configuration.setHttpProxyHost("localhost");
- configuration.setHttpProxyPort(new Integer(3128));
+ configuration.setHttpProxyPort(Integer.valueOf(3128));
SmppConnectionFactory factory =
SmppConnectionFactory.getInstance(configuration);
Connection connection = factory.createConnection("localhost", 2775);
@@ -71,7 +71,7 @@ public class SmppConnectionFactoryTest {
public void createConnectionWithProxyUsername() throws IOException {
SmppConfiguration configuration = new SmppConfiguration();
configuration.setHttpProxyHost("localhost");
- configuration.setHttpProxyPort(new Integer(3128));
+ configuration.setHttpProxyPort(Integer.valueOf(3128));
configuration.setHttpProxyUsername("user");
configuration.setHttpProxyPassword("secret");
SmppConnectionFactory factory =
SmppConnectionFactory.getInstance(configuration);
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 0d461f0d..09982ea 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
@@ -79,7 +79,7 @@ public class SmppConsumerTest {
TypeOfNumber.UNKNOWN,
NumberingPlanIndicator.UNKNOWN,
"");
- when(session.connectAndBind("localhost", new Integer(2775),
expectedBindParameter))
+ when(session.connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameter))
.thenReturn("1");
consumer.doStart();
@@ -88,7 +88,7 @@ public class SmppConsumerTest {
verify(session).setTransactionTimer(10000);
verify(session).addSessionStateListener(isA(SessionStateListener.class));
verify(session).setMessageReceiverListener(isA(MessageReceiverListener.class));
- verify(session).connectAndBind("localhost", new Integer(2775),
expectedBindParameter);
+ verify(session).connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameter);
}
@Test
@@ -125,14 +125,14 @@ public class SmppConsumerTest {
NumberingPlanIndicator.UNKNOWN,
"(111*|222*|333*)");
when(session.connectAndBind("localhost",
- new Integer(2775),
+ Integer.valueOf(2775),
expectedBindParameter))
.thenReturn("1");
consumer.doStart();
verify(session).connectAndBind("localhost",
- new Integer(2775),
+ Integer.valueOf(2775),
expectedBindParameter);
}
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 af73c04..6545b22 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
@@ -71,7 +71,7 @@ public class SmppProducerLazySessionCreationTest {
TypeOfNumber.UNKNOWN,
NumberingPlanIndicator.UNKNOWN,
"");
- when(session.connectAndBind("localhost", new Integer(2775),
expectedBindParameter))
+ when(session.connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameter))
.thenReturn("1");
when(endpoint.isSingleton()).thenReturn(true);
SmppBinding binding = mock(SmppBinding.class);
@@ -91,7 +91,7 @@ public class SmppProducerLazySessionCreationTest {
verify(session).setEnquireLinkTimer(5000);
verify(session).setTransactionTimer(10000);
verify(session).addSessionStateListener(isA(SessionStateListener.class));
- verify(session).connectAndBind("localhost", new Integer(2775),
expectedBindParameter);
+ verify(session).connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameter);
}
@Test
@@ -106,7 +106,7 @@ public class SmppProducerLazySessionCreationTest {
TypeOfNumber.UNKNOWN,
NumberingPlanIndicator.UNKNOWN,
"");
- when(session.connectAndBind("localhost", new Integer(2775),
expectedBindParameter))
+ when(session.connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameter))
.thenReturn("1");
SmppBinding binding = mock(SmppBinding.class);
Exchange exchange = mock(Exchange.class);
@@ -123,6 +123,6 @@ public class SmppProducerLazySessionCreationTest {
producer.doStart();
producer.process(exchange);
- verify(session).connectAndBind("localhost", new Integer(2775),
expectedBindParameter);
+ verify(session).connectAndBind("localhost", Integer.valueOf(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 473842b..6d093c8 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
@@ -70,7 +70,7 @@ public class SmppProducerTest {
TypeOfNumber.UNKNOWN,
NumberingPlanIndicator.UNKNOWN,
"");
- when(session.connectAndBind("localhost", new Integer(2775),
expectedBindParameters))
+ when(session.connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameters))
.thenReturn("1");
when(endpoint.isSingleton()).thenReturn(true);
@@ -79,7 +79,7 @@ public class SmppProducerTest {
verify(session).setEnquireLinkTimer(5000);
verify(session).setTransactionTimer(10000);
verify(session).addSessionStateListener(isA(SessionStateListener.class));
- verify(session).connectAndBind("localhost", new Integer(2775),
expectedBindParameters);
+ verify(session).connectAndBind("localhost", Integer.valueOf(2775),
expectedBindParameters);
}
@Test
