aws-powertools · eldimi · Nov 8, 2023 · Nov 8, 2023 · Nov 9, 2023 · Nov 9, 2023
diff --git a/.github/workflows/pr_artifacts_size.yml b/.github/workflows/pr_artifacts_size.yml
@@ -11,7 +11,8 @@ on:
       - 'powertools-core/**'              # not in v2
       - 'powertools-common/**'            # v2 only
       - 'powertools-e2e-tests/**'
-      - 'powertools-idempotency/**'
+      - 'powertools-idempotency-core/**'
+      - 'powertools-idempotency-dynamodb/**'
       - 'powertools-large-messages/**'
       - 'powertools-logging/**'
       - 'powertools-metrics/**'

diff --git a/docs/utilities/idempotency.md b/docs/utilities/idempotency.md
@@ -35,7 +35,7 @@ Depending on your version of Java (either Java 1.8 or 11+), the configuration sl
         ...
         <dependency>
             <groupId>software.amazon.lambda</groupId>
-            <artifactId>powertools-idempotency</artifactId>
+            <artifactId>powertools-idempotency-dynamodb</artifactId>
             <version>{{ powertools.version }}</version>
         </dependency>
         ...
@@ -56,7 +56,7 @@ Depending on your version of Java (either Java 1.8 or 11+), the configuration sl
                      <aspectLibraries>
                          <aspectLibrary>
                              <groupId>software.amazon.lambda</groupId>
-                             <artifactId>powertools-idempotency</artifactId>
+                             <artifactId>powertools-idempotency-dynamodb</artifactId>
                          </aspectLibrary>
                      </aspectLibraries>
                  </configuration>
@@ -80,7 +80,7 @@ Depending on your version of Java (either Java 1.8 or 11+), the configuration sl
         ...
         <dependency>
             <groupId>software.amazon.lambda</groupId>
-            <artifactId>powertools-idempotency</artifactId>
+            <artifactId>powertools-idempotency-dynamodb</artifactId>
             <version>{{ powertools.version }}</version>
         </dependency>
         ...
@@ -101,7 +101,7 @@ Depending on your version of Java (either Java 1.8 or 11+), the configuration sl
                      <aspectLibraries>
                          <aspectLibrary>
                              <groupId>software.amazon.lambda</groupId>
-                             <artifactId>powertools-idempotency</artifactId>
+                             <artifactId>powertools-idempotency-dynamodb</artifactId>
                          </aspectLibrary>
                      </aspectLibraries>
                  </configuration>
@@ -131,7 +131,7 @@ Depending on your version of Java (either Java 1.8 or 11+), the configuration sl
         }
 
         dependencies {
-            aspect 'software.amazon.lambda:powertools-idempotency:{{ powertools.version }}'
+            aspect 'software.amazon.lambda:powertools-idempotency-dynamodb:{{ powertools.version }}'
         }
 
         sourceCompatibility = 11 // or higher
@@ -151,7 +151,7 @@ Depending on your version of Java (either Java 1.8 or 11+), the configuration sl
         }
 
         dependencies {
-            aspect 'software.amazon.lambda:powertools-idempotency:{{ powertools.version }}'
+            aspect 'software.amazon.lambda:powertools-idempotency-dynamodb:{{ powertools.version }}'
         }
 
         sourceCompatibility = 1.8

diff --git a/examples/powertools-examples-idempotency/pom.xml b/examples/powertools-examples-idempotency/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
-            <artifactId>powertools-idempotency</artifactId>
+            <artifactId>powertools-idempotency-dynamodb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -117,7 +117,7 @@
                         </aspectLibrary>
                         <aspectLibrary>
                             <groupId>software.amazon.lambda</groupId>
-                            <artifactId>powertools-idempotency</artifactId>
+                            <artifactId>powertools-idempotency-dynamodb</artifactId>
                         </aspectLibrary>
                     </aspectLibraries>
                 </configuration>

