Formatting

Author: scottgerring

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/builder/AbstractBatchMessageHandlerBuilder.java

@@ -15,9 +15,10 @@
 package software.amazon.lambda.powertools.batch.builder;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
+
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 
 /**
  * An abstract class to capture common arguments used across all the message-binding-specific batch processing

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/builder/DynamoDbBatchMessageHandlerBuilder.java

@@ -17,11 +17,12 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
 import com.amazonaws.services.lambda.runtime.events.StreamsEventResponse;
-import java.util.function.BiConsumer;
 import software.amazon.lambda.powertools.batch.exception.DeserializationNotSupportedException;
 import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 import software.amazon.lambda.powertools.batch.handler.DynamoDbBatchMessageHandler;
 
+import java.util.function.BiConsumer;
+
 /**
  * Builds a batch processor for processing DynamoDB Streams batch events
  **/

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/builder/KinesisBatchMessageHandlerBuilder.java

@@ -17,10 +17,11 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
 import com.amazonaws.services.lambda.runtime.events.StreamsEventResponse;
-import java.util.function.BiConsumer;
 import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 import software.amazon.lambda.powertools.batch.handler.KinesisStreamsBatchMessageHandler;
 
+import java.util.function.BiConsumer;
+
 /**
  * Builds a batch processor for processing Kinesis Streams batch events
  */

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/builder/SqsBatchMessageHandlerBuilder.java

@@ -17,10 +17,11 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.SQSBatchResponse;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
-import java.util.function.BiConsumer;
 import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 import software.amazon.lambda.powertools.batch.handler.SqsBatchMessageHandler;
 
+import java.util.function.BiConsumer;
+
 /**
  * Builds a batch processor for the SQS event source.
  */

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/handler/DynamoDbBatchMessageHandler.java

@@ -17,12 +17,13 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
 import com.amazonaws.services.lambda.runtime.events.StreamsEventResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A batch message processor for DynamoDB Streams batches.

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/handler/KinesisStreamsBatchMessageHandler.java

