chore: organize code

.github/workflows/maven.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [8, 11, 15, 16, 17]
+        java-version: [8, 11, 17]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [8, 11, 15, 16, 17]
+        java-version: [8, 11, 17]
     needs: [build]
     steps:
       - uses: actions/checkout@v3
@@ -91,7 +91,7 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
       - name: Build and analyze
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=amazon-sns-java-messaging-lib -Dsonar.organization=mvallim -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=amazon-sns-java-messaging-lib -Dsonar.organization=mvallim -Dsonar.host.url=https://sonarcloud.io -Dssonar.token=$SONAR_TOKEN
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

README.md

@@ -17,7 +17,7 @@ Combine multiple requests to optimally utilise the network.
 
 Article [Martin Fowler](https://martinfowler.com) [Request Batch](https://martinfowler.com/articles/patterns-of-distributed-systems/request-batch.html)
 
-_**Compatible JDK 8, 11, 15, 16 and 17**_
+_**Compatible JDK 8, 11 and 17**_
 
 _**Compatible AWS JDK v1 >= 1.12**_
 

amazon-sns-java-messaging-lib-template/src/test/java/com/amazon/sns/messaging/core/AmazonSnsThreadPoolExecutorTest.java → amazon-sns-java-messaging-lib-template/src/test/java/com/amazon/sns/messaging/lib/core/AmazonSnsThreadPoolExecutorTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.core;
+package com.amazon.sns.messaging.lib.core;
 
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -25,8 +25,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.amazon.sns.messaging.lib.core.AmazonSnsThreadPoolExecutor;
-
 // @formatter:off
 class AmazonSnsThreadPoolExecutorTest {
 

amazon-sns-java-messaging-lib-template/src/test/java/com/amazon/sns/messaging/model/RequestEntryTest.java → amazon-sns-java-messaging-lib-template/src/test/java/com/amazon/sns/messaging/lib/model/RequestEntryTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.amazon.sns.messaging.model;
+package com.amazon.sns.messaging.lib.model;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -24,8 +24,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.amazon.sns.messaging.lib.model.RequestEntry;
-
 // @formatter:off
 class RequestEntryTest {
 

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

@@ -22,7 +22,7 @@
 import com.amazonaws.services.sns.model.MessageAttributeValue;
 
 // @formatter:off
-public class MessageAttributes extends AbstractMessageAttributes<MessageAttributeValue> {
+class MessageAttributes extends AbstractMessageAttributes<MessageAttributeValue> {
 
   @Override
   protected MessageAttributeValue getEnumMessageAttribute(final Enum<?> value) {

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

@@ -23,7 +23,7 @@
 import software.amazon.awssdk.services.sns.model.MessageAttributeValue;
 
 // @formatter:off
-public class MessageAttributes extends AbstractMessageAttributes<MessageAttributeValue> {
+class MessageAttributes extends AbstractMessageAttributes<MessageAttributeValue> {
 
   @Override
   protected MessageAttributeValue getEnumMessageAttribute(final Enum<?> value) {

pom.xml

@@ -10,8 +10,6 @@
 	<name>amazon-sns-java-messaging-lib</name>
 
 	<properties>
-		<java.version>8</java.version>
-
 		<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -38,7 +36,10 @@
 		<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
 
 		<sonar.coverage.exclusions>
-			**/amazon-sns-java-messaging-lib-template/**,
+			**/AbstractAmazonSnsConsumer.**,
+			**/AbstractAmazonSnsProducer.**,
+			**/ListenableFuture.**,
+			**/ListenableFutureRegistry.**,
 			**/package-info.**,
 			**/ConsumerHelper.**,
 			**/generated-sources/**,
@@ -311,7 +312,10 @@
 						<format>XML</format>
 					</formats>
 					<excludes>
-						<exclude>**/amazon-sns-java-messaging-lib-template/**</exclude>
+						<exclude>**/AbstractAmazonSnsConsumer.**</exclude>
+						<exclude>**/AbstractAmazonSnsProducer.**</exclude>
+						<exclude>**/ListenableFuture.**</exclude>
+						<exclude>**/ListenableFutureRegistry.**</exclude>
 						<exclude>**/package-info.**</exclude>
 						<exclude>**/ConsumerHelper.**</exclude>
 						<exclude>**/generated-sources/**</exclude>
@@ -362,6 +366,33 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>8</id>
+			<activation>
+				<jdk>1.8</jdk>
+			</activation>
+			<properties>
+				<java.version>8</java.version>
+			</properties>
+		</profile>
+		<profile>
+			<id>11</id>
+			<activation>
+				<jdk>11</jdk>
+			</activation>
+			<properties>
+				<java.version>11</java.version>
+			</properties>
+		</profile>
+		<profile>
+			<id>17</id>
+			<activation>
+				<jdk>17</jdk>
+			</activation>
+			<properties>
+				<java.version>17</java.version>
+			</properties>
+		</profile>
 		<profile>
 			<id>code-ql</id>
 			<build>