V1.10.0

actions/build.gradle

@@ -12,7 +12,7 @@ dependencies {
 	testImplementation project(':fkq-test-utils')
 	testImplementation project(':fkq-plugins')
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version:'5.9.1'
-	testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.17.3'	
+	testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.17.6'	
 }
 
 test {

actions/src/test/java/com/formkiq/module/actions/ActionsServiceDynamoDbTest.java

@@ -65,7 +65,7 @@ public class ActionsServiceDynamoDbTest {
   @BeforeAll
   public static void beforeAll() throws Exception {
 
-    DynamoDbConnectionBuilder db = DynamoDbTestServices.getDynamoDbConnection(null);
+    DynamoDbConnectionBuilder db = DynamoDbTestServices.getDynamoDbConnection();
     service = new ActionsServiceDynamoDb(db, DOCUMENTS_TABLE);
     documentService =
         new DocumentServiceImpl(db, DOCUMENTS_TABLE, new DocumentVersionServiceNoVersioning());

aws-cognito/build.gradle

@@ -2,9 +2,9 @@
 description = "AWS Cognito"
 
 dependencies {
-	api group: 'software.amazon.awssdk', name: 'cognitoidentity', version: '2.17.252'
-	api group: 'software.amazon.awssdk', name: 'cognitoidentityprovider', version: '2.17.252'
-	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.17.252'
+	api group: 'software.amazon.awssdk', name: 'cognitoidentity', version: '2.19.2'
+	api group: 'software.amazon.awssdk', name: 'cognitoidentityprovider', version: '2.19.2'
+	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.19.2'
 
 	configurations.all {
    		exclude group: 'software.amazon.awssdk', module: 'apache-client'

aws-dynamodb/build.gradle

@@ -2,9 +2,9 @@
 description = "AWS DynamoDB"
 
 dependencies {
-	api group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.17.252'
+	api group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.19.2'
 	implementation project(':fkq-lambda-services')
-	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.17.252'
+	implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.19.2'
     implementation group: 'com.formkiq', name: 'graalvm-annotations', version: '1.1.0'
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version:'5.9.1'

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbConnectionBuilder.java

@@ -24,7 +24,6 @@
 package com.formkiq.aws.dynamodb;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
@@ -100,12 +99,11 @@ public DynamoDbConnectionBuilder setCredentials(final String credentials) {
   /**
    * Set Endpoint Override.
    * 
-   * @param uri {@link String}
+   * @param uri {@link URI}
    * @return {@link DynamoDbConnectionBuilder}
-   * @throws URISyntaxException URISyntaxException
    */
-  public DynamoDbConnectionBuilder setEndpointOverride(final String uri) throws URISyntaxException {
-    this.builder = this.builder.endpointOverride(new URI(uri));
+  public DynamoDbConnectionBuilder setEndpointOverride(final URI uri) {
+    this.builder = this.builder.endpointOverride(uri);
     return this;
   }
 

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbService.java

@@ -23,9 +23,9 @@
  */
 package com.formkiq.aws.dynamodb;
 
-import java.util.List;
 import java.util.Map;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
 
 /**
  * 
@@ -71,9 +71,24 @@ public interface DynamoDbService {
    * Query DynamoDB Records.
    * 
    * @param pk {@link AttributeValue}
-   * @return {@link List} {@link Map}
+   * @param exclusiveStartKey {@link Map}
+   * @param limit int
+   * @return {@link QueryResponse}
    */
-  List<Map<String, AttributeValue>> query(AttributeValue pk);
+  QueryResponse query(AttributeValue pk, Map<String, AttributeValue> exclusiveStartKey, int limit);
+
+  /**
+   * Query DynamoDB Records.
+   * 
+   * @param config {@link QueryConfig}
+   * @param pk {@link AttributeValue}
+   * @param sk {@link AttributeValue}
+   * @param exclusiveStartKey {@link Map}
+   * @param limit int
+   * @return {@link QueryResponse}
+   */
+  QueryResponse queryBeginsWith(QueryConfig config, AttributeValue pk, AttributeValue sk,
+      Map<String, AttributeValue> exclusiveStartKey, int limit);
 
   /**
    * Update DynamoDB Record.

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbServiceImpl.java

@@ -26,7 +26,6 @@
 import static com.formkiq.aws.dynamodb.DbKeys.PK;
 import static com.formkiq.aws.dynamodb.DbKeys.SK;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
@@ -54,31 +53,31 @@ public class DynamoDbServiceImpl implements DynamoDbService {
   /**
    * constructor.
    * 
-   * @param connection {@link DynamoDbConnectionBuilder}
+   * @param client {@link DynamoDbClient}
    * @param dynamoDbTableName {@link String}
    */
-  public DynamoDbServiceImpl(final DynamoDbConnectionBuilder connection,
-      final String dynamoDbTableName) {
+  public DynamoDbServiceImpl(final DynamoDbClient client, final String dynamoDbTableName) {
     if (dynamoDbTableName == null) {
       throw new IllegalArgumentException("Table name is null");
     }
 
-    this.dbClient = connection.build();
+    this.dbClient = client;
     this.tableName = dynamoDbTableName;
   }
 
   /**
    * constructor.
    * 
-   * @param client {@link DynamoDbClient}
+   * @param connection {@link DynamoDbConnectionBuilder}
    * @param dynamoDbTableName {@link String}
    */
-  public DynamoDbServiceImpl(final DynamoDbClient client, final String dynamoDbTableName) {
+  public DynamoDbServiceImpl(final DynamoDbConnectionBuilder connection,
+      final String dynamoDbTableName) {
     if (dynamoDbTableName == null) {
       throw new IllegalArgumentException("Table name is null");
     }
 
-    this.dbClient = client;
+    this.dbClient = connection.build();
     this.tableName = dynamoDbTableName;
   }
 
@@ -121,15 +120,34 @@ private void putItem(final String dynamoDbTable, final Map<String, AttributeValu
   }
 
   @Override
-  public List<Map<String, AttributeValue>> query(final AttributeValue pk) {
+  public QueryResponse query(final AttributeValue pk,
+      final Map<String, AttributeValue> exclusiveStartKey, final int limit) {
     String expression = PK + " = :pk";
     Map<String, AttributeValue> values = Map.of(":pk", pk);
     QueryRequest q =
         QueryRequest.builder().tableName(this.tableName).keyConditionExpression(expression)
-            .expressionAttributeValues(values).scanIndexForward(Boolean.FALSE).build();
+            .expressionAttributeValues(values).scanIndexForward(Boolean.FALSE)
+            .exclusiveStartKey(exclusiveStartKey).limit(Integer.valueOf(limit)).build();
+
+    return this.dbClient.query(q);
+  }
+
+  @Override
+  public QueryResponse queryBeginsWith(final QueryConfig config, final AttributeValue pk,
+      final AttributeValue sk, final Map<String, AttributeValue> exclusiveStartKey,
+      final int limit) {
+
+    String expression = PK + " = :pk and begins_with(" + SK + ",:sk)";
+
+    Map<String, AttributeValue> values = Map.of(":pk", pk, ":sk", sk);
+
+    QueryRequest q = QueryRequest.builder().tableName(this.tableName)
+        .keyConditionExpression(expression).expressionAttributeValues(values)
+        .scanIndexForward(Boolean.FALSE).projectionExpression(config.projectionExpression())
+        .exclusiveStartKey(exclusiveStartKey).limit(Integer.valueOf(limit)).build();
 
-    QueryResponse result = this.dbClient.query(q);
-    return result.items();
+    QueryResponse response = this.dbClient.query(q);
+    return response;
   }
 
   @Override

dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/PaginationResult.java → aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/PaginationResult.java

@@ -21,11 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.formkiq.stacks.dynamodb;
+package com.formkiq.aws.dynamodb;
 
 import java.util.List;
 import java.util.Map;
-import com.formkiq.aws.dynamodb.PaginationMapToken;
 
 /**
  * Pagination Result for a DynamoDB Query.

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/QueryConfig.java

@@ -0,0 +1,62 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2018 - 2020 FormKiQ
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.formkiq.aws.dynamodb;
+
+/**
+ * 
+ * DynamoDB Query Config.
+ *
+ */
+public class QueryConfig {
+
+  /** Projection Expression. */
+  private String projectionExpression;
+
+  /**
+   * constructor.
+   */
+  public QueryConfig() {
+
+  }
+
+  /**
+   * Get Projection Expression.
+   * 
+   * @return {@link String}
+   */
+  public String projectionExpression() {
+    return this.projectionExpression;
+  }
+
+  /**
+   * Set Projection Expression.
+   * 
+   * @param projection {@link String}
+   * @return {@link QueryConfig}
+   */
+  public QueryConfig projectionExpression(final String projection) {
+    this.projectionExpression = projection;
+    return this;
+  }
+}

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/SiteIdKeyGenerator.java

@@ -171,11 +171,14 @@ private static String[] split(final String s) {
           documentId = String.join("", strs);
         }
       } else {
+
         siteId = strs[0];
-        documentId = strs[1];
+        StringBuffer buf = new StringBuffer(strs[1]);
         for (int i = 1; i < strs.length; i++) {
-          documentId += strs[i];
+          buf.append(strs[i]);
         }
+
+        documentId = buf.toString();
       }
     }
 

lambda-typesense/src/main/java/com/formkiq/module/lambda/typesense/DocumentMapToDocument.java → aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/model/DocumentMapToDocument.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.formkiq.module.lambda.typesense;
+package com.formkiq.aws.dynamodb.model;
 
 import static com.formkiq.aws.dynamodb.DbKeys.PREFIX_DOCUMENT_METADATA;
 import java.util.Arrays;
@@ -30,33 +30,45 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import software.amazon.awssdk.utils.StringUtils;
+import com.formkiq.aws.dynamodb.objects.Strings;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
 /**
  * 
  * {@link Function} for converting {@link Map} to {@link Map}.
  *
  */
-public class DocumentMapToDocument implements Function<Map<String, Object>, Map<String, Object>> {
+public class DocumentMapToDocument
+    implements Function<Map<String, ? extends Object>, Map<String, Object>> {
 
   /** Fields to Process. */
   private static final List<String> FIELDS = Arrays.asList("documentId", "path", "userId");
 
   @SuppressWarnings("unchecked")
   @Override
-  public Map<String, Object> apply(final Map<String, Object> data) {
+  public Map<String, Object> apply(final Map<String, ? extends Object> data) {
 
     Map<String, Object> document = new HashMap<>();
 
     for (String field : FIELDS) {
 
-      if (data.containsKey(field)) {
+      Object ob = data.get(field);
 
-        Map<String, Object> values = (Map<String, Object>) data.get(field);
-        String value = values.get("S").toString();
+      if (ob != null) {
+
+        String value = null;
+
+        if (ob instanceof AttributeValue) {
+
+          AttributeValue av = (AttributeValue) ob;
+          value = av.s();
+
+        } else {
+          Map<String, Object> values = (Map<String, Object>) data.get(field);
+          value = values.get("S").toString();
+        }
 
-        if (!StringUtils.isEmpty(value)) {
-          // document.add(new StringField(field, value, Field.Store.YES));
+        if (!Strings.isEmpty(value)) {
           document.put(field, value);
         }
       }
@@ -68,12 +80,13 @@ public Map<String, Object> apply(final Map<String, Object> data) {
 
     metadata.forEach(m -> {
       Map<String, Object> values = (Map<String, Object>) data.get(m);
-      String value = values.get("S").toString();
-      // document.add(new StringField(m, value, Field.Store.YES));
-      document.put(m, value);
+
+      if (values.containsKey("S")) {
+        String value = values.get("S").toString();
+        document.put(m, value);
+      }
     });
 
     return document;
   }
-
 }