svn commit: r945982 - in /camel/trunk/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/SmppBinding.java test/java/org/apache/camel/component/smpp/SmppBindingTest.java

[ni...@apache.org]

Author: ningjiang
Date: Wed May 19 00:58:27 2010
New Revision: 945982

URL: http://svn.apache.org/viewvc?rev=945982&view=rev
Log:
CAMEL-2732 set the final status header for delivery notifications in camel-smpp component, applying patch with thanks to Jacov

Modified:
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java?rev=945982&r1=945981&r2=945982&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java Wed May 19 00:58:27 2010
@@ -63,6 +63,7 @@ public class SmppBinding {
     public static final String ESME_ADDR_NPI = "CamelSmppEsmeAddrNpi";
     public static final String ESME_ADDR_TON = "CamelSmppEsmeAddrTon";
     public static final String ESME_ADDR = "CamelSmppEsmeAddr";
+    public static final String FINAL_STATUS = "CamelSmppStatus";
 
     private static TimeFormatter timeFormatter = new AbsoluteTimeFormatter();
 
@@ -201,6 +202,7 @@ public class SmppBinding {
             }
             smppMessage.setHeader(SUBMIT_DATE, smscDeliveryReceipt.getSubmitDate());
             smppMessage.setHeader(SUBMITTED, smscDeliveryReceipt.getSubmitted());
+            smppMessage.setHeader(FINAL_STATUS, smscDeliveryReceipt.getFinalStatus());
         } else {
             smppMessage.setBody(String.valueOf(new String(deliverSm.getShortMessage(),
                     configuration.getEncoding())));

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java?rev=945982&r1=945981&r2=945982&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java (original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java Wed May 19 00:58:27 2010
@@ -27,6 +27,7 @@ import org.jsmpp.bean.DeliverSm;
 import org.jsmpp.bean.NumberingPlanIndicator;
 import org.jsmpp.bean.SubmitSm;
 import org.jsmpp.bean.TypeOfNumber;
+import org.jsmpp.util.DeliveryReceiptState;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -168,7 +169,7 @@ public class SmppBindingTest {
         SmppMessage smppMessage = binding.createSmppMessage(deliverSm);
         
         assertEquals("Hello SMPP world!", smppMessage.getBody());
-        assertEquals(6, smppMessage.getHeaders().size());
+        assertEquals(7, smppMessage.getHeaders().size());
         assertEquals("2", smppMessage.getHeader(SmppBinding.ID));
         assertEquals(1, smppMessage.getHeader(SmppBinding.DELIVERED));
         // To avoid the test failure when running in different TimeZone
@@ -176,6 +177,7 @@ public class SmppBindingTest {
         assertEquals("xxx", smppMessage.getHeader(SmppBinding.ERROR));
         //assertEquals(new Date(1251753000000L), smppMessage.getHeader(SmppBinding.SUBMIT_DATE));
         assertEquals(1, smppMessage.getHeader(SmppBinding.SUBMITTED));
+        assertEquals(DeliveryReceiptState.DELIVRD, smppMessage.getHeader(SmppBinding.FINAL_STATUS));
     }
     
     @Test