diff --git a/examples/powertools-examples-idempotency/src/main/java/helloworld/App.java b/examples/powertools-examples-idempotency/src/main/java/helloworld/App.java
@@ -32,7 +32,7 @@
 import software.amazon.lambda.powertools.idempotency.Idempotency;
 import software.amazon.lambda.powertools.idempotency.IdempotencyConfig;
 import software.amazon.lambda.powertools.idempotency.Idempotent;
-import software.amazon.lambda.powertools.idempotency.persistence.DynamoDBPersistenceStore;
+import software.amazon.lambda.powertools.idempotency.persistence.dynamodb.DynamoDBPersistenceStore;
 import software.amazon.lambda.powertools.logging.Logging;
 import software.amazon.lambda.powertools.utilities.JsonConfig;
 

diff --git a/powertools-batch/pom.xml b/powertools-batch/pom.xml
@@ -25,6 +25,7 @@
     </build>
 
     <artifactId>powertools-batch</artifactId>
+
     <dependencies>
         <dependency>
             <groupId>com.amazonaws</groupId>

diff --git a/powertools-idempotency/pom.xml b/powertools-idempotency/pom.xml
@@ -25,34 +25,18 @@
     </parent>
 
     <artifactId>powertools-idempotency</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
 
     <name>Powertools for AWS Lambda (Java) library Idempotency</name>
     <description>
 
     </description>
-    <url>https://aws.amazon.com/lambda/</url>
-    <issueManagement>
-        <system>GitHub Issues</system>
-        <url>https://github.com/aws-powertools/powertools-lambda-java/issues</url>
-    </issueManagement>
-    <scm>
-        <url>https://github.com/aws-powertools/powertools-lambda-java.git</url>
-    </scm>
-    <developers>
-        <developer>
-            <name>Powertools for AWS Lambda team</name>
-            <organization>Amazon Web Services</organization>
-            <organizationUrl>https://aws.amazon.com/</organizationUrl>
-        </developer>
-    </developers>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
+
+    <modules>
+        <module>powertools-idempotency-core</module>
+        <module>powertools-idempotency-dynamodb</module>
+    </modules>
 
     <dependencies>
         <dependency>
@@ -67,20 +51,6 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>dynamodb</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>netty-nio-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>apache-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>url-connection-client</artifactId>
@@ -103,11 +73,6 @@
             <artifactId>junit-pioneer</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
@@ -128,20 +93,6 @@
             <artifactId>aws-lambda-java-tests</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>DynamoDBLocal</artifactId>
-            <version>[1.12,2.0)</version>
-            <scope>test</scope>
-        </dependency>
-        <!--Needed when building locally on M1 Mac-->
-        <dependency>
-            <groupId>io.github.ganadist.sqlite4java</groupId>
-            <artifactId>libsqlite4java-osx-aarch64</artifactId>
-            <version>1.0.392</version>
-            <scope>test</scope>
-            <type>dylib</type>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -172,22 +123,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>software.amazon.awssdk.enhanced.dynamodb</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/powertools-idempotency/powertools-idempotency-core/pom.xml b/powertools-idempotency/powertools-idempotency-core/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2023 Amazon.com, Inc. or its affiliates.
+  ~ Licensed under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>software.amazon.lambda</groupId>
+        <artifactId>powertools-idempotency</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>powertools-idempotency-core</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Powertools for AWS Lambda (Java) library Idempotency - Common</name>
+    <description>
+        Idempotency module common implementation
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-serialization</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>url-connection-client</artifactId>
+            <version>${aws.sdk.version}</version>
+        </dependency>
+        <!-- Test dependencies -->
+    </dependencies>
+</project>
diff --git a/...bda/powertools/idempotency/Constants.java → ...bda/powertools/idempotency/Constants.java b/...bda/powertools/idempotency/Constants.java → ...bda/powertools/idempotency/Constants.java
diff --git a/...a/powertools/idempotency/Idempotency.java → ...a/powertools/idempotency/Idempotency.java b/...a/powertools/idempotency/Idempotency.java → ...a/powertools/idempotency/Idempotency.java
diff --git a/...rtools/idempotency/IdempotencyConfig.java → ...rtools/idempotency/IdempotencyConfig.java b/...rtools/idempotency/IdempotencyConfig.java → ...rtools/idempotency/IdempotencyConfig.java
@@ -15,9 +15,10 @@
 package software.amazon.lambda.powertools.idempotency;
 
 import com.amazonaws.services.lambda.runtime.Context;
