[2/2] git commit: CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e0f3ab7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e0f3ab7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e0f3ab7
Branch: refs/heads/camel-2.11.x
Commit: 0e0f3ab77f851970d560766df680c7b3e97c28b3
Parents: d281f3b
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 16:24:15 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 16:26:10 2013 +0200
--
.../camel/component/smpp/SmppDataSmCommand.java | 32 ++--
.../component/smpp/SmppDataSmCommandTest.java | 27 -
2 files changed, 56 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0e0f3ab7/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
--
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 a29a388..213af70 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
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.smpp;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -24,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.jsmpp.bean.DataCoding;
import org.jsmpp.bean.DataSm;
+import org.jsmpp.bean.DeliverSm;
import org.jsmpp.bean.ESMClass;
import org.jsmpp.bean.NumberingPlanIndicator;
import org.jsmpp.bean.OptionalParameter;
@@ -78,10 +80,11 @@ public class SmppDataSmCommand extends AbstractSmppCommand {
Message message = getResponseMessage(exchange);
message.setHeader(SmppConstants.ID, result.getMessageId());
-message.setHeader(SmppConstants.OPTIONAL_PARAMETERS,
getOptionalParametersAsMap(result.getOptionalParameters()));
+message.setHeader(SmppConstants.OPTIONAL_PARAMETERS,
createOptionalParameterByName(result.getOptionalParameters()));
+message.setHeader(SmppConstants.OPTIONAL_PARAMETER,
createOptionalParameterByCode(result.getOptionalParameters()));
}
-protected MapString, String
getOptionalParametersAsMap(OptionalParameter[] optionalParameters) {
+protected MapString, String
createOptionalParameterByName(OptionalParameter[] optionalParameters) {
if (optionalParameters == null) {
return null;
}
@@ -109,6 +112,31 @@ public class SmppDataSmCommand extends AbstractSmppCommand
{
return optParams;
}
+protected Mapjava.lang.Short, Object
createOptionalParameterByCode(OptionalParameter[] optionalParameters) {
+if (optionalParameters == null) {
+return null;
+}
+
+Mapjava.lang.Short, Object optParams = new HashMapjava.lang.Short,
Object();
+for (OptionalParameter optPara : optionalParameters) {
+if (COctetString.class.isInstance(optPara)) {
+optParams.put(java.lang.Short.valueOf(optPara.tag),
((COctetString) optPara).getValueAsString());
+} else if
(org.jsmpp.bean.OptionalParameter.OctetString.class.isInstance(optPara)) {
+optParams.put(java.lang.Short.valueOf(optPara.tag),
((OctetString) optPara).getValue());
+} else if
(org.jsmpp.bean.OptionalParameter.Byte.class.isInstance(optPara)) {
+optParams.put(java.lang.Short.valueOf(optPara.tag),
java.lang.Byte.valueOf(((org.jsmpp.bean.OptionalParameter.Byte)
optPara).getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Short.class.isInstance(optPara)) {
+optParams.put(java.lang.Short.valueOf(optPara.tag),
java.lang.Short.valueOf(((org.jsmpp.bean.OptionalParameter.Short)
optPara).getValue()));
+} else if
(org.jsmpp.bean.OptionalParameter.Int.class.isInstance(optPara)) {
+optParams.put(java.lang.Short.valueOf(optPara.tag),
Integer.valueOf(((org.jsmpp.bean.OptionalParameter.Int) optPara).getValue()));
+} else if (Null.class.isInstance(optPara)) {
+optParams.put(java.lang.Short.valueOf(optPara.tag), null);
+}
+}
+
+return optParams;
+}
+
@SuppressWarnings({unchecked})
protected DataSm createDataSm(Exchange exchange) {
Message in = exchange.getIn();
[1/2] git commit: CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Updated Branches:
refs/heads/camel-2.11.x f4b48fcf6 - 0e0f3ab77
CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d281f3bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d281f3bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d281f3bd
Branch: refs/heads/camel-2.11.x
Commit: d281f3bda920728835867ebe7658a11a1bd2d0b4
Parents: f4b48fc
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 15:41:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 16:25:53 2013 +0200
--
.../component/smpp/AbstractSmppCommand.java | 20 ++
.../camel/component/smpp/SmppBinding.java | 73 +++-
.../camel/component/smpp/SmppConstants.java | 3 +-
.../camel/component/smpp/SmppDataSmCommand.java | 14 ++--
.../component/smpp/SmppSubmitMultiCommand.java | 14 ++--
.../component/smpp/SmppSubmitSmCommand.java | 14 ++--
.../camel/component/smpp/SmppBindingTest.java | 15 +++-
.../component/smpp/SmppDataSmCommandTest.java | 2 +-
.../smpp/SmppSubmitMultiCommandTest.java| 2 +-
.../component/smpp/SmppSubmitSmCommandTest.java | 2 +-
10 files changed, 106 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d281f3bd/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
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 145ce46..c6ad202 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
@@ -55,20 +55,6 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
-@SuppressWarnings({ unchecked, rawtypes })
-protected ListOptionalParameter createOptionalParameters(Map
optinalParamaters) {
-if (optinalParamaters == null || optinalParamaters.isEmpty()) {
-return new ArrayListOptionalParameter();
-}
-
-Object firstKey = optinalParamaters.keySet().iterator().next();
-if (firstKey instanceof String) {
-return createOptionalParametersByName(optinalParamaters);
-} else {
-return createOptionalParametersByCode(optinalParamaters);
-}
-}
-
protected ListOptionalParameter
createOptionalParametersByCode(MapShort, Object optinalParamaters) {
ListOptionalParameter optParams = new ArrayListOptionalParameter();
@@ -104,8 +90,12 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return optParams;
}
+/**
+ * @deprecated will be removed in Camel 2.13.0/3.0.0 - use
createOptionalParametersByCode instead
+ * @param optinalParamaters
+ * @return
+ */
@SuppressWarnings(rawtypes)
-@Deprecated
protected ListOptionalParameter
createOptionalParametersByName(MapString, String optinalParamaters) {
ListOptionalParameter optParams = new ArrayListOptionalParameter();
http://git-wip-us.apache.org/repos/asf/camel/blob/d281f3bd/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
index 5c86c9c..c1a8a8e 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
@@ -106,26 +106,15 @@ public class SmppBinding {
smppMessage.setHeader(SmppConstants.SUBMIT_DATE,
smscDeliveryReceipt.getSubmitDate());
smppMessage.setHeader(SmppConstants.SUBMITTED,
smscDeliveryReceipt.getSubmitted());
smppMessage.setHeader(SmppConstants.FINAL_STATUS,
smscDeliveryReceipt.getFinalStatus());
+
if (deliverSm.getOptionalParametes() != null
deliverSm.getOptionalParametes().length 0) {
-ListOptionalParameter oplist =
Arrays.asList(deliverSm.getOptionalParametes());
+// the deprecated way
+MapString, Object optionalParameters =
createOptionalParameterByName(deliverSm);
+smppMessage.setHeader(SmppConstants.OPTIONAL_PARAMETERS,
optionalParameters);
-MapString, Object optParams = new
[2/3] git commit: CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8989fd3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8989fd3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8989fd3f
Branch: refs/heads/camel-2.10.x
Commit: 8989fd3fc7642d5e1f61bc13f176e1e6b92dd778
Parents: a027d7d
Author: cmueller cmuel...@apache.org
Authored: Sun Aug 25 15:41:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Aug 25 16:29:38 2013 +0200
--
.../component/smpp/AbstractSmppCommand.java | 20 ++
.../camel/component/smpp/SmppBinding.java | 73 +++-
.../camel/component/smpp/SmppConstants.java | 3 +-
.../camel/component/smpp/SmppDataSmCommand.java | 14 ++--
.../component/smpp/SmppSubmitMultiCommand.java | 14 ++--
.../component/smpp/SmppSubmitSmCommand.java | 14 ++--
.../camel/component/smpp/SmppBindingTest.java | 15 +++-
.../component/smpp/SmppDataSmCommandTest.java | 2 +-
.../smpp/SmppSubmitMultiCommandTest.java| 2 +-
.../component/smpp/SmppSubmitSmCommandTest.java | 2 +-
10 files changed, 106 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8989fd3f/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
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 145ce46..c6ad202 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
@@ -55,20 +55,6 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
-@SuppressWarnings({ unchecked, rawtypes })
-protected ListOptionalParameter createOptionalParameters(Map
optinalParamaters) {
-if (optinalParamaters == null || optinalParamaters.isEmpty()) {
-return new ArrayListOptionalParameter();
-}
-
-Object firstKey = optinalParamaters.keySet().iterator().next();
-if (firstKey instanceof String) {
-return createOptionalParametersByName(optinalParamaters);
-} else {
-return createOptionalParametersByCode(optinalParamaters);
-}
-}
-
protected ListOptionalParameter
createOptionalParametersByCode(MapShort, Object optinalParamaters) {
ListOptionalParameter optParams = new ArrayListOptionalParameter();
@@ -104,8 +90,12 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return optParams;
}
+/**
+ * @deprecated will be removed in Camel 2.13.0/3.0.0 - use
createOptionalParametersByCode instead
+ * @param optinalParamaters
+ * @return
+ */
@SuppressWarnings(rawtypes)
-@Deprecated
protected ListOptionalParameter
createOptionalParametersByName(MapString, String optinalParamaters) {
ListOptionalParameter optParams = new ArrayListOptionalParameter();
http://git-wip-us.apache.org/repos/asf/camel/blob/8989fd3f/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
--
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
index 5c86c9c..c1a8a8e 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
@@ -106,26 +106,15 @@ public class SmppBinding {
smppMessage.setHeader(SmppConstants.SUBMIT_DATE,
smscDeliveryReceipt.getSubmitDate());
smppMessage.setHeader(SmppConstants.SUBMITTED,
smscDeliveryReceipt.getSubmitted());
smppMessage.setHeader(SmppConstants.FINAL_STATUS,
smscDeliveryReceipt.getFinalStatus());
+
if (deliverSm.getOptionalParametes() != null
deliverSm.getOptionalParametes().length 0) {
-ListOptionalParameter oplist =
Arrays.asList(deliverSm.getOptionalParametes());
+// the deprecated way
+MapString, Object optionalParameters =
createOptionalParameterByName(deliverSm);
+smppMessage.setHeader(SmppConstants.OPTIONAL_PARAMETERS,
optionalParameters);
-MapString, Object optParams = new HashMapString, Object();
-for (OptionalParameter optPara :
git commit: CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Updated Branches:
refs/heads/master b5784ca0a - 6ff502f63
CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ff502f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ff502f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ff502f6
Branch: refs/heads/master
Commit: 6ff502f63c5dc60378de6998aae147d92e39b323
Parents: b5784ca
Author: cmueller cmuel...@apache.org
Authored: Sat Aug 24 23:23:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Aug 24 23:23:52 2013 +0200
--
.../component/smpp/AbstractSmppCommand.java | 52 ++-
.../component/smpp/SmppDataSmCommandTest.java | 66
.../smpp/SmppSubmitMultiCommandTest.java| 64 +++
.../component/smpp/SmppSubmitSmCommandTest.java | 63 +++
4 files changed, 244 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6ff502f6/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
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 54d93da..145ce46 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
@@ -55,8 +55,58 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
+@SuppressWarnings({ unchecked, rawtypes })
+protected ListOptionalParameter createOptionalParameters(Map
optinalParamaters) {
+if (optinalParamaters == null || optinalParamaters.isEmpty()) {
+return new ArrayListOptionalParameter();
+}
+
+Object firstKey = optinalParamaters.keySet().iterator().next();
+if (firstKey instanceof String) {
+return createOptionalParametersByName(optinalParamaters);
+} else {
+return createOptionalParametersByCode(optinalParamaters);
+}
+}
+
+protected ListOptionalParameter
createOptionalParametersByCode(MapShort, Object optinalParamaters) {
+ListOptionalParameter optParams = new ArrayListOptionalParameter();
+
+for (EntryShort, Object entry : optinalParamaters.entrySet()) {
+OptionalParameter optParam = null;
+Short key = entry.getKey();
+Object value = entry.getValue();
+
+try {
+if (value == null) {
+optParam = new OptionalParameter.Null(key);
+} else if (value instanceof byte[]) {
+optParam = new OptionalParameter.OctetString(key, (byte[])
value);
+} else if (value instanceof String) {
+optParam = new OptionalParameter.COctetString(key,
(String) value);
+} else if (value instanceof Byte) {
+optParam = new OptionalParameter.Byte(key, (Byte) value);
+} else if (value instanceof Integer) {
+optParam = new OptionalParameter.Int(key, (Integer) value);
+} else if (value instanceof Short) {
+optParam = new OptionalParameter.Short(key, (Short) value);
+} else {
+log.info(Couldn't determine optional parameter for value
{} (type: {}). Skip this one., value, value.getClass());
+continue;
+}
+
+optParams.add(optParam);
+} catch (Exception e) {
+log.info(Couldn't determine optional parameter for key {} and
value {}. Skip this one., key, value);
+}
+}
+
+return optParams;
+}
+
@SuppressWarnings(rawtypes)
-protected ListOptionalParameter createOptionalParameters(MapString,
String optinalParamaters) {
+@Deprecated
+protected ListOptionalParameter
createOptionalParametersByName(MapString, String optinalParamaters) {
ListOptionalParameter optParams = new ArrayListOptionalParameter();
for (EntryString, String entry : optinalParamaters.entrySet()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/6ff502f6/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
git commit: CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Updated Branches:
refs/heads/camel-2.11.x ecd725de1 - f4b48fcf6
CAMEL-6655: SMPP - add support of Vendor Specific Optional Parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4b48fcf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4b48fcf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4b48fcf
Branch: refs/heads/camel-2.11.x
Commit: f4b48fcf6becd70337d5b07305cddf531b6d4600
Parents: ecd725d
Author: cmueller cmuel...@apache.org
Authored: Sat Aug 24 23:23:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Aug 24 23:24:49 2013 +0200
--
.../component/smpp/AbstractSmppCommand.java | 52 ++-
.../component/smpp/SmppDataSmCommandTest.java | 66
.../smpp/SmppSubmitMultiCommandTest.java| 64 +++
.../component/smpp/SmppSubmitSmCommandTest.java | 63 +++
4 files changed, 244 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b48fcf/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/AbstractSmppCommand.java
--
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 54d93da..145ce46 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
@@ -55,8 +55,58 @@ public abstract class AbstractSmppCommand implements
SmppCommand {
return message;
}
+@SuppressWarnings({ unchecked, rawtypes })
+protected ListOptionalParameter createOptionalParameters(Map
optinalParamaters) {
+if (optinalParamaters == null || optinalParamaters.isEmpty()) {
+return new ArrayListOptionalParameter();
+}
+
+Object firstKey = optinalParamaters.keySet().iterator().next();
+if (firstKey instanceof String) {
+return createOptionalParametersByName(optinalParamaters);
+} else {
+return createOptionalParametersByCode(optinalParamaters);
+}
+}
+
+protected ListOptionalParameter
createOptionalParametersByCode(MapShort, Object optinalParamaters) {
+ListOptionalParameter optParams = new ArrayListOptionalParameter();
+
+for (EntryShort, Object entry : optinalParamaters.entrySet()) {
+OptionalParameter optParam = null;
+Short key = entry.getKey();
+Object value = entry.getValue();
+
+try {
+if (value == null) {
+optParam = new OptionalParameter.Null(key);
+} else if (value instanceof byte[]) {
+optParam = new OptionalParameter.OctetString(key, (byte[])
value);
+} else if (value instanceof String) {
+optParam = new OptionalParameter.COctetString(key,
(String) value);
+} else if (value instanceof Byte) {
+optParam = new OptionalParameter.Byte(key, (Byte) value);
+} else if (value instanceof Integer) {
+optParam = new OptionalParameter.Int(key, (Integer) value);
+} else if (value instanceof Short) {
+optParam = new OptionalParameter.Short(key, (Short) value);
+} else {
+log.info(Couldn't determine optional parameter for value
{} (type: {}). Skip this one., value, value.getClass());
+continue;
+}
+
+optParams.add(optParam);
+} catch (Exception e) {
+log.info(Couldn't determine optional parameter for key {} and
value {}. Skip this one., key, value);
+}
+}
+
+return optParams;
+}
+
@SuppressWarnings(rawtypes)
-protected ListOptionalParameter createOptionalParameters(MapString,
String optinalParamaters) {
+@Deprecated
+protected ListOptionalParameter
createOptionalParametersByName(MapString, String optinalParamaters) {
ListOptionalParameter optParams = new ArrayListOptionalParameter();
for (EntryString, String entry : optinalParamaters.entrySet()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b48fcf/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
