Merge pull request awsdocs#413 from awsdocs/rework-blank-java

Rework blank-java, general Java code cleanup

Author: yualexan

sample-apps/.gitignore

@@ -11,8 +11,8 @@ build
 *.zip
 bin
 obj
-main
 Gemfile.lock
 lib
 __pycache__
 *.pyc
+.DS_Store

sample-apps/blank-java/README.md

@@ -14,6 +14,7 @@ The project source includes function code and supporting resources:
 Use the following instructions to deploy the sample application.
 
 # Requirements
+- An AWS account.
 - [Java 8 runtime environment (SE JRE)](https://www.oracle.com/java/technologies/javase-downloads.html)
 - [Gradle 5](https://gradle.org/releases/) or [Maven 3](https://maven.apache.org/docs/history.html)
 - The Bash shell. For Linux and macOS, this is included by default. In Windows 10, you can install the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10) to get a Windows-integrated version of Ubuntu and Bash.

sample-apps/blank-java/build.gradle

@@ -16,11 +16,11 @@ dependencies {
     implementation 'com.amazonaws:aws-xray-recorder-sdk-aws-sdk-v2-instrumentor'
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
     implementation 'com.amazonaws:aws-lambda-java-events:2.2.9'
-    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'org.apache.logging.log4j:log4j-api:[2.17.1,)'
     implementation 'org.apache.logging.log4j:log4j-core:[2.17.1,)'
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:[2.17.1,)'
     runtimeOnly 'com.amazonaws:aws-lambda-java-log4j2:1.5.0'
+    testImplementation 'com.amazonaws:aws-lambda-java-tests:1.1.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }

sample-apps/blank-java/event.json

@@ -1,20 +1,5 @@
 {
-  "Records": [
-    {
-      "messageId": "19dd0b57-b21e-4ac1-bd88-01bbb068cb78",
-      "receiptHandle": "MessageReceiptHandle",
-      "body": "Hello from SQS!",
-      "attributes": {
-        "ApproximateReceiveCount": "1",
-        "SentTimestamp": "1523232000000",
-        "SenderId": "123456789012",
-        "ApproximateFirstReceiveTimestamp": "1523232000001"
-      },
-      "messageAttributes": {},
-      "md5OfBody": "7b270e59b47ff90a553787216d55d91d",
-      "eventSource": "aws:sqs",
-      "eventSourceARN": "arn:aws:sqs:us-west-2:123456789012:MyQueue",
-      "awsRegion": "us-west-2"
-    }
-  ]
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3"
 }

sample-apps/blank-java/pom.xml

@@ -27,11 +27,6 @@
       <artifactId>aws-lambda-java-log4j2</artifactId>
       <version>1.5.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.8.9</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
@@ -84,7 +79,12 @@
       <version>5.6.0</version>
       <scope>test</scope>
     </dependency>
-
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-lambda-java-tests</artifactId>
+      <version>1.1.1</version>
+      <scope>test</scope>
+  </dependency>
   </dependencies>
 
   <build>

sample-apps/blank-java/src/main/java/example/Handler.java

@@ -1,65 +1,35 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.events.SQSEvent;
-import com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
 
-import software.amazon.awssdk.services.lambda.model.GetAccountSettingsRequest;
-import software.amazon.awssdk.services.lambda.model.GetAccountSettingsResponse;
-import software.amazon.awssdk.services.lambda.model.ServiceException;
-import software.amazon.awssdk.services.lambda.LambdaAsyncClient;
-import software.amazon.awssdk.services.lambda.model.AccountUsage;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.StringBuilder;
-import java.util.Map;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.services.lambda.LambdaClient;
+import software.amazon.awssdk.services.lambda.model.GetAccountSettingsResponse;
+import software.amazon.awssdk.services.lambda.model.LambdaException;
 
 // Handler value: example.Handler
-public class Handler implements RequestHandler<SQSEvent, String>{
-  private static final Logger logger = LoggerFactory.getLogger(Handler.class);
-  private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
-  private static final LambdaAsyncClient lambdaClient = LambdaAsyncClient.create();
-  public Handler(){
-    CompletableFuture<GetAccountSettingsResponse> accountSettings = lambdaClient.getAccountSettings(GetAccountSettingsRequest.builder().build());
-    try {
-      GetAccountSettingsResponse settings = accountSettings.get();
-    } catch(Exception e) {
-      e.getStackTrace();
-    }
-  }
-  @Override
-  public String handleRequest(SQSEvent event, Context context)
-  {
-    String response = new String();
-    // call Lambda API
-    logger.info("Getting account settings");
-    CompletableFuture<GetAccountSettingsResponse> accountSettings = 
-        lambdaClient.getAccountSettings(GetAccountSettingsRequest.builder().build());
-    // log execution details
-    logger.info("ENVIRONMENT VARIABLES: {}", gson.toJson(System.getenv()));
-    logger.info("CONTEXT: {}", gson.toJson(context));
-    logger.info("EVENT: {}", gson.toJson(event));
-    // process event
-    for(SQSMessage msg : event.getRecords()){
-      logger.info(msg.getBody());
-    }
-    // process Lambda API response
-    try {
-      GetAccountSettingsResponse settings = accountSettings.get();
-      response = gson.toJson(settings.accountUsage());
-      logger.info("Account usage: {}", response);
-    } catch(Exception e) {
-      e.getStackTrace();
+public class Handler implements RequestHandler<Map<String,String>, String> {
+
+    private static final Logger logger = LoggerFactory.getLogger(Handler.class);
+    private static final LambdaClient lambdaClient = LambdaClient.builder().build();
+
+    @Override
+    public String handleRequest(Map<String,String> event, Context context) {
+
+        logger.info("ENVIRONMENT VARIABLES: " + System.getenv());
+        logger.info("EVENT: " + event);
+
+        GetAccountSettingsResponse response = null;
+        try {
+            response = lambdaClient.getAccountSettings();
+        } catch(LambdaException e) {
+            System.err.println(e.getMessage());
+        }
+        return response != null ? "Total code size for your account is " + response.accountLimit().totalCodeSize() + " bytes" : "Error";
     }
-    return response;
-  }
-}
+}

sample-apps/blank-java/src/test/java/example/InvokeTest.java

@@ -1,71 +1,33 @@
 package example;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
 
 import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
-import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.events.SQSEvent;
-import com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
+import com.amazonaws.services.lambda.runtime.tests.annotations.Event;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.stream.Stream;
+import java.util.Map;
 
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.AWSXRayRecorderBuilder;
 import com.amazonaws.xray.strategy.sampling.NoSamplingStrategy;
 
 class InvokeTest {
-  private static final Logger logger = LoggerFactory.getLogger(InvokeTest.class);
-  Gson gson = new GsonBuilder()
-          .registerTypeAdapter(SQSEvent.class, new SQSEventDeserializer())
-          .setPrettyPrinting()
-          .create();
 
   public InvokeTest() {
-    AWSXRayRecorderBuilder builder = AWSXRayRecorderBuilder.standard();
-    builder.withSamplingStrategy(new NoSamplingStrategy());
-    AWSXRay.setGlobalRecorder(builder.build());
-  }
-
-  @Test
-  void invokeTest() {
-    AWSXRay.beginSegment("blank-java-test");
-    String path = "src/test/resources/event.json";
-    String eventString = loadJsonFile(path);
-    SQSEvent event = gson.fromJson(eventString, SQSEvent.class);
-    Context context = new TestContext();
-    String requestId = context.getAwsRequestId();
-    Handler handler = new Handler();
-    String result = handler.handleRequest(event, context);
-    assertTrue(result.contains("totalCodeSize"));
-    AWSXRay.endSegment();
+      AWSXRayRecorderBuilder builder = AWSXRayRecorderBuilder.standard();
+      builder.withSamplingStrategy(new NoSamplingStrategy());
+      AWSXRay.setGlobalRecorder(builder.build());
   }
 
-  private static String loadJsonFile(String path)
-  {
-      StringBuilder stringBuilder = new StringBuilder();
-      try (Stream<String> stream = Files.lines( Paths.get(path), StandardCharsets.UTF_8))
-      {
-          stream.forEach(s -> stringBuilder.append(s));
-      }
-      catch (IOException e)
-      {
-          e.printStackTrace();
-      }
-      return stringBuilder.toString();
+  @ParameterizedTest
+  @Event(value = "event.json", type = Map.class)
+  void invokeTest(Map<String, String> event) {
+      AWSXRay.beginSegment("blank-java-test");
+      Context context = new TestContext();
+      Handler handler = new Handler();
+      String result = handler.handleRequest(event, context);
+      assertTrue(result.contains("Total code size for your account"));
+      AWSXRay.endSegment();
   }
 }

sample-apps/blank-java/src/test/java/example/SQSEventDeserializer.java

@@ -8,7 +8,6 @@ repositories {
 
 dependencies {
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
-    implementation 'com.google.code.gson:gson:2.8.9'
     testImplementation 'org.apache.logging.log4j:log4j-api:[2.17.1,)'
     testImplementation 'org.apache.logging.log4j:log4j-core:[2.17.1,)'
     testImplementation 'org.apache.logging.log4j:log4j-slf4j18-impl:[2.17.1,)'

sample-apps/java-basic/build.gradle

@@ -17,11 +17,6 @@
       <artifactId>aws-lambda-java-core</artifactId>
       <version>1.2.1</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.8.9</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>

sample-apps/java-basic/pom.xml

@@ -4,25 +4,18 @@
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 import java.util.Map;
 
 // Handler value: example.Handler
-public class Handler implements RequestHandler<Map<String,String>, String>{
-  Gson gson = new GsonBuilder().setPrettyPrinting().create();
+public class Handler implements RequestHandler<Map<String,String>, Void>{
+
   @Override
-  public String handleRequest(Map<String,String> event, Context context)
+  public Void handleRequest(Map<String,String> event, Context context)
   {
     LambdaLogger logger = context.getLogger();
-    String response = "200 OK";
-    // log execution details
-    logger.log("ENVIRONMENT VARIABLES: " + gson.toJson(System.getenv()));
-    logger.log("CONTEXT: " + gson.toJson(context));
-    // process event
-    logger.log("EVENT: " + gson.toJson(event));
+    logger.log("ENVIRONMENT VARIABLES: " + System.getenv());
+    logger.log("EVENT: " + event);
     logger.log("EVENT TYPE: " + event.getClass());
-    return response;
+    return null;
   }
 }

sample-apps/java-basic/src/main/java/example/Handler.java

@@ -4,27 +4,23 @@
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 import java.util.List;
 
 // Handler value: example.HandlerDivide
 public class HandlerDivide implements RequestHandler<List<Integer>, Integer>{
-  Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
   @Override
   public Integer handleRequest(List<Integer> event, Context context)
   {
     LambdaLogger logger = context.getLogger();
-    // process event
     if ( event.size() != 2 )
     {
       throw new InputLengthException("Input must be an array that contains 2 numbers.");
     }
     int numerator = event.get(0);
     int denominator = event.get(1);
-    logger.log("EVENT: " + gson.toJson(event));
-    logger.log("EVENT TYPE: " + event.getClass().toString());
+    logger.log("EVENT: Numerator is " + event.get(0).toString() +
+      "; Denominator is " + event.get(1).toString());
     return numerator/denominator;
   }
 }