Skip to content

Commit bca973b

Browse files
authored
Merge pull request #156 from mvallim/develop
Auto-created pull request into `release/1.3.0` from `develop`
2 parents 1b6cae4 + b1d31c7 commit bca973b

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/AmazonSnsThreadPoolExecutor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import java.util.concurrent.ThreadPoolExecutor;
2121
import java.util.concurrent.TimeUnit;
2222

23-
// @formatter:off
2423
/**
2524
* A {@link ThreadPoolExecutor} configured for Amazon SNS publishing. Uses a
26-
* {@link SynchronousQueue} with zero core threads, allowing threads to be created
27-
* on demand up to the specified maximum pool size. Tasks that cannot be accepted
28-
* immediately by the queue will block up to 30 seconds via {@link BlockingSubmissionPolicy}.
25+
* {@link SynchronousQueue} with zero core threads, allowing threads to be
26+
* created on demand up to the specified maximum pool size. Tasks that cannot be
27+
* accepted immediately by the queue will block up to 30 seconds via
28+
* {@link BlockingSubmissionPolicy}.
2929
*/
3030
public class AmazonSnsThreadPoolExecutor extends ThreadPoolExecutor {
3131

amazon-sns-java-messaging-lib-v1/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public static <E> Builder<AmazonSNS, PublishBatchRequest, PublishBatchResult, E,
7777
* Creates a new v1 SNS template with default settings.
7878
*
7979
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} instead
80+
*
8081
* @param amazonSnsClient the v1 {@link AmazonSNS} client
8182
* @param topicProperty the topic configuration
8283
*/
@@ -91,6 +92,7 @@ public AmazonSnsTemplate(
9192
* Creates a new v1 SNS template with a custom publish decorator.
9293
*
9394
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} and {@link Builder#publishDecorator(UnaryOperator)} instead
95+
*
9496
* @param amazonSnsClient the v1 {@link AmazonSNS} client
9597
* @param topicProperty the topic configuration
9698
* @param publishDecorator a decorator for the publish batch request
@@ -107,6 +109,7 @@ public AmazonSnsTemplate(
107109
* Creates a new v1 SNS template with a custom topic request queue.
108110
*
109111
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} and {@link Builder#topicRequests(BlockingQueue)} instead
112+
*
110113
* @param amazonSnsClient the v1 {@link AmazonSNS} client
111114
* @param topicProperty the topic configuration
112115
* @param topicRequests the blocking queue for topic requests
@@ -123,6 +126,7 @@ public AmazonSnsTemplate(
123126
* Creates a new v1 SNS template with a custom queue and publish decorator.
124127
*
125128
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#publishDecorator(UnaryOperator)} instead
129+
*
126130
* @param amazonSnsClient the v1 {@link AmazonSNS} client
127131
* @param topicProperty the topic configuration
128132
* @param topicRequests the blocking queue for topic requests
@@ -141,6 +145,7 @@ public AmazonSnsTemplate(
141145
* Creates a new v1 SNS template with a custom ObjectMapper.
142146
*
143147
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} and {@link Builder#objectMapper(ObjectMapper)} instead
148+
*
144149
* @param amazonSnsClient the v1 {@link AmazonSNS} client
145150
* @param topicProperty the topic configuration
146151
* @param objectMapper the Jackson ObjectMapper for payload serialization
@@ -157,6 +162,7 @@ public AmazonSnsTemplate(
157162
* Creates a new v1 SNS template with a custom ObjectMapper and publish decorator.
158163
*
159164
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with {@link Builder#objectMapper(ObjectMapper)} and {@link Builder#publishDecorator(UnaryOperator)} instead
165+
*
160166
* @param amazonSnsClient the v1 {@link AmazonSNS} client
161167
* @param topicProperty the topic configuration
162168
* @param objectMapper the Jackson ObjectMapper for payload serialization
@@ -175,6 +181,7 @@ public AmazonSnsTemplate(
175181
* Creates a new v1 SNS template with a custom queue and ObjectMapper.
176182
*
177183
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#objectMapper(ObjectMapper)} instead
184+
*
178185
* @param amazonSnsClient the v1 {@link AmazonSNS} client
179186
* @param topicProperty the topic configuration
180187
* @param topicRequests the blocking queue for topic requests
@@ -193,6 +200,7 @@ public AmazonSnsTemplate(
193200
* Creates a new v1 SNS template with full custom configuration.
194201
*
195202
* @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with builder setters instead
203+
*
196204
* @param amazonSnsClient the v1 {@link AmazonSNS} client
197205
* @param topicProperty the topic configuration
198206
* @param topicRequests the blocking queue for topic requests

amazon-sns-java-messaging-lib-v2/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public static <E> Builder<SnsClient, PublishBatchRequest, PublishBatchResponse,
7878
* Creates a new v2 SNS template with default settings.
7979
*
8080
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} instead
81+
*
8182
* @param amazonSnsClient the v2 {@link SnsClient}
8283
* @param topicProperty the topic configuration
8384
*/
@@ -92,6 +93,7 @@ public AmazonSnsTemplate(
9293
* Creates a new v2 SNS template with a custom publish decorator.
9394
*
9495
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} and {@link Builder#publishDecorator(UnaryOperator)} instead
96+
*
9597
* @param amazonSnsClient the v2 {@link SnsClient}
9698
* @param topicProperty the topic configuration
9799
* @param publishDecorator a decorator for the publish batch request
@@ -108,6 +110,7 @@ public AmazonSnsTemplate(
108110
* Creates a new v2 SNS template with a custom topic request queue.
109111
*
110112
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} and {@link Builder#topicRequests(BlockingQueue)} instead
113+
*
111114
* @param amazonSnsClient the v2 {@link SnsClient}
112115
* @param topicProperty the topic configuration
113116
* @param topicRequests the blocking queue for topic requests
@@ -124,6 +127,7 @@ public AmazonSnsTemplate(
124127
* Creates a new v2 SNS template with a custom queue and publish decorator.
125128
*
126129
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#publishDecorator(UnaryOperator)} instead
130+
*
127131
* @param amazonSnsClient the v2 {@link SnsClient}
128132
* @param topicProperty the topic configuration
129133
* @param topicRequests the blocking queue for topic requests
@@ -142,6 +146,7 @@ public AmazonSnsTemplate(
142146
* Creates a new v2 SNS template with a custom ObjectMapper.
143147
*
144148
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} and {@link Builder#objectMapper(ObjectMapper)} instead
149+
*
145150
* @param amazonSnsClient the v2 {@link SnsClient}
146151
* @param topicProperty the topic configuration
147152
* @param objectMapper the Jackson ObjectMapper for payload serialization
@@ -158,6 +163,7 @@ public AmazonSnsTemplate(
158163
* Creates a new v2 SNS template with a custom ObjectMapper and publish decorator.
159164
*
160165
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with {@link Builder#objectMapper(ObjectMapper)} and {@link Builder#publishDecorator(UnaryOperator)} instead
166+
*
161167
* @param amazonSnsClient the v2 {@link SnsClient}
162168
* @param topicProperty the topic configuration
163169
* @param objectMapper the Jackson ObjectMapper for payload serialization
@@ -176,6 +182,7 @@ public AmazonSnsTemplate(
176182
* Creates a new v2 SNS template with a custom queue and ObjectMapper.
177183
*
178184
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#objectMapper(ObjectMapper)} instead
185+
*
179186
* @param amazonSnsClient the v2 {@link SnsClient}
180187
* @param topicProperty the topic configuration
181188
* @param topicRequests the blocking queue for topic requests
@@ -194,6 +201,7 @@ public AmazonSnsTemplate(
194201
* Creates a new v2 SNS template with full custom configuration.
195202
*
196203
* @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with builder setters instead
204+
*
197205
* @param amazonSnsClient the v2 {@link SnsClient}
198206
* @param topicProperty the topic configuration
199207
* @param topicRequests the blocking queue for topic requests

0 commit comments

Comments
 (0)