Adding @PreDestroy annotation to public facing shutdown methods

.gitignore

@@ -1 +1,5 @@
 /target/
+.idea
+.classpath
+.project
+*.iml

src/main/java/com/amazonaws/services/sqs/AmazonSQSRequester.java

@@ -1,12 +1,13 @@
 package com.amazonaws.services.sqs;
 
+import com.amazonaws.services.sqs.model.Message;
+import com.amazonaws.services.sqs.model.SendMessageRequest;
+
+import javax.annotation.PreDestroy;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.model.Message;
-import com.amazonaws.services.sqs.model.SendMessageRequest;
 
 public interface AmazonSQSRequester {
 
@@ -26,5 +27,6 @@ public Message sendMessageAndGetResponse(SendMessageRequest request,
     public CompletableFuture<Message> sendMessageAndGetResponseAsync(SendMessageRequest request, 
             int timeout, TimeUnit unit);
 
+    @PreDestroy
     public void shutdown();
 }

src/main/java/com/amazonaws/services/sqs/AmazonSQSRequesterClient.java

@@ -18,6 +18,8 @@
 import com.amazonaws.services.sqs.util.SQSMessageConsumer;
 import com.amazonaws.services.sqs.util.SQSQueueUtils;
 
+import javax.annotation.PreDestroy;
+
 /**
  * Implementation of the request/response interfaces that creates a single
  * temporary queue for each response message.
@@ -76,7 +78,7 @@ public CompletableFuture<Message> sendMessageAndGetResponseAsync(SendMessageRequ
         sqs.sendMessage(requestWithResponseUrl);
 
         CompletableFuture<Message> future = new CompletableFuture<>();
-        
+
         // TODO-RS: accept an AmazonSQSAsync instead and use its threads instead of our own.
         // TODO-RS: complete the future exceptionally, for the right set of SQS exceptions
         SQSMessageConsumer consumer = new ResponseListener(responseQueueUrl, future);
@@ -110,6 +112,7 @@ protected void runShutdownHook() {
     }
 
     @Override
+    @PreDestroy
     public void shutdown() {
         responseConsumers.forEach(SQSMessageConsumer::terminate);
         if (shutdownHook != null) {

src/main/java/com/amazonaws/services/sqs/AmazonSQSResponder.java

@@ -1,6 +1,6 @@
 package com.amazonaws.services.sqs;
 
-import com.amazonaws.services.sqs.AmazonSQS;
+import javax.annotation.PreDestroy;
 
 public interface AmazonSQSResponder {
 
@@ -21,5 +21,6 @@ public interface AmazonSQSResponder {
      */
     public void sendResponseMessage(MessageContent requestMessage, MessageContent response);
 
+    @PreDestroy
     public void shutdown();
 }

src/main/java/com/amazonaws/services/sqs/AmazonSQSResponderClient.java

@@ -7,6 +7,8 @@
 import com.amazonaws.services.sqs.model.QueueDoesNotExistException;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
 
+import javax.annotation.PreDestroy;
+
 class AmazonSQSResponderClient implements AmazonSQSResponder {
 
     private static final Log LOG = LogFactory.getLog(AmazonSQSResponderClient.class);
@@ -49,6 +51,7 @@ public boolean isResponseMessageRequested(MessageContent requestMessage) {
     }
 
     @Override
+    @PreDestroy
     public void shutdown() {
     }
 }

src/main/java/com/amazonaws/services/sqs/util/SQSMessageConsumer.java

@@ -11,6 +11,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
+import javax.annotation.PreDestroy;
+
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.model.Message;
 import com.amazonaws.services.sqs.model.QueueDoesNotExistException;
@@ -165,7 +167,8 @@ private void handleMessage(Message message) {
     protected void accept(Message message) {
         consumer.accept(message);
     }
-
+
+    @PreDestroy
     public void shutdown() {
         if (shuttingDown.compareAndSet(false, true)) {
             runShutdownHook();