Update java-events examples to use Java 11.

- Add better functionality to each handler event.
- Write one unit test per handler, using aws-lambda-java-tests library.
- Tested each handler to ensure each still works.
- Cleanup of blank-java and java-basic code.

Author: yualexan

sample-apps/blank-java/build.gradle

@@ -21,8 +21,8 @@ dependencies {
     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'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 test {

sample-apps/blank-java/pom.xml

@@ -70,13 +70,13 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.0</version>
+      <version>5.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.6.0</version>
+      <version>5.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -106,29 +106,16 @@
             <goals>
               <goal>shade</goal>
             </goals>
-            <configuration>
-              <transformers>
-                <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                </transformer>
-              </transformers>
-            </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.github.edwgiz</groupId>
-            <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-            <version>[2.17.1,)</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-           <source>1.8</source>
-           <target>1.8</target>
+           <source>11</source>
+           <target>11</target>
         </configuration>
       </plugin>
     </plugins>

sample-apps/java-basic/build.gradle

@@ -8,9 +8,7 @@ repositories {
 
 dependencies {
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
-    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,)'
+    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:[2.17.1,)'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }

sample-apps/java-basic/pom.xml

@@ -33,20 +33,19 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j18-impl</artifactId>
       <version>[2.17.1,)</version>
-      <scope>test</scope>
     </dependency>
-   <dependency>
+    <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
       <version>5.6.0</version>
       <scope>test</scope>
-   </dependency>
-   <dependency>
+    </dependency>
+    <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
       <version>5.6.0</version>
       <scope>test</scope>
-   </dependency>
+    </dependency>
   </dependencies>
 
   <build>

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

@@ -2,20 +2,23 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
 // Handler value: example.Handler
 public class Handler implements RequestHandler<Map<String,String>, Void>{
 
+  private static final Logger logger = LoggerFactory.getLogger(Handler.class);
+
   @Override
   public Void handleRequest(Map<String,String> event, Context context)
   {
-    LambdaLogger logger = context.getLogger();
-    logger.log("ENVIRONMENT VARIABLES: " + System.getenv());
-    logger.log("EVENT: " + event);
-    logger.log("EVENT TYPE: " + event.getClass());
+    logger.info("ENVIRONMENT VARIABLES: " + System.getenv());
+    logger.info("EVENT: " + event);
+    logger.info("EVENT TYPE: " + event.getClass());
     return null;
   }
 }

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

@@ -2,27 +2,29 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
 
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 // Handler value: example.HandlerDivide
 public class HandlerDivide implements RequestHandler<List<Integer>, Integer>{
 
+  private static final Logger logger = LoggerFactory.getLogger(HandlerDivide.class);
   /*
    * Takes a list of two integers and divides them.
    */
   @Override
   public Integer handleRequest(List<Integer> event, Context context)
   {
-    LambdaLogger logger = context.getLogger();
     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: Numerator is " + event.get(0).toString() +
+    logger.info("EVENT: Numerator is " + event.get(0).toString() +
       "; Denominator is " + event.get(1).toString());
     return numerator/denominator;
   }

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

@@ -2,20 +2,23 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Handler value: example.HandlerInteger
 public class HandlerInteger implements RequestHandler<Integer, Integer>{
 
+  private static final Logger logger = LoggerFactory.getLogger(HandlerInteger.class);
+
   @Override
   /*
    * Takes an Integer as input, adds 1, and returns it.
    */
   public Integer handleRequest(Integer event, Context context)
   {
-    LambdaLogger logger = context.getLogger();
-    logger.log("EVENT: " + event);
-    logger.log("EVENT TYPE: " + event.getClass().toString());
+    logger.info("EVENT: " + event);
+    logger.info("EVENT TYPE: " + event.getClass().toString());
     return event + 1;
   }
 }

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

@@ -2,22 +2,25 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 // Handler value: example.HandlerList
 public class HandlerList implements RequestHandler<List<Integer>, Integer>{
 
+  private static final Logger logger = LoggerFactory.getLogger(HandlerList.class);
+
   @Override
   /*
    * Takes a list of Integers and returns its sum.
    */
   public Integer handleRequest(List<Integer> event, Context context)
   {
-    LambdaLogger logger = context.getLogger();
-    logger.log("EVENT: " + event);
-    logger.log("EVENT TYPE: " + event.getClass().toString());
+    logger.info("EVENT: " + event);
+    logger.info("EVENT TYPE: " + event.getClass().toString());
     return event.stream().mapToInt(Integer::intValue).sum();
   }
 }

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

@@ -7,9 +7,14 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 // Handler value: example.HandlerStream
 public class HandlerStream implements RequestStreamHandler {
 
+  private static final Logger logger = LoggerFactory.getLogger(HandlerStream.class);
+
   @Override
   /*
    * Takes an InputStream and an OutputStream. Reads from the InputStream,
@@ -27,7 +32,7 @@ public void handleRequest(InputStream inputStream, OutputStream outputStream, Co
     } finally {
       inputStream.close();
       String finalString = outputStream.toString();
-      System.out.println(finalString);
+      logger.info("Final string result: " + finalString);
       outputStream.close();
     }
   }

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

@@ -2,20 +2,23 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.LambdaLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Handler value: example.HandlerString
 public class HandlerString implements RequestHandler<String, String>{
 
+  private static final Logger logger = LoggerFactory.getLogger(HandlerString.class);
+
   @Override
   /*
    * Takes a String as input, and converts all characters to lowercase.
    */
   public String handleRequest(String event, Context context)
   {
-    LambdaLogger logger = context.getLogger();
-    logger.log("EVENT: " + event);
-    logger.log("EVENT TYPE: " + event.getClass().toString());
+    logger.info("EVENT: " + event);
+    logger.info("EVENT TYPE: " + event.getClass().toString());
     return event.toLowerCase();
   }
 }