Merge pull request #71 from candrews/number

Add support for SQS messages with a "Type" of "Number"

Author: robin-aws

src/main/java/com/amazon/sqs/javamessaging/SQSMessagingClientConstants.java

@@ -36,6 +36,8 @@ public class SQSMessagingClientConstants {
      */
     public static final String STRING = "String";
 
+    public static final String NUMBER = "Number";
+
     public static final String INT = "Number.int";
 
     public static final String BOOLEAN = "Number.Boolean";

src/main/java/com/amazon/sqs/javamessaging/message/SQSMessage.java

@@ -1192,7 +1192,7 @@ private static String getType(Object value) throws JMSException {
         }
 
         private static Object getObjectValue(String value, String type) throws JMSException {
-            if (STRING.equals(type)) {
+            if (STRING.equals(type) || NUMBER.equals(type)) {
                 return value;
             } else if (INT.equals(type)) {
                 return Integer.valueOf(value);

src/test/java/com/amazon/sqs/javamessaging/message/SQSMessageTest.java

@@ -53,6 +53,7 @@ public class SQSMessageTest {
     final String myShort = "myShort";
     final String myByte = "myByte";
     final String myString = "myString";
+    final String myNumber = "myNumber";
 
     @Before
     public void setup() {
@@ -76,6 +77,7 @@ public void testProperty() throws JMSException {
         message.setShortProperty("myShort", (short) 123);
         message.setByteProperty("myByteProperty", (byte) 'a');
         message.setStringProperty("myString", "StringValue");
+        message.setStringProperty("myNumber", "500");
 
         Assert.assertTrue(message.propertyExists("myTrueBoolean"));
         Assert.assertEquals(message.getObjectProperty("myTrueBoolean"), true);
@@ -113,6 +115,15 @@ public void testProperty() throws JMSException {
         Assert.assertEquals(message.getObjectProperty("myString"), "StringValue");
         Assert.assertEquals(message.getStringProperty("myString"), "StringValue");
 
+        Assert.assertTrue(message.propertyExists("myNumber"));
+        Assert.assertEquals(message.getObjectProperty("myNumber"), "500");
+        Assert.assertEquals(message.getStringProperty("myNumber"), "500");
+        Assert.assertEquals(message.getLongProperty("myNumber"), 500L);
+        Assert.assertEquals(message.getFloatProperty("myNumber"), 500f);
+        Assert.assertEquals(message.getShortProperty("myNumber"), (short) 500);
+        Assert.assertEquals(message.getDoubleProperty("myNumber"), 500d);
+        Assert.assertEquals(message.getIntProperty("myNumber"), 500);
+
         // Validate property names
         Set<String> propertyNamesSet = new HashSet<String>(Arrays.asList(
                 "myTrueBoolean",
@@ -123,6 +134,7 @@ public void testProperty() throws JMSException {
                 "myLong",
                 "myShort",
                 "myByteProperty",
+                "myNumber",
                 "myString"));
 
         Enumeration<String > propertyNames = message.getPropertyNames();
@@ -142,6 +154,7 @@ public void testProperty() throws JMSException {
         Assert.assertFalse(message.propertyExists("myShort"));
         Assert.assertFalse(message.propertyExists("myByteProperty"));
         Assert.assertFalse(message.propertyExists("myString"));
+        Assert.assertFalse(message.propertyExists("myNumber"));
 
         propertyNames = message.getPropertyNames();
         assertFalse(propertyNames.hasMoreElements());
@@ -313,6 +326,10 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
                                                     .withDataType(SQSMessagingClientConstants.STRING)
                                                     .withStringValue("StringValue"));
 
+        messageAttributes.put(myNumber, new MessageAttributeValue()
+                                                    .withDataType(SQSMessagingClientConstants.NUMBER)
+                                                    .withStringValue("500"));
+
         com.amazonaws.services.sqs.model.Message sqsMessage = new com.amazonaws.services.sqs.model.Message()
                 .withMessageAttributes(messageAttributes)
                 .withAttributes(systemAttributes)
@@ -357,6 +374,15 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         Assert.assertEquals(message.getObjectProperty(myString), "StringValue");
         Assert.assertEquals(message.getStringProperty(myString), "StringValue");
 
+        Assert.assertTrue(message.propertyExists(myNumber));
+        Assert.assertEquals(message.getObjectProperty(myNumber), "500");
+        Assert.assertEquals(message.getStringProperty(myNumber), "500");
+        Assert.assertEquals(message.getIntProperty(myNumber), 500);
+        Assert.assertEquals(message.getShortProperty(myNumber), (short) 500);
+        Assert.assertEquals(message.getLongProperty(myNumber), 500l);
+        Assert.assertEquals(message.getFloatProperty(myNumber), 500f);
+        Assert.assertEquals(message.getDoubleProperty(myNumber), 500d);
+
 
         // Validate property names
         Set<String> propertyNamesSet = new HashSet<String>(Arrays.asList(
@@ -369,6 +395,7 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
                 myShort,
                 myByte,
                 myString,
+                myNumber,
                 JMSX_DELIVERY_COUNT));
 
         Enumeration<String > propertyNames = message.getPropertyNames();
@@ -388,8 +415,9 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         Assert.assertFalse(message.propertyExists("myShort"));
         Assert.assertFalse(message.propertyExists("myByteProperty"));
         Assert.assertFalse(message.propertyExists("myString"));
+        Assert.assertFalse(message.propertyExists("myNumber"));
 
         propertyNames = message.getPropertyNames();
         assertFalse(propertyNames.hasMoreElements());
     }
-}
+}