Skip to content

Commit 41f5c1d

Browse files
armogurarmogur
committed
Organize imports and replace * with explicit imports.
Rename variable in SQSConnection.
1 parent c9be3aa commit 41f5c1d

40 files changed

+405
-189
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
target/
2+
.idea/

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,21 @@
2525
import software.amazon.awssdk.awscore.exception.AwsServiceException;
2626
import software.amazon.awssdk.core.exception.SdkException;
2727
import software.amazon.awssdk.services.sqs.SqsClient;
28-
import software.amazon.awssdk.services.sqs.model.*;
28+
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityBatchRequest;
29+
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityBatchResponse;
30+
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityRequest;
31+
import software.amazon.awssdk.services.sqs.model.CreateQueueRequest;
32+
import software.amazon.awssdk.services.sqs.model.CreateQueueResponse;
33+
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequest;
34+
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchResponse;
35+
import software.amazon.awssdk.services.sqs.model.DeleteMessageRequest;
36+
import software.amazon.awssdk.services.sqs.model.GetQueueUrlRequest;
37+
import software.amazon.awssdk.services.sqs.model.GetQueueUrlResponse;
38+
import software.amazon.awssdk.services.sqs.model.QueueDoesNotExistException;
39+
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
40+
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
41+
import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
42+
import software.amazon.awssdk.services.sqs.model.SendMessageResponse;
2943

3044
import java.util.Set;
3145

‎src/main/java/com/amazon/sqs/javamessaging/SQSConnection.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
*/
1515
package com.amazon.sqs.javamessaging;
1616

17-
import java.util.Collections;
18-
import java.util.Set;
19-
import java.util.concurrent.ConcurrentHashMap;
20-
21-
import jakarta.jms.IllegalStateException;
17+
import com.amazon.sqs.javamessaging.acknowledge.AcknowledgeMode;
2218
import jakarta.jms.Connection;
2319
import jakarta.jms.ConnectionConsumer;
2420
import jakarta.jms.ConnectionMetaData;
2521
import jakarta.jms.Destination;
2622
import jakarta.jms.ExceptionListener;
23+
import jakarta.jms.IllegalStateException;
2724
import jakarta.jms.InvalidClientIDException;
2825
import jakarta.jms.JMSException;
2926
import jakarta.jms.Queue;
@@ -32,14 +29,14 @@
3229
import jakarta.jms.ServerSessionPool;
3330
import jakarta.jms.Session;
3431
import jakarta.jms.Topic;
35-
3632
import org.slf4j.Logger;
3733
import org.slf4j.LoggerFactory;
38-
39-
import com.amazon.sqs.javamessaging.acknowledge.AcknowledgeMode;
40-
4134
import software.amazon.awssdk.services.sqs.SqsClient;
4235

36+
import java.util.Collections;
37+
import java.util.Set;
38+
import java.util.concurrent.ConcurrentHashMap;
39+
4340
/**
4441
* This is a logical connection entity, which encapsulates the logic to create
4542
* sessions.
@@ -167,7 +164,7 @@ public QueueSession createQueueSession(boolean transacted, int acknowledgeMode)
167164
*
168165
* @param transacted
169166
* Only false is supported.
170-
* @param sessionMode
167+
* @param acknowledgeMode
171168
* Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>,
172169
* <code>Session.CLIENT_ACKNOWLEDGE</code>,
173170
* <code>Session.DUPS_OK_ACKNOWLEDGE</code>, and
@@ -179,19 +176,19 @@ public QueueSession createQueueSession(boolean transacted, int acknowledgeMode)
179176
* transaction and acknowledge mode.
180177
*/
181178
@Override
182-
public Session createSession(boolean transacted, int sessionMode) throws JMSException {
179+
public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException {
183180
checkClosed();
184181
actionOnConnectionTaken = true;
185-
if (transacted || sessionMode == Session.SESSION_TRANSACTED)
182+
if (transacted || acknowledgeMode == Session.SESSION_TRANSACTED)
186183
throw new JMSException("SQSSession does not support transacted");
187184

188185
SQSSession sqsSession;
189-
if (sessionMode == Session.AUTO_ACKNOWLEDGE) {
190-
sqsSession = new SQSSession(this, AcknowledgeMode.ACK_AUTO.withOriginalAcknowledgeMode(sessionMode));
191-
} else if (sessionMode == Session.CLIENT_ACKNOWLEDGE || sessionMode == Session.DUPS_OK_ACKNOWLEDGE) {
192-
sqsSession = new SQSSession(this, AcknowledgeMode.ACK_RANGE.withOriginalAcknowledgeMode(sessionMode));
193-
} else if (sessionMode == SQSSession.UNORDERED_ACKNOWLEDGE) {
194-
sqsSession = new SQSSession(this, AcknowledgeMode.ACK_UNORDERED.withOriginalAcknowledgeMode(sessionMode));
186+
if (acknowledgeMode == Session.AUTO_ACKNOWLEDGE) {
187+
sqsSession = new SQSSession(this, AcknowledgeMode.ACK_AUTO.withOriginalAcknowledgeMode(acknowledgeMode));
188+
} else if (acknowledgeMode == Session.CLIENT_ACKNOWLEDGE || acknowledgeMode == Session.DUPS_OK_ACKNOWLEDGE) {
189+
sqsSession = new SQSSession(this, AcknowledgeMode.ACK_RANGE.withOriginalAcknowledgeMode(acknowledgeMode));
190+
} else if (acknowledgeMode == SQSSession.UNORDERED_ACKNOWLEDGE) {
191+
sqsSession = new SQSSession(this, AcknowledgeMode.ACK_UNORDERED.withOriginalAcknowledgeMode(acknowledgeMode));
195192
} else {
196193
LOG.error("Unrecognized acknowledgeMode. Cannot create Session.");
197194
throw new JMSException("Unrecognized acknowledgeMode. Cannot create Session.");

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@
1414
*/
1515
package com.amazon.sqs.javamessaging;
1616

17-
import jakarta.jms.*;
17+
import jakarta.jms.ConnectionFactory;
18+
import jakarta.jms.JMSContext;
19+
import jakarta.jms.JMSException;
20+
import jakarta.jms.JMSRuntimeException;
21+
import jakarta.jms.QueueConnection;
22+
import jakarta.jms.QueueConnectionFactory;
1823
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
1924
import software.amazon.awssdk.auth.credentials.AwsCredentials;
2025
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;

‎src/main/java/com/amazon/sqs/javamessaging/SQSMessageConsumer.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,25 @@
1414
*/
1515
package com.amazon.sqs.javamessaging;
1616

17-
import java.util.List;
18-
import java.util.Set;
19-
import java.util.concurrent.ExecutorService;
20-
import java.util.concurrent.Executors;
21-
import java.util.concurrent.ThreadFactory;
22-
import java.util.concurrent.TimeUnit;
23-
17+
import com.amazon.sqs.javamessaging.acknowledge.Acknowledger;
18+
import com.amazon.sqs.javamessaging.acknowledge.NegativeAcknowledger;
19+
import com.amazon.sqs.javamessaging.acknowledge.SQSMessageIdentifier;
2420
import jakarta.jms.IllegalStateException;
2521
import jakarta.jms.JMSException;
2622
import jakarta.jms.Message;
2723
import jakarta.jms.MessageConsumer;
2824
import jakarta.jms.MessageListener;
2925
import jakarta.jms.Queue;
3026
import jakarta.jms.QueueReceiver;
31-
3227
import org.slf4j.Logger;
3328
import org.slf4j.LoggerFactory;
3429

35-
import com.amazon.sqs.javamessaging.acknowledge.Acknowledger;
36-
import com.amazon.sqs.javamessaging.acknowledge.NegativeAcknowledger;
37-
import com.amazon.sqs.javamessaging.acknowledge.SQSMessageIdentifier;
30+
import java.util.List;
31+
import java.util.Set;
32+
import java.util.concurrent.ExecutorService;
33+
import java.util.concurrent.Executors;
34+
import java.util.concurrent.ThreadFactory;
35+
import java.util.concurrent.TimeUnit;
3836

3937
/**
4038
* A client uses a MessageConsumer object to receive messages from a

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

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@
1414
*/
1515
package com.amazon.sqs.javamessaging;
1616

17-
import java.util.ArrayDeque;
18-
import java.util.ArrayList;
19-
import java.util.Collections;
20-
import java.util.Iterator;
21-
import java.util.List;
22-
import java.util.Map;
23-
import java.util.Set;
24-
import java.util.UUID;
25-
26-
import jakarta.jms.Destination;
27-
import jakarta.jms.JMSException;
28-
import jakarta.jms.MessageListener;
29-
30-
import org.slf4j.Logger;
31-
import org.slf4j.LoggerFactory;
32-
3317
import com.amazon.sqs.javamessaging.acknowledge.Acknowledger;
3418
import com.amazon.sqs.javamessaging.acknowledge.NegativeAcknowledger;
3519
import com.amazon.sqs.javamessaging.acknowledge.SQSMessageIdentifier;
@@ -38,13 +22,26 @@
3822
import com.amazon.sqs.javamessaging.message.SQSObjectMessage;
3923
import com.amazon.sqs.javamessaging.message.SQSTextMessage;
4024
import com.amazon.sqs.javamessaging.util.ExponentialBackoffStrategy;
41-
25+
import jakarta.jms.Destination;
26+
import jakarta.jms.JMSException;
27+
import jakarta.jms.MessageListener;
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
4230
import software.amazon.awssdk.services.sqs.model.Message;
4331
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
4432
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
4533
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest.Builder;
4634
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
4735

36+
import java.util.ArrayDeque;
37+
import java.util.ArrayList;
38+
import java.util.Collections;
39+
import java.util.Iterator;
40+
import java.util.List;
41+
import java.util.Map;
42+
import java.util.Set;
43+
import java.util.UUID;
44+
4845
/**
4946
* Used internally to prefetch messages to internal buffer on a background
5047
* thread for better <code>receive</code> turn around times.

‎src/main/java/com/amazon/sqs/javamessaging/SQSMessageProducer.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,16 @@
1919
import com.amazon.sqs.javamessaging.message.SQSMessage.JMSMessagePropertyValue;
2020
import com.amazon.sqs.javamessaging.message.SQSObjectMessage;
2121
import com.amazon.sqs.javamessaging.message.SQSTextMessage;
22+
import jakarta.jms.CompletionListener;
23+
import jakarta.jms.Destination;
2224
import jakarta.jms.IllegalStateException;
23-
import jakarta.jms.*;
25+
import jakarta.jms.InvalidDestinationException;
26+
import jakarta.jms.JMSException;
27+
import jakarta.jms.Message;
28+
import jakarta.jms.MessageFormatException;
29+
import jakarta.jms.MessageProducer;
30+
import jakarta.jms.Queue;
31+
import jakarta.jms.QueueSender;
2432
import org.slf4j.Logger;
2533
import org.slf4j.LoggerFactory;
2634
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;

‎src/main/java/com/amazon/sqs/javamessaging/SQSSession.java‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,38 @@
2323
import com.amazon.sqs.javamessaging.message.SQSObjectMessage;
2424
import com.amazon.sqs.javamessaging.message.SQSTextMessage;
2525
import com.amazon.sqs.javamessaging.util.SQSMessagingClientThreadFactory;
26+
import jakarta.jms.BytesMessage;
27+
import jakarta.jms.Destination;
2628
import jakarta.jms.IllegalStateException;
29+
import jakarta.jms.JMSException;
30+
import jakarta.jms.MapMessage;
31+
import jakarta.jms.Message;
32+
import jakarta.jms.MessageConsumer;
33+
import jakarta.jms.MessageListener;
34+
import jakarta.jms.MessageProducer;
35+
import jakarta.jms.ObjectMessage;
2736
import jakarta.jms.Queue;
28-
import jakarta.jms.*;
37+
import jakarta.jms.QueueBrowser;
38+
import jakarta.jms.QueueReceiver;
39+
import jakarta.jms.QueueSender;
40+
import jakarta.jms.QueueSession;
41+
import jakarta.jms.Session;
42+
import jakarta.jms.StreamMessage;
43+
import jakarta.jms.TemporaryQueue;
44+
import jakarta.jms.TemporaryTopic;
45+
import jakarta.jms.TextMessage;
46+
import jakarta.jms.Topic;
47+
import jakarta.jms.TopicSubscriber;
2948
import org.slf4j.Logger;
3049
import org.slf4j.LoggerFactory;
3150

3251
import java.io.Serializable;
33-
import java.util.*;
52+
import java.util.Collections;
53+
import java.util.HashMap;
54+
import java.util.HashSet;
55+
import java.util.List;
56+
import java.util.Map;
57+
import java.util.Set;
3458
import java.util.concurrent.ConcurrentHashMap;
3559
import java.util.concurrent.ExecutorService;
3660
import java.util.concurrent.Executors;

‎src/main/java/com/amazon/sqs/javamessaging/SQSSessionCallbackScheduler.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,26 @@
1414
*/
1515
package com.amazon.sqs.javamessaging;
1616

17-
import java.util.ArrayDeque;
18-
import java.util.ArrayList;
19-
import java.util.Collections;
20-
import java.util.Iterator;
21-
import java.util.List;
22-
import java.util.Map;
23-
import java.util.Set;
24-
25-
import jakarta.jms.JMSException;
26-
import jakarta.jms.MessageListener;
27-
import jakarta.jms.Session;
28-
29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
31-
3217
import com.amazon.sqs.javamessaging.SQSMessageConsumerPrefetch.MessageManager;
3318
import com.amazon.sqs.javamessaging.SQSSession.CallbackEntry;
3419
import com.amazon.sqs.javamessaging.acknowledge.AcknowledgeMode;
3520
import com.amazon.sqs.javamessaging.acknowledge.Acknowledger;
3621
import com.amazon.sqs.javamessaging.acknowledge.NegativeAcknowledger;
3722
import com.amazon.sqs.javamessaging.acknowledge.SQSMessageIdentifier;
3823
import com.amazon.sqs.javamessaging.message.SQSMessage;
24+
import jakarta.jms.JMSException;
25+
import jakarta.jms.MessageListener;
26+
import jakarta.jms.Session;
27+
import org.slf4j.Logger;
28+
import org.slf4j.LoggerFactory;
29+
30+
import java.util.ArrayDeque;
31+
import java.util.ArrayList;
32+
import java.util.Collections;
33+
import java.util.Iterator;
34+
import java.util.List;
35+
import java.util.Map;
36+
import java.util.Set;
3937

4038
/**
4139
* Used internally to guarantee serial execution of message processing on

‎src/main/java/com/amazon/sqs/javamessaging/acknowledge/Acknowledger.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
*/
1515
package com.amazon.sqs.javamessaging.acknowledge;
1616

17-
import java.util.List;
18-
17+
import com.amazon.sqs.javamessaging.message.SQSMessage;
1918
import jakarta.jms.JMSException;
2019

21-
import com.amazon.sqs.javamessaging.message.SQSMessage;
20+
import java.util.List;
2221

2322
public interface Acknowledger {
2423

0 commit comments

Comments
 (0)