Author: cmueller
Date: Tue Aug 31 21:24:08 2010
New Revision: 991338

URL: http://svn.apache.org/viewvc?rev=991338&view=rev
Log:
CAMEL-3093: camel-smpp shoud honor the configured encoding

Modified:
    
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
    
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
    
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
    
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.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=991338&r1=991337&r2=991338&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
 Tue Aug 31 21:24:08 2010
@@ -65,6 +65,7 @@ public class SmppBinding {
     public static final String ESME_ADDR_TON = "CamelSmppEsmeAddrTon";
     public static final String ESME_ADDR = "CamelSmppEsmeAddr";
     public static final String FINAL_STATUS = "CamelSmppStatus";
+    public static final String DATA_CODING = "CamelSmppDataCoding";
 
     private static TimeFormatter timeFormatter = new AbsoluteTimeFormatter();
 
@@ -162,6 +163,14 @@ public class SmppBinding {
         } else {
             
submitSm.setReplaceIfPresent(configuration.getReplaceIfPresentFlag());
         }
+        
+        if (in.getHeaders().containsKey(DATA_CODING)) {
+            System.out.println("1");
+            submitSm.setDataCoding((Byte) in.getHeader(DATA_CODING));
+        } else {
+            System.out.println("2");
+            submitSm.setDataCoding(configuration.getDataCoding());
+        }
 
         return submitSm;
     }
@@ -235,6 +244,7 @@ public class SmppBinding {
         smppMessage.setHeader(DEST_ADDR_TON, dataSm.getDestAddrTon());
         smppMessage.setHeader(SERVICE_TYPE, dataSm.getServiceType());
         smppMessage.setHeader(REGISTERED_DELIVERY, 
dataSm.getRegisteredDelivery());
+        smppMessage.setHeader(DATA_CODING, dataSm.getDataCoding());
 
         return smppMessage;
     }

Modified: 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java?rev=991338&r1=991337&r2=991338&view=diff
==============================================================================
--- 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
 (original)
+++ 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
 Tue Aug 31 21:24:08 2010
@@ -143,7 +143,7 @@ public class SmppProducer extends Defaul
                         false,
                         false,
                         MessageClass.CLASS1,
-                        Alphabet.valueOf(configuration.getDataCoding())),
+                        Alphabet.valueOf(submitSm.getDataCoding())),
                 (byte) 0,
                 submitSm.getShortMessage());
 

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=991338&r1=991337&r2=991338&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
 Tue Aug 31 21:24:08 2010
@@ -230,7 +230,7 @@ public class SmppBindingTest {
         SmppMessage smppMessage = binding.createSmppMessage(dataSm, "1");
         
         assertNull(smppMessage.getBody());
-        assertEquals(12, smppMessage.getHeaders().size());
+        assertEquals(13, smppMessage.getHeaders().size());
         assertEquals("1", smppMessage.getHeader(SmppBinding.ID));
         assertEquals(1, smppMessage.getHeader(SmppBinding.SEQUENCE_NUMBER));
         assertEquals(1, smppMessage.getHeader(SmppBinding.COMMAND_ID));
@@ -243,6 +243,7 @@ public class SmppBindingTest {
         assertEquals((byte) 2, 
smppMessage.getHeader(SmppBinding.DEST_ADDR_TON));
         assertEquals("WAP", smppMessage.getHeader(SmppBinding.SERVICE_TYPE));
         assertEquals((byte) 0, 
smppMessage.getHeader(SmppBinding.REGISTERED_DELIVERY));
+        assertEquals((byte) 0, smppMessage.getHeader(SmppBinding.DATA_CODING));
     }
 
     @Test

Modified: 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java?rev=991338&r1=991337&r2=991338&view=diff
==============================================================================
--- 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
 (original)
+++ 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
 Tue Aug 31 21:24:08 2010
@@ -109,6 +109,7 @@ public class SmppProducerTest {
         expect(submitSm.getRegisteredDelivery())
             .andReturn(SMSCDeliveryReceipt.SUCCESS_FAILURE.value());
         expect(submitSm.getReplaceIfPresent()).andReturn((byte) 0);
+        expect(submitSm.getDataCoding()).andReturn((byte) 0);
         expect(submitSm.getShortMessage()).andReturn("Hello SMPP 
world!".getBytes("ISO-8859-1"));
     }
     
@@ -261,7 +262,22 @@ public class SmppProducerTest {
         
expect(exchange.getExchangeId()).andReturn("ID-muellerc-macbookpro/3690-1214458315718/2-0");
         expect(endpoint.getBinding()).andReturn(binding);
         expect(binding.createSubmitSm(exchange)).andReturn(submitSm);
-        submitSmExpectations(exchange, binding, submitSm);
+        expect(submitSm.getServiceType()).andReturn("CMT");
+        
expect(submitSm.getSourceAddrTon()).andReturn(TypeOfNumber.UNKNOWN.value());
+        
expect(submitSm.getSourceAddrNpi()).andReturn(NumberingPlanIndicator.UNKNOWN.value());
+        expect(submitSm.getSourceAddr()).andReturn("1616");
+        
expect(submitSm.getDestAddrTon()).andReturn(TypeOfNumber.UNKNOWN.value());
+        
expect(submitSm.getDestAddrNpi()).andReturn(NumberingPlanIndicator.UNKNOWN.value());
+        expect(submitSm.getDestAddress()).andReturn("1717");
+        expect(submitSm.getProtocolId()).andReturn((byte) 0);
+        expect(submitSm.getPriorityFlag()).andReturn((byte) 1);
+        
expect(submitSm.getScheduleDeliveryTime()).andReturn("090830230627004+");
+        expect(submitSm.getValidityPeriod()).andReturn("090831232000004+");
+        expect(submitSm.getRegisteredDelivery())
+            .andReturn(SMSCDeliveryReceipt.SUCCESS_FAILURE.value());
+        expect(submitSm.getReplaceIfPresent()).andReturn((byte) 0);
+        expect(submitSm.getDataCoding()).andReturn((byte) 4);
+        expect(submitSm.getShortMessage()).andReturn("Hello SMPP 
world!".getBytes("ISO-8859-1"));
         expect(session.submitShortMessage(
                 eq("CMT"),
                 eq(TypeOfNumber.UNKNOWN),


Reply via email to