Upgrade to SDK v2

Author: ziyanli-amazon

pom.xml

@@ -33,38 +33,35 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>bom</artifactId>
-        <version>${aws-java-sdk.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sqs</artifactId>
+      <version>${aws-java-sdk.version}</version>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>auth</artifactId>
+      <version>${aws-java-sdk.version}</version>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>utils</artifactId>
+      <version>${aws-java-sdk.version}</version>
     </dependency>
 
 	<dependency>
 	    <groupId>org.slf4j</groupId>
 	    <artifactId>slf4j-api</artifactId>
 	    <version>1.7.30</version>
 	</dependency>
-        
+
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.10.13</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>

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

@@ -49,8 +49,8 @@
 
 
 /**
- * This is a JMS Wrapper of <code>AmazonSQSClient</code>. This class changes all
- * <code>AmazonServiceException</code> and <code>AmazonClientException</code> into
+ * This is a JMS Wrapper of <code>SqsClient</code>. This class changes all
+ * <code>AwsServiceException</code> and <code>SdkException</code> into
  * JMSException/JMSSecurityException.
  */
 public class AmazonSQSMessagingClientWrapper {
@@ -61,7 +61,7 @@ public class AmazonSQSMessagingClientWrapper {
         /**
          * List of exceptions that can classified as security. These exceptions
          * are not thrown during connection-set-up rather after the service
-         * calls of the <code>AmazonSQSClient</code>.
+         * calls of the <code>SqsClient</code>.
          */
         SECURITY_EXCEPTION_ERROR_CODES = new HashSet<String>();
         SECURITY_EXCEPTION_ERROR_CODES.add("MissingClientTokenId");
@@ -108,12 +108,12 @@ public SqsClient getAmazonSQSClient() {
     }
 
     /**
-     * Calls <code>deleteMessage</code> and wraps <code>AmazonClientException</code>. This is used to
+     * Calls <code>deleteMessage</code> and wraps <code>SdkException</code>. This is used to
      * acknowledge single messages, so that they can be deleted from SQS queue.
      * 
      * @param deleteMessageRequest
      *            Container for the necessary parameters to execute the
-     *            deleteMessage service method on AmazonSQS.
+     *            deleteMessage service method on SqsClient.
      * @throws JMSException
      */
     public void deleteMessage(DeleteMessageRequest deleteMessageRequest) throws JMSException {
@@ -127,16 +127,16 @@ public void deleteMessage(DeleteMessageRequest deleteMessageRequest) throws JMSE
 
     /**
      * Calls <code>deleteMessageBatch</code> and wraps
-     * <code>AmazonClientException</code>. This is used to acknowledge multiple
+     * <code>SdkException</code>. This is used to acknowledge multiple
      * messages on client_acknowledge mode, so that they can be deleted from SQS
      * queue.
      * 
      * @param deleteMessageBatchRequest
      *            Container for the necessary parameters to execute the
-     *            deleteMessageBatch service method on AmazonSQS. This is the
+     *            deleteMessageBatch service method on SqsClient. This is the
      *            batch version of deleteMessage. Max batch size is 10.
      * @return The response from the deleteMessageBatch service method, as
-     *         returned by AmazonSQS
+     *         returned by SqsClient
      * @throws JMSException
      */
     public DeleteMessageBatchResponse deleteMessageBatch(DeleteMessageBatchRequest deleteMessageBatchRequest) throws JMSException {
@@ -154,9 +154,9 @@ public DeleteMessageBatchResponse deleteMessageBatch(DeleteMessageBatchRequest d
      * 
      * @param sendMessageRequest
      *            Container for the necessary parameters to execute the
-     *            sendMessage service method on AmazonSQS.
+     *            sendMessage service method on SqsClient.
      * @return The response from the sendMessage service method, as returned by
-     *         AmazonSQS
+     *         SqsClient
      * @throws JMSException
      */
     public SendMessageResponse sendMessage(SendMessageRequest sendMessageRequest) throws JMSException {
@@ -225,7 +225,7 @@ public boolean queueExists(String queueName, String queueOwnerAccountId) throws
      * 
      * @param queueName
      * @return The response from the GetQueueUrl service method, as returned by
-     *         AmazonSQS, which will include queue`s URL
+     *         SqsClient, which will include queue`s URL
      * @throws JMSException
      */
     public GetQueueUrlResponse getQueueUrl(String queueName) throws JMSException {
@@ -241,7 +241,7 @@ public GetQueueUrlResponse getQueueUrl(String queueName) throws JMSException {
      * @param queueName
      * @param queueOwnerAccountId The AWS accountId of the account that created the queue
      * @return The response from the GetQueueUrl service method, as returned by
-     *         AmazonSQS, which will include queue`s URL
+     *         SqsClient, which will include queue`s URL
      * @throws JMSException
      */
     public GetQueueUrlResponse getQueueUrl(String queueName, String queueOwnerAccountId) throws JMSException {
@@ -253,13 +253,13 @@ public GetQueueUrlResponse getQueueUrl(String queueName, String queueOwnerAccoun
     }
 
     /**
-     * Calls <code>getQueueUrl</code> and wraps <code>AmazonClientException</code>
+     * Calls <code>getQueueUrl</code> and wraps <code>SdkException</code>
      * 
      * @param getQueueUrlRequest
      *            Container for the necessary parameters to execute the
-     *            getQueueUrl service method on AmazonSQS.
+     *            getQueueUrl service method on SqsClient.
      * @return The response from the GetQueueUrl service method, as returned by
-     *         AmazonSQS, which will include queue`s URL
+     *         SqsClient, which will include queue`s URL
      * @throws JMSException
      */
     public GetQueueUrlResponse getQueueUrl(GetQueueUrlRequest getQueueUrlRequest) throws JMSException {
@@ -273,11 +273,11 @@ public GetQueueUrlResponse getQueueUrl(GetQueueUrlRequest getQueueUrlRequest) th
 
     /**
      * Calls <code>createQueue</code> to create the queue with the default queue attributes,
-     * and wraps <code>AmazonClientException</code>
+     * and wraps <code>SdkException</code>
      * 
      * @param queueName
      * @return The response from the createQueue service method, as returned by
-     *         AmazonSQS. This call creates a new queue, or returns the URL of
+     *         SqsClient. This call creates a new queue, or returns the URL of
      *         an existing one.
      * @throws JMSException
      */
@@ -287,13 +287,13 @@ public CreateQueueResponse createQueue(String queueName) throws JMSException {
 
     /**
      * Calls <code>createQueue</code> to create the queue with the provided queue attributes
-     * if any, and wraps <code>AmazonClientException</code>
+     * if any, and wraps <code>SdkException</code>
      * 
      * @param createQueueRequest
      *            Container for the necessary parameters to execute the
-     *            createQueue service method on AmazonSQS.
+     *            createQueue service method on SqsClient.
      * @return The response from the createQueue service method, as returned by
-     *         AmazonSQS. This call creates a new queue, or returns the URL of
+     *         SqsClient. This call creates a new queue, or returns the URL of
      *         an existing one.
      * @throws JMSException
      */
@@ -307,16 +307,16 @@ public CreateQueueResponse createQueue(CreateQueueRequest createQueueRequest) th
     }
 
     /**
-     * Calls <code>receiveMessage</code> and wraps <code>AmazonClientException</code>. Used by
+     * Calls <code>receiveMessage</code> and wraps <code>SdkException</code>. Used by
      * {@link SQSMessageConsumerPrefetch} to receive up to minimum of
      * (<code>numberOfMessagesToPrefetch</code>,10) messages from SQS queue into consumer
      * prefetch buffers.
      * 
      * @param receiveMessageRequest
      *            Container for the necessary parameters to execute the
-     *            receiveMessage service method on AmazonSQS.
+     *            receiveMessage service method on SqsClient.
      * @return The response from the ReceiveMessage service method, as returned
-     *         by AmazonSQS.
+     *         by SqsClient.
      * @throws JMSException
      */    
     public ReceiveMessageResponse receiveMessage(ReceiveMessageRequest receiveMessageRequest) throws JMSException {
@@ -329,12 +329,12 @@ public ReceiveMessageResponse receiveMessage(ReceiveMessageRequest receiveMessag
     }
 
     /**
-     * Calls <code>changeMessageVisibility</code> and wraps <code>AmazonClientException</code>. This is 
+     * Calls <code>changeMessageVisibility</code> and wraps <code>SdkException</code>. This is
      * used to for negative acknowledge of a single message, so that messages can be received again without any delay.
      * 
      * @param changeMessageVisibilityRequest
      *            Container for the necessary parameters to execute the
-     *            changeMessageVisibility service method on AmazonSQS.
+     *            changeMessageVisibility service method on SqsClient.
      * @throws JMSException
      */
     public void changeMessageVisibility(ChangeMessageVisibilityRequest changeMessageVisibilityRequest) throws JMSException {
@@ -347,15 +347,15 @@ public void changeMessageVisibility(ChangeMessageVisibilityRequest changeMessage
     }
 
     /**
-     * Calls <code>changeMessageVisibilityBatch</code> and wraps <code>AmazonClientException</code>. This is
+     * Calls <code>changeMessageVisibilityBatch</code> and wraps <code>SdkException</code>. This is
      * used to for negative acknowledge of messages in batch, so that messages
      * can be received again without any delay.
      * 
      * @param changeMessageVisibilityBatchRequest
      *            Container for the necessary parameters to execute the
-     *            changeMessageVisibilityBatch service method on AmazonSQS.
+     *            changeMessageVisibilityBatch service method on SqsClient.
      * @return The response from the changeMessageVisibilityBatch service
-     *         method, as returned by AmazonSQS.
+     *         method, as returned by SqsClient.
      * @throws JMSException
      */
     public ChangeMessageVisibilityBatchResponse changeMessageVisibilityBatch(ChangeMessageVisibilityBatchRequest changeMessageVisibilityBatchRequest)
@@ -369,7 +369,7 @@ public ChangeMessageVisibilityBatchResponse changeMessageVisibilityBatch(ChangeM
     }
 
     /**
-     * Create generic error message for <code>AmazonServiceException</code>. Message include
+     * Create generic error message for <code>AwsServiceException</code>. Message include
      * Action, RequestId, HTTPStatusCode, and AmazonErrorCode.
      */
     private String logAndGetAmazonServiceException(AwsServiceException ase, String action) {
@@ -380,7 +380,7 @@ private String logAndGetAmazonServiceException(AwsServiceException ase, String a
     }
 
     /**
-     * Create generic error message for <code>AmazonClientException</code>. Message include
+     * Create generic error message for <code>SdkException</code>. Message include
      * Action.
      */
     private String logAndGetAmazonClientException(SdkException ace, String action) {
@@ -412,8 +412,7 @@ private JMSException handleException(SdkException e, String operationName) throw
         return jmsException;
     }
 
-    private static String errorCode(AwsServiceException e)
-    {
+    private static String errorCode(AwsServiceException e) {
     	return e.awsErrorDetails() != null ? e.awsErrorDetails().errorCode() : "";
     }
 
@@ -423,9 +422,7 @@ private static boolean isJMSSecurityException(AwsServiceException e) {
     }
 
     private void prepareRequest(AwsRequest request) {
-    	
-    	if(credentialsProvider != null)
-    	{
+    	if(credentialsProvider != null) {
     		request = request.toBuilder().overrideConfiguration(AwsRequestOverrideConfiguration
     				.builder()
     				.credentialsProvider(credentialsProvider)

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

@@ -30,7 +30,7 @@
 
 /**
  * A ConnectionFactory object encapsulates a set of connection configuration
- * parameters for <code>AmazonSQSClient</code> as well as setting
+ * parameters for <code>SqsClient</code> as well as setting
  * <code>numberOfMessagesToPrefetch</code>.
  * <P>
  * The <code>numberOfMessagesToPrefetch</code> parameter is used to size of the
@@ -40,7 +40,7 @@
  * <P>
  * If more physical connections than the default maximum value (that is 50 as of
  * today) are needed on the connection pool,
- * {@link com.amazonaws.ClientConfiguration} needs to be configured.
+ * {@link software.amazon.awssdk.core.client.config.ClientOverrideConfiguration} needs to be configured.
  * <P>
  * None of the <code>createConnection</code> methods set-up the physical
  * connection to SQS, so validity of credentials are not checked with those
@@ -54,16 +54,16 @@ public class SQSConnectionFactory implements ConnectionFactory, QueueConnectionF
     /*
 
     /*
-     * Creates a SQSConnectionFactory that uses AmazonSQSClientBuilder.standard() for creating AmazonSQS client connections.
-     * Every SQSConnection will have its own copy of AmazonSQS client.
+     * Creates a SQSConnectionFactory that uses SqsClientBuilder.standard() for creating SqsClient connections.
+     * Every SQSConnection will have its own copy of SqsClient.
      */
     public SQSConnectionFactory(ProviderConfiguration providerConfiguration) {
         this(providerConfiguration, SqsClient.create());
     }
 
     /*
-     * Creates a SQSConnectionFactory that uses the provided AmazonSQS client connection.
-     * Every SQSConnection will use the same provided AmazonSQS client.
+     * Creates a SQSConnectionFactory that uses the provided SqsClient connection.
+     * Every SQSConnection will use the same provided SqsClient.
      */
     public SQSConnectionFactory(ProviderConfiguration providerConfiguration, final SqsClient client) {
         if (providerConfiguration == null) {
@@ -82,7 +82,7 @@ public SqsClient get() {
     }
 
     /*
-     * Creates a SQSConnectionFactory that uses the provided AmazonSQSClientBuilder for creating AmazonSQS client connections.
+     * Creates a SQSConnectionFactory that uses the provided SqsClientBuilder for creating AmazonSQS client connections.
      * Every SQSConnection will have its own copy of AmazonSQS client created through the provided builder.
      */
     public SQSConnectionFactory(ProviderConfiguration providerConfiguration, final SqsClientBuilder clientBuilder) {

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

@@ -56,7 +56,7 @@
  * <P>
  * Uses SQS <code>receiveMessage</code> with long-poll wait time of 20 seconds.
  * <P>
- * Add re-tries on top of <code>AmazonSQSClient</code> re-tries on SQS calls.
+ * Add re-tries on top of <code>SqsClient</code> re-tries on SQS calls.
  */
 public class SQSMessageConsumerPrefetch implements Runnable, PrefetchManager {
 

src/test/java/com/amazon/sqs/javamessaging/AcknowledgerCommon.java

@@ -14,8 +14,7 @@
  */
 package com.amazon.sqs.javamessaging;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -72,6 +71,6 @@ public void populateMessage(int populateMessageSize) throws JMSException {
             populatedMessages.add(message);
             acknowledger.notifyMessageReceived(message);
         }
-        org.junit.Assert.assertEquals(populateMessageSize, acknowledger.getUnAckMessages().size());
+        assertEquals(populateMessageSize, acknowledger.getUnAckMessages().size());
     }
 }

src/test/java/com/amazon/sqs/javamessaging/MessageListenerConcurrentOperationTest.java

@@ -288,8 +288,6 @@ public void verify() {
 
     public void testConcurrentExecution(final MessageListener msgListener, final ConcurrentOperation operation) throws JMSException, InterruptedException {
 
-        //long start = System.currentTimeMillis();
-
         // Start the session
         operation.setup();
 

src/test/java/com/amazon/sqs/javamessaging/SQSMessageConsumerPrefetchFifoTest.java

@@ -195,10 +195,27 @@ public boolean matches(Object argument) {
         for (SQSMessageConsumerPrefetch.MessageManager messageManager : consumerPrefetch.messageQueue) {
             Message mockedMessage = messages.get(index);
             SQSMessage sqsMessage = (SQSMessage)messageManager.getMessage();
-            assertEquals("Receipt handle is the same", mockedMessage.receiptHandle(), sqsMessage.getReceiptHandle());
-            assertEquals("Group id is the same", mockedMessage.attributes().get(MessageSystemAttributeName.fromValue(SQSMessagingClientConstants.MESSAGE_GROUP_ID)), sqsMessage.getStringProperty(SQSMessagingClientConstants.JMSX_GROUP_ID));
-            assertEquals("Sequence number is the same", mockedMessage.attributes().get(MessageSystemAttributeName.fromValue(SQSMessagingClientConstants.SEQUENCE_NUMBER)), sqsMessage.getStringProperty(SQSMessagingClientConstants.JMS_SQS_SEQUENCE_NUMBER));
-            assertEquals("Deduplication id is the same", mockedMessage.attributes().get(MessageSystemAttributeName.fromValue(SQSMessagingClientConstants.MESSAGE_DEDUPLICATION_ID)), sqsMessage.getStringProperty(SQSMessagingClientConstants.JMS_SQS_DEDUPLICATION_ID));
+            assertEquals(
+                    "Receipt handle is the same",
+                    mockedMessage.receiptHandle(), sqsMessage.getReceiptHandle());
+            assertEquals(
+                    "Group id is the same",
+                    mockedMessage
+                            .attributes()
+                            .get(MessageSystemAttributeName.fromValue(SQSMessagingClientConstants.MESSAGE_GROUP_ID)),
+                    sqsMessage.getStringProperty(SQSMessagingClientConstants.JMSX_GROUP_ID));
+            assertEquals(
+                    "Sequence number is the same",
+                    mockedMessage
+                            .attributes()
+                            .get(MessageSystemAttributeName.fromValue(SQSMessagingClientConstants.SEQUENCE_NUMBER)),
+                    sqsMessage.getStringProperty(SQSMessagingClientConstants.JMS_SQS_SEQUENCE_NUMBER));
+            assertEquals(
+                    "Deduplication id is the same",
+                    mockedMessage
+                            .attributes()
+                            .get(MessageSystemAttributeName.fromValue(SQSMessagingClientConstants.MESSAGE_DEDUPLICATION_ID)),
+                    sqsMessage.getStringProperty(SQSMessagingClientConstants.JMS_SQS_DEDUPLICATION_ID));
 
             index++;
         }