Double isn't large enough to hold a SQS 'Number' so we need to leave it as a string, and potentially interpret on the outgoing side.

Author: bwynn

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

@@ -15,7 +15,6 @@
 package com.amazon.sqs.javamessaging.message;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Date;
 import java.util.Enumeration;
@@ -1217,7 +1216,7 @@ private static Object getObjectValue(String value, String type) throws JMSExcept
                 return Short.valueOf(value);
             } else if (NUMBER.equals(type)) {
             	// This may not be a JMS Type but it is a SQS Type, so we had better support it.
-            	return Double.valueOf(value);
+            	return value;
             } else {
                 throw new JMSException(type + " is not a supported JMS property type");
             }

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

@@ -46,6 +46,7 @@
 public class SQSMessageTest {
     private SQSSession mockSQSSession;
     final String myNumber = "myNumber";
+    final String myNumberOverflow = "myNumberOverflow";
     final String myBinary = "myBinary";
     final String myTrueBoolean = "myTrueBoolean";
     final String myFalseBoolean = "myFalseBoolean";
@@ -271,6 +272,8 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
 
         Acknowledger ack = mock(Acknowledger.class);
 
+        // 52 digits of value.
+        final String numberOverflowValue = "1234567890123456789012345678901234567890123456789012";
         final ByteBuffer binaryValue = ByteBuffer.wrap(new byte[] {(byte)0xDE, (byte)0xAD, (byte)0xBE, (byte)0xEF});
 
         Map<String,String> systemAttributes = new HashMap<String, String>();
@@ -282,6 +285,11 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         messageAttributes.put(myNumber, new MessageAttributeValue()
         		.withDataType(SQSMessagingClientConstants.NUMBER)
         		.withStringValue("4"));
+        
+        messageAttributes.put(myNumberOverflow, new MessageAttributeValue()
+        		.withDataType(SQSMessagingClientConstants.NUMBER)
+        		.withStringValue(numberOverflowValue));
+        
         messageAttributes.put(myBinary, new MessageAttributeValue()
         		.withDataType(SQSMessagingClientConstants.BINARY)
         		.withBinaryValue(binaryValue));
@@ -334,9 +342,25 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
 
         // SQS "Number" data type must use StringValue, may be a floating point number
         Assert.assertTrue(message.propertyExists(myNumber));
-        Assert.assertEquals(4.0, (double)message.getObjectProperty(myNumber), 0);
+        Assert.assertEquals("4", message.getObjectProperty(myNumber));
+        Assert.assertEquals("4", message.getStringProperty(myNumber));
+        Assert.assertEquals(4, message.getIntProperty(myNumber));
         Assert.assertEquals(4.0, message.getDoubleProperty(myNumber), 0);
 
+        // A Number can hold a value with quite a lot of significant digits, it must be represented as a StringValue,
+        // and can be interpreted as other things, but we should expect errors if the value overflows.
+        Assert.assertTrue(message.propertyExists(myNumberOverflow));
+        Assert.assertEquals(numberOverflowValue, message.getObjectProperty(myNumberOverflow));
+        Assert.assertEquals(numberOverflowValue, message.getStringProperty(myNumberOverflow));
+        // Expecting a loss of precision here when interpreted as a double.
+        Assert.assertEquals(1.23456789012345678E51, message.getDoubleProperty(myNumberOverflow), 0);
+        try {
+        	message.getIntProperty(myNumberOverflow);
+        	Assert.fail("message.getIntProperty did not throw a NumberFormatException");
+        } catch (NumberFormatException nfe) {
+        	Assert.assertEquals("For input string: \""+numberOverflowValue+"\"", nfe.getMessage());
+        }
+        
         Assert.assertTrue(message.propertyExists(myBinary));
         Assert.assertEquals(binaryValue, message.getObjectProperty(myBinary));
 
@@ -381,6 +405,7 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         Set<String> propertyNamesSet = new HashSet<String>(Arrays.asList(
         		myBinary,
         		myNumber,
+        		myNumberOverflow,
                 myTrueBoolean,
                 myFalseBoolean,
                 myInteger,