-import java.time.Duration;
 import software.amazon.lambda.powertools.idempotency.internal.cache.LRUCache;
 
+import java.time.Duration;
+
 /**
  * Configuration of the idempotency feature. Use the {@link Builder} to create an instance.
  */

diff --git a/...owertools/idempotency/IdempotencyKey.java → ...owertools/idempotency/IdempotencyKey.java b/...owertools/idempotency/IdempotencyKey.java → ...owertools/idempotency/IdempotencyKey.java
diff --git a/...da/powertools/idempotency/Idempotent.java → ...da/powertools/idempotency/Idempotent.java b/...da/powertools/idempotency/Idempotent.java → ...da/powertools/idempotency/Idempotent.java
@@ -15,6 +15,7 @@
 package software.amazon.lambda.powertools.idempotency;
 
 import com.amazonaws.services.lambda.runtime.Context;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...dempotencyAlreadyInProgressException.java → ...dempotencyAlreadyInProgressException.java b/...dempotencyAlreadyInProgressException.java → ...dempotencyAlreadyInProgressException.java
diff --git a/...ns/IdempotencyConfigurationException.java → ...ns/IdempotencyConfigurationException.java b/...ns/IdempotencyConfigurationException.java → ...ns/IdempotencyConfigurationException.java
diff --git a/...dempotencyInconsistentStateException.java → ...dempotencyInconsistentStateException.java b/...dempotencyInconsistentStateException.java → ...dempotencyInconsistentStateException.java
diff --git a/...dempotencyItemAlreadyExistsException.java → ...dempotencyItemAlreadyExistsException.java b/...dempotencyItemAlreadyExistsException.java → ...dempotencyItemAlreadyExistsException.java
diff --git a/...ons/IdempotencyItemNotFoundException.java → ...ons/IdempotencyItemNotFoundException.java b/...ons/IdempotencyItemNotFoundException.java → ...ons/IdempotencyItemNotFoundException.java
diff --git a/...y/exceptions/IdempotencyKeyException.java → ...y/exceptions/IdempotencyKeyException.java b/...y/exceptions/IdempotencyKeyException.java → ...y/exceptions/IdempotencyKeyException.java
diff --git a/...IdempotencyPersistenceLayerException.java → ...IdempotencyPersistenceLayerException.java b/...IdempotencyPersistenceLayerException.java → ...IdempotencyPersistenceLayerException.java
diff --git a/...tions/IdempotencyValidationException.java → ...tions/IdempotencyValidationException.java b/...tions/IdempotencyValidationException.java → ...tions/IdempotencyValidationException.java
diff --git a/...mpotency/internal/IdempotencyHandler.java → ...mpotency/internal/IdempotencyHandler.java b/...mpotency/internal/IdempotencyHandler.java → ...mpotency/internal/IdempotencyHandler.java
@@ -14,13 +14,8 @@
 
 package software.amazon.lambda.powertools.idempotency.internal;
 
-import static software.amazon.lambda.powertools.idempotency.persistence.DataRecord.Status.EXPIRED;
-import static software.amazon.lambda.powertools.idempotency.persistence.DataRecord.Status.INPROGRESS;
-
 import com.amazonaws.services.lambda.runtime.Context;
 import com.fasterxml.jackson.databind.JsonNode;
-import java.time.Instant;
-import java.util.OptionalInt;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
@@ -37,6 +32,12 @@
 import software.amazon.lambda.powertools.idempotency.persistence.DataRecord;
 import software.amazon.lambda.powertools.utilities.JsonConfig;
 
+import java.time.Instant;
+import java.util.OptionalInt;
+
+import static software.amazon.lambda.powertools.idempotency.persistence.DataRecord.Status.EXPIRED;
+import static software.amazon.lambda.powertools.idempotency.persistence.DataRecord.Status.INPROGRESS;
+
 /**
  * Internal class that will handle the Idempotency, and use the {@link software.amazon.lambda.powertools.idempotency.persistence.PersistenceStore}
  * to store the result of previous calls.

diff --git a/...dempotency/internal/IdempotentAspect.java → ...dempotency/internal/IdempotentAspect.java b/...dempotency/internal/IdempotentAspect.java → ...dempotency/internal/IdempotentAspect.java
@@ -14,12 +14,8 @@
 
 package software.amazon.lambda.powertools.idempotency.internal;
 
-import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.placedOnRequestHandler;
-
 import com.amazonaws.services.lambda.runtime.Context;
 import com.fasterxml.jackson.databind.JsonNode;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -33,6 +29,11 @@
 import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyConfigurationException;
 import software.amazon.lambda.powertools.utilities.JsonConfig;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.placedOnRequestHandler;
+
 /**
  * Aspect that handles the {@link Idempotent} annotation.
  * It uses the {@link IdempotencyHandler} to actually do the job.

diff --git a/.../idempotency/internal/cache/LRUCache.java → .../idempotency/internal/cache/LRUCache.java b/.../idempotency/internal/cache/LRUCache.java → .../idempotency/internal/cache/LRUCache.java
diff --git a/...ncy/persistence/BasePersistenceStore.java → ...ncy/persistence/BasePersistenceStore.java b/...ncy/persistence/BasePersistenceStore.java → ...ncy/persistence/BasePersistenceStore.java
@@ -14,12 +14,21 @@
 
 package software.amazon.lambda.powertools.idempotency.persistence;
 
-import static software.amazon.lambda.powertools.common.internal.LambdaConstants.LAMBDA_FUNCTION_NAME_ENV;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import io.burt.jmespath.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.utils.StringUtils;
+import software.amazon.lambda.powertools.idempotency.IdempotencyConfig;
+import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyItemAlreadyExistsException;
+import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyItemNotFoundException;
+import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyKeyException;
+import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyValidationException;
+import software.amazon.lambda.powertools.idempotency.internal.cache.LRUCache;
+import software.amazon.lambda.powertools.utilities.JsonConfig;
+
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -33,16 +42,8 @@
 import java.util.Spliterators;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.utils.StringUtils;
-import software.amazon.lambda.powertools.idempotency.IdempotencyConfig;
-import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyItemAlreadyExistsException;
-import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyItemNotFoundException;
-import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyKeyException;
-import software.amazon.lambda.powertools.idempotency.exceptions.IdempotencyValidationException;
-import software.amazon.lambda.powertools.idempotency.internal.cache.LRUCache;
-import software.amazon.lambda.powertools.utilities.JsonConfig;
+
+import static software.amazon.lambda.powertools.common.internal.LambdaConstants.LAMBDA_FUNCTION_NAME_ENV;
 
 /**
  * Persistence layer that will store the idempotency result.

diff --git a/...s/idempotency/persistence/DataRecord.java → ...s/idempotency/persistence/DataRecord.java b/...s/idempotency/persistence/DataRecord.java → ...s/idempotency/persistence/DataRecord.java
@@ -14,10 +14,11 @@
 
 package software.amazon.lambda.powertools.idempotency.persistence;
 
+import software.amazon.lambda.powertools.idempotency.IdempotencyConfig;
+
 import java.time.Instant;
 import java.util.Objects;
 import java.util.OptionalLong;
-import software.amazon.lambda.powertools.idempotency.IdempotencyConfig;
 
 /**
  * Data Class for idempotency records. This is actually the item that will be stored in the persistence layer.