This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fc11e4bcc4f (chores) camel-smpp: remove duplicated result message logic
fc11e4bcc4f is described below
commit fc11e4bcc4f659de5a2a43a2e659f5251290008f
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Jul 25 12:20:57 2022 +0200
(chores) camel-smpp: remove duplicated result message logic
---
.../apache/camel/component/smpp/AbstractSmppCommand.java | 13 -------------
.../apache/camel/component/smpp/SmppCancelSmCommand.java | 3 ++-
.../org/apache/camel/component/smpp/SmppDataSmCommand.java | 3 ++-
.../org/apache/camel/component/smpp/SmppQuerySmCommand.java | 3 ++-
.../apache/camel/component/smpp/SmppReplaceSmCommand.java | 3 ++-
.../apache/camel/component/smpp/SmppSubmitMultiCommand.java | 3 ++-
.../apache/camel/component/smpp/SmppSubmitSmCommand.java | 3 ++-
.../camel/component/smpp/AbstractSmppCommandTest.java | 5 +++--
8 files changed, 15 insertions(+), 21 deletions(-)
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
index ada2b359f92..36a75bafc93 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
@@ -24,8 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.jsmpp.bean.OptionalParameter;
import org.jsmpp.bean.OptionalParameter.OctetString;
import org.jsmpp.bean.OptionalParameter.Tag;
@@ -45,17 +43,6 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
this.config = config;
}
- protected Message getResponseMessage(Exchange exchange) {
- Message message;
- if (exchange.getPattern().isOutCapable()) {
- message = exchange.getOut();
- } else {
- message = exchange.getIn();
- }
-
- return message;
- }
-
protected List<OptionalParameter>
createOptionalParametersByCode(Map<Short, Object> optinalParamaters) {
List<OptionalParameter> optParams = new ArrayList<>();
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppCancelSmCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppCancelSmCommand.java
index c38c844c296..93f85e7871a 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppCancelSmCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppCancelSmCommand.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.smpp;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.CancelSm;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.TypeOfNumber;
@@ -57,7 +58,7 @@ public class SmppCancelSmCommand extends AbstractSmppCommand {
exchange.getExchangeId(), cancelSm.getMessageId());
}
- Message message = getResponseMessage(exchange);
+ Message message = ExchangeHelper.getResultMessage(exchange);
message.setHeader(SmppConstants.ID, cancelSm.getMessageId());
}
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
index 0b0bc63b3b6..fec49264dec 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.DataCodings;
import org.jsmpp.bean.DataSm;
import org.jsmpp.bean.ESMClass;
@@ -76,7 +77,7 @@ public class SmppDataSmCommand extends AbstractSmppCommand {
exchange.getExchangeId(), result.getMessageId());
}
- Message message = getResponseMessage(exchange);
+ Message message = ExchangeHelper.getResultMessage(exchange);
message.setHeader(SmppConstants.ID, result.getMessageId());
message.setHeader(SmppConstants.OPTIONAL_PARAMETERS,
createOptionalParameterByName(result.getOptionalParameters()));
message.setHeader(SmppConstants.OPTIONAL_PARAMETER,
createOptionalParameterByCode(result.getOptionalParameters()));
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppQuerySmCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppQuerySmCommand.java
index 2cfc9f410bd..007fab610ab 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppQuerySmCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppQuerySmCommand.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.smpp;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.QuerySm;
import org.jsmpp.bean.TypeOfNumber;
@@ -55,7 +56,7 @@ public class SmppQuerySmCommand extends AbstractSmppCommand {
exchange.getExchangeId(), querySm.getMessageId());
}
- Message message = getResponseMessage(exchange);
+ Message message = ExchangeHelper.getResultMessage(exchange);
message.setHeader(SmppConstants.ID, querySm.getMessageId());
message.setHeader(SmppConstants.ERROR, querySmResult.getErrorCode());
message.setHeader(SmppConstants.FINAL_DATE,
SmppUtils.string2Date(querySmResult.getFinalDate()));
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppReplaceSmCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppReplaceSmCommand.java
index e98379316ce..9cfad5ccea5 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppReplaceSmCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppReplaceSmCommand.java
@@ -20,6 +20,7 @@ import java.util.Date;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.RegisteredDelivery;
import org.jsmpp.bean.ReplaceSm;
@@ -64,7 +65,7 @@ public class SmppReplaceSmCommand extends SmppSmCommand {
exchange.getExchangeId(), replaceSm.getMessageId());
}
- Message rspMsg = getResponseMessage(exchange);
+ Message rspMsg = ExchangeHelper.getResultMessage(exchange);
rspMsg.setHeader(SmppConstants.ID, replaceSm.getMessageId());
}
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
index 4e5f1108017..44afc390641 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.Address;
import org.jsmpp.bean.DataCodings;
import org.jsmpp.bean.ESMClass;
@@ -113,7 +114,7 @@ public class SmppSubmitMultiCommand extends SmppSmCommand {
messageIDs.add(result.getMessageId());
}
- Message message = getResponseMessage(exchange);
+ Message message = ExchangeHelper.getResultMessage(exchange);
message.setHeader(SmppConstants.ID, messageIDs);
message.setHeader(SmppConstants.SENT_MESSAGE_COUNT, messageIDs.size());
if (!errors.isEmpty()) {
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
index dc9faa9d3ad..32614944f8e 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.DataCodings;
import org.jsmpp.bean.ESMClass;
import org.jsmpp.bean.GSMSpecificFeature;
@@ -86,7 +87,7 @@ public class SmppSubmitSmCommand extends SmppSmCommand {
exchange.getExchangeId(), messageIDs);
}
- Message message = getResponseMessage(exchange);
+ Message message = ExchangeHelper.getResultMessage(exchange);
message.setHeader(SmppConstants.ID, messageIDs);
message.setHeader(SmppConstants.SENT_MESSAGE_COUNT, messageIDs.size());
}
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 00fe9fdc9c1..2eb19be3bff 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
@@ -21,6 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
+import org.apache.camel.support.ExchangeHelper;
import org.jsmpp.bean.OptionalParameter;
import org.jsmpp.bean.OptionalParameter.Tag;
import org.jsmpp.session.SMPPSession;
@@ -58,7 +59,7 @@ public class AbstractSmppCommandTest {
Exchange inOnlyExchange = new DefaultExchange(new
DefaultCamelContext(), ExchangePattern.InOnly);
Exchange inOutExchange = new DefaultExchange(new
DefaultCamelContext(), ExchangePattern.InOut);
- assertSame(command.getResponseMessage(inOnlyExchange),
inOnlyExchange.getIn());
+ assertSame(ExchangeHelper.getResultMessage(inOnlyExchange),
inOnlyExchange.getIn());
/*
NOTE: in this test it's important to call the methods in this order:
1. command.getResponseMessage
@@ -68,7 +69,7 @@ public class AbstractSmppCommandTest {
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 expectedMessage =
ExchangeHelper.getResultMessage(inOutExchange);
Message verificationMessage = inOutExchange.getMessage();
assertSame(expectedMessage, verificationMessage);