@@ -18,13 +18,14 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
 import com.amazonaws.services.lambda.runtime.events.StreamsEventResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.lambda.powertools.utilities.EventDeserializer;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.lambda.powertools.utilities.EventDeserializer;
 
 /**
  * A batch message processor for Kinesis Streams batch processing.

powertools-batch/src/main/java/software/amazon/lambda/powertools/batch/handler/SqsBatchMessageHandler.java

@@ -17,13 +17,14 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.SQSBatchResponse;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
-import java.util.ArrayList;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.lambda.powertools.utilities.EventDeserializer;
 
+import java.util.ArrayList;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
 /**
  * A batch message processor for SQS batches.
  *

powertools-batch/src/test/java/software/amazon/lambda/powertools/batch/DdbBatchProcessorTest.java

@@ -14,17 +14,18 @@
 
 package software.amazon.lambda.powertools.batch;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
 import com.amazonaws.services.lambda.runtime.events.StreamsEventResponse;
 import com.amazonaws.services.lambda.runtime.tests.annotations.Event;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.mockito.Mock;
 import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class DdbBatchProcessorTest {
 
     @Mock

powertools-batch/src/test/java/software/amazon/lambda/powertools/batch/KinesisBatchProcessorTest.java

@@ -14,18 +14,19 @@
 
 package software.amazon.lambda.powertools.batch;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
 import com.amazonaws.services.lambda.runtime.events.StreamsEventResponse;
 import com.amazonaws.services.lambda.runtime.tests.annotations.Event;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.mockito.Mock;
 import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 import software.amazon.lambda.powertools.batch.model.Product;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class KinesisBatchProcessorTest {
 
     @Mock

powertools-batch/src/test/java/software/amazon/lambda/powertools/batch/SQSBatchProcessorTest.java

@@ -14,18 +14,19 @@
 
 package software.amazon.lambda.powertools.batch;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.SQSBatchResponse;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import com.amazonaws.services.lambda.runtime.tests.annotations.Event;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.mockito.Mock;
 import software.amazon.lambda.powertools.batch.handler.BatchMessageHandler;
 import software.amazon.lambda.powertools.batch.model.Product;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SQSBatchProcessorTest {
     @Mock
     private Context context;

powertools-e2e-tests/handlers/batch/src/main/java/software/amazon/lambda/powertools/e2e/Function.java

@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -39,6 +40,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.util.IOUtils;
@@ -91,17 +93,17 @@ private void processProductMessage(Product p, Context c) {
                 .s(c.getFunctionName())
                 .build());
         results.put("id", AttributeValue.builder()
-            .s(Long.toString(p.getId()))
-            .build());
+                .s(Long.toString(p.getId()))
+                .build());
         results.put("name", AttributeValue.builder()
                 .s(p.getName())
                 .build());
         results.put("price", AttributeValue.builder()
                 .n(Double.toString(p.getPrice()))
                 .build());
         ddbClient.putItem(PutItemRequest.builder()
-                        .tableName(ddbOutputTable)
-                        .item(results)
+                .tableName(ddbOutputTable)
+                .item(results)
                 .build());
     }
 

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/BatchE2ET.java

@@ -14,34 +14,14 @@
 
 package software.amazon.lambda.powertools;
 
-import static software.amazon.lambda.powertools.testutils.Infrastructure.FUNCTION_NAME_OUTPUT;
-import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.time.Year;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.*;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
 import software.amazon.awssdk.services.dynamodb.model.*;
 import software.amazon.awssdk.services.kinesis.KinesisClient;
 import software.amazon.awssdk.services.kinesis.model.PutRecordsRequest;
@@ -50,17 +30,21 @@
 import software.amazon.awssdk.services.sqs.SqsClient;
 import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
 import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequestEntry;
-import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
 import software.amazon.lambda.powertools.testutils.Infrastructure;
-import software.amazon.lambda.powertools.testutils.lambda.InvocationResult;
 import software.amazon.lambda.powertools.utilities.JsonConfig;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.lambda.powertools.testutils.Infrastructure.FUNCTION_NAME_OUTPUT;
 
 public class BatchE2ET {
-    private static Infrastructure infrastructure;
-    private static String functionName;
     private static final SdkHttpClient httpClient = UrlConnectionHttpClient.builder().build();
     private static final Region region = Region.of(System.getProperty("AWS_DEFAULT_REGION", "eu-west-1"));
+    private static Infrastructure infrastructure;
+    private static String functionName;
     private static String queueUrl;
     private static String kinesisStreamName;
 
@@ -72,6 +56,14 @@ public class BatchE2ET {
     private static String ddbStreamsTestTable;
     private final List<Product> testProducts;
 
+    public BatchE2ET() {
+        testProducts = Arrays.asList(
+                new Product(1, "product1", 1.23),
+                new Product(2, "product2", 4.56),
+                new Product(3, "product3", 6.78)
+        );
+    }
+
     @BeforeAll
     @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public static void setup() {
@@ -97,7 +89,7 @@ public static void setup() {
         kinesisStreamName = outputs.get("KinesisStreamName");
         outputTable = outputs.get("TableNameForAsyncTests");
         ddbStreamsTestTable = outputs.get("DdbStreamsTestTable");
-        
+
         ddbClient = DynamoDbClient.builder()
                 .region(region)
                 .httpClient(httpClient)
@@ -114,14 +106,22 @@ public static void setup() {
                 .build();
     }
 
+    @AfterAll
+    public static void tearDown() {
+        // TODO bring this back after testing
+        if (infrastructure != null) {
+            // infrastructure.destroy();
+        }
+    }
+
     @AfterEach
     public void cleanUpTest() {
         // Delete everything in the output table
         ScanResponse items = ddbClient.scan(ScanRequest.builder()
                 .tableName(outputTable)
                 .build());
 
-        for (Map<String, AttributeValue> item :items.items()) {
+        for (Map<String, AttributeValue> item : items.items()) {
             HashMap<String, AttributeValue> key = new HashMap<String, AttributeValue>() {
                 {
                     put("functionName", AttributeValue.builder()
@@ -130,28 +130,13 @@ public void cleanUpTest() {
                     put("id", AttributeValue.builder()
                             .s(item.get("id").s())
                             .build());
-                }};
+                }
+            };
 
             ddbClient.deleteItem(DeleteItemRequest.builder()
-                            .tableName(outputTable)
-                            .key(key)
-                            .build());
-        }
-    }
-
-    public BatchE2ET() {
-        testProducts = Arrays.asList(
-                new Product(1, "product1", 1.23),
-                new Product(2, "product2", 4.56),
-                new Product(3, "product3", 6.78)
-        );
-    }
-
-    @AfterAll
-    public static void tearDown() {
-        // TODO bring this back after testing
-        if (infrastructure != null) {
-            // infrastructure.destroy();
+                    .tableName(outputTable)
+                    .key(key)
+                    .build());
         }
     }
 
@@ -219,15 +204,16 @@ public void ddbStreamsBatchProcessingSucceeds() throws InterruptedException {
         String theId = "my-test-id";
 
         // WHEN
-       ddbClient.putItem(PutItemRequest.builder()
-               .tableName(ddbStreamsTestTable)
-               .item(new HashMap<String, AttributeValue>() {
-                   {
-                       put("id", AttributeValue.builder()
-                               .s(theId)
-                               .build());
-                   }})
-               .build());
+        ddbClient.putItem(PutItemRequest.builder()
+                .tableName(ddbStreamsTestTable)
+                .item(new HashMap<String, AttributeValue>() {
+                    {
+                        put("id", AttributeValue.builder()
+                                .s(theId)
+                                .build());
+                    }
+                })
+                .build());
         Thread.sleep(90000); // wait for function to be executed
 
         // THEN