Add support for "String<any suffix>"-typed attribute values

Also tag the artifact version to help the build process.

Author: robin-aws

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>amazon-sqs-java-messaging-lib</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.6.receivenowait</version>
   <packaging>jar</packaging>
   <name>Amazon SQS Java Messaging Library</name>
   <description>The Amazon SQS Java Messaging Library holds the Java Message Service compatible classes, that are used

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

@@ -1192,9 +1192,7 @@ private static String getType(Object value) throws JMSException {
         }
 
         private static Object getObjectValue(String value, String type) throws JMSException {
-            if (STRING.equals(type) || NUMBER.equals(type)) {
-                return value;
-            } else if (INT.equals(type)) {
+            if (INT.equals(type)) {
                 return Integer.valueOf(value);
             } else if (LONG.equals(type)) {
                 return Long.valueOf(value);
@@ -1211,6 +1209,8 @@ private static Object getObjectValue(String value, String type) throws JMSExcept
                 return Float.valueOf(value);
             } else if (SHORT.equals(type)) {
                 return Short.valueOf(value);
+            } else if (type != null && (type.startsWith(STRING) || type.startsWith(NUMBER))) {
+                return value;
             } else {
                 throw new JMSException(type + " is not a supported JMS property type");
             }

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 myCustomString = "myCustomString";
     final String myNumber = "myNumber";
 
     @Before
@@ -326,6 +327,10 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
                                                     .withDataType(SQSMessagingClientConstants.STRING)
                                                     .withStringValue("StringValue"));
 
+        messageAttributes.put(myCustomString, new MessageAttributeValue()
+                                                    .withDataType(SQSMessagingClientConstants.NUMBER + ".custom")
+                                                    .withStringValue("['one', 'two']"));
+
         messageAttributes.put(myNumber, new MessageAttributeValue()
                                                     .withDataType(SQSMessagingClientConstants.NUMBER)
                                                     .withStringValue("500"));
@@ -374,6 +379,10 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         Assert.assertEquals(message.getObjectProperty(myString), "StringValue");
         Assert.assertEquals(message.getStringProperty(myString), "StringValue");
 
+        Assert.assertTrue(message.propertyExists(myCustomString));
+        Assert.assertEquals(message.getObjectProperty(myCustomString), "['one', 'two']");
+        Assert.assertEquals(message.getStringProperty(myCustomString), "['one', 'two']");
+
         Assert.assertTrue(message.propertyExists(myNumber));
         Assert.assertEquals(message.getObjectProperty(myNumber), "500");
         Assert.assertEquals(message.getStringProperty(myNumber), "500");
@@ -395,6 +404,7 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
                 myShort,
                 myByte,
                 myString,
+                myCustomString,
                 myNumber,
                 JMSX_DELIVERY_COUNT));