Support receiving message attributes with types of the form Binary or Binary.

Author: ziyanli-amazon

README.md

@@ -15,15 +15,15 @@ for communicating with Amazon Simple Queue Service. This project builds on top o
   <dependency>
     <groupId>com.amazonaws</groupId>
     <artifactId>amazon-sqs-java-messaging-lib</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <type>jar</type>
   </dependency>
 ```
 * **Further information** - Read the [API documentation](http://aws.amazon.com/documentation/sqs/).
 
 ## Feedback
 * Give us feedback [here](https://github.com/awslabs/amazon-sqs-java-messaging-lib/issues).
-* If you'd like to contribute a new feature or bug fix, we'd love to see Github pull requests from you.
+* If you'd like to contribute a new feature or bug fix, we'd love to see GitHub pull requests from you.
 
 
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.amazonaws</groupId>
     <artifactId>amazon-sqs-java-messaging-lib</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <name>Amazon SQS Java Messaging Library</name>
     <description>The Amazon SQS Java Messaging Library holds the Java Message Service compatible classes, that are used
         for communicating with Amazon Simple Queue Service.
@@ -30,8 +30,9 @@
         </developer>
     </developers>
     <properties>
-        <aws-java-sdk.version>2.21.21</aws-java-sdk.version>
+        <aws-java-sdk.version>2.29.24</aws-java-sdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <dependencies>
@@ -54,7 +55,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.13</version>
         </dependency>
         <dependency>
             <groupId>jakarta.jms</groupId>
@@ -64,13 +65,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.1</version>
+            <version>5.10.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.24.2</version>
+            <version>3.26.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -52,6 +52,8 @@ public class SQSMessagingClientConstants {
 
     public static final String SHORT = "Number.short";
 
+    public static final String BINARY = "Binary";
+
     public static final String INT_FALSE = "0";
 
     public static final String INT_TRUE = "1";

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

@@ -23,6 +23,7 @@
 import jakarta.jms.Message;
 import jakarta.jms.MessageFormatException;
 import jakarta.jms.MessageNotWriteableException;
+import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
 import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 
@@ -34,8 +35,11 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static com.amazon.sqs.javamessaging.SQSMessagingClientConstants.APPROXIMATE_RECEIVE_COUNT;
+import static com.amazon.sqs.javamessaging.SQSMessagingClientConstants.BINARY;
 import static com.amazon.sqs.javamessaging.SQSMessagingClientConstants.BOOLEAN;
 import static com.amazon.sqs.javamessaging.SQSMessagingClientConstants.BYTE;
 import static com.amazon.sqs.javamessaging.SQSMessagingClientConstants.DOUBLE;
@@ -77,6 +81,7 @@
  */
 public class SQSMessage implements Message {
 
+    private static final Logger LOG = LoggerFactory.getLogger(SQSMessage.class);
     private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
     // Define constant message types.
@@ -1051,9 +1056,12 @@ 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))) {
+            } else if (type != null &&
+                    (type.startsWith(STRING) || type.startsWith(NUMBER) || type.startsWith(BINARY))) {
                 return value;
             } else {
+                LOG.debug("Caught exception while constructing message attribute. " +
+                        "Unknown or yet supported JMS property type - " + type);
                 throw new JMSException(type + " is not a supported JMS property type");
             }
         }

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

@@ -23,6 +23,7 @@
 import jakarta.jms.MessageNotWriteableException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
 import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 
@@ -60,6 +61,8 @@ public class SQSMessageTest {
     final String myString = "myString";
     final String myCustomString = "myCustomString";
     final String myNumber = "myNumber";
+    final String myBinary = "myBinary";
+    final String myCustomBinary = "myCustomBinary";
 
     @BeforeEach
     public void setup() {
@@ -321,6 +324,17 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
                 .stringValue("500")
                 .build());
 
+        messageAttributes.put(myBinary, MessageAttributeValue.builder()
+                .dataType(SQSMessagingClientConstants.BINARY)
+                .stringValue("BQUZTR1ZzYkc4PQ==")
+                .build());
+
+        messageAttributes.put(myCustomBinary, MessageAttributeValue.builder()
+                .dataType(SQSMessagingClientConstants.BINARY + ".custom")
+                .stringValue("data:image/gif;base64,QABAAACAkQBADs=")
+                .binaryValue(SdkBytes.fromUtf8String("data:image/gif;base64,QABAAACAkQBADs="))
+                .build());
+
         software.amazon.awssdk.services.sqs.model.Message sqsMessage = software.amazon.awssdk.services.sqs.model.Message.builder()
                 .messageAttributes(messageAttributes)
                 .attributes(systemAttributes)
@@ -379,6 +393,12 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         assertEquals(message.getFloatProperty(myNumber), 500f, 0.0);
         assertEquals(message.getDoubleProperty(myNumber), 500d, 0.0);
 
+        assertTrue(message.propertyExists(myBinary));
+        assertEquals(message.getObjectProperty(myBinary), "BQUZTR1ZzYkc4PQ==");
+        assertEquals(message.getStringProperty(myBinary), "BQUZTR1ZzYkc4PQ==");
+        assertTrue(message.propertyExists(myCustomBinary));
+        assertEquals(message.getObjectProperty(myCustomBinary), "data:image/gif;base64,QABAAACAkQBADs=");
+        assertEquals(message.getStringProperty(myCustomBinary), "data:image/gif;base64,QABAAACAkQBADs=");
 
         // Validate property names
         Set<String> propertyNamesSet = Set.of(
@@ -393,6 +413,8 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
                 myString,
                 myCustomString,
                 myNumber,
+                myBinary,
+                myCustomBinary,
                 JMSX_DELIVERY_COUNT);
 
         Enumeration<String> propertyNames = message.getPropertyNames();
@@ -413,6 +435,8 @@ public void testSQSMessageAttributeToProperty() throws JMSException {
         assertFalse(message.propertyExists("myByteProperty"));
         assertFalse(message.propertyExists("myString"));
         assertFalse(message.propertyExists("myNumber"));
+        assertFalse(message.propertyExists("myBinary"));
+        assertFalse(message.propertyExists("myCustomBinary"));
 
         propertyNames = message.getPropertyNames();
         assertFalse(propertyNames.hasMoreElements());