Update all of java-basic to use Java 11.

- Added a bit more functionality to each handler
- Added proper unit testing for each handler; all tests pass
- Maven hack to exclude META-INF from shaded jar, avoiding a warning
- Tested handlers to ensure they work as advertised

Author: yualexan

sample-apps/java-basic/build.gradle

@@ -28,8 +28,8 @@ task buildZip(type: Zip) {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 build.dependsOn buildZip

sample-apps/java-basic/pom.xml

@@ -8,8 +8,8 @@
   <name>java-basic-function</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
   <dependencies>
     <dependency>
@@ -61,6 +61,14 @@
         <version>3.2.2</version>
         <configuration>
           <createDependencyReducedPom>false</createDependencyReducedPom>
+          <filters>
+            <filter>
+               <artifact>com.example:*</artifact>
+               <excludes>
+                  <exclude>META-INF/MANIFEST.MF</exclude>
+               </excludes>
+            </filter>
+          </filters>
         </configuration>
         <executions>
           <execution>
@@ -76,8 +84,8 @@
         <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/src/main/java/example/HandlerDivide.java

@@ -9,6 +9,9 @@
 // Handler value: example.HandlerDivide
 public class HandlerDivide implements RequestHandler<List<Integer>, Integer>{
 
+  /*
+   * Takes a list of two integers and divides them.
+   */
   @Override
   public Integer handleRequest(List<Integer> event, Context context)
   {

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

@@ -8,11 +8,14 @@
 public class HandlerInteger implements RequestHandler<Integer, Integer>{
 
   @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());
-    return context.getRemainingTimeInMillis();
+    return event + 1;
   }
 }

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

@@ -10,11 +10,14 @@
 public class HandlerList implements RequestHandler<List<Integer>, Integer>{
 
   @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());
-    return context.getRemainingTimeInMillis() ;
+    return event.stream().mapToInt(Integer::intValue).sum();
   }
 }

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

@@ -11,6 +11,10 @@
 public class HandlerStream implements RequestStreamHandler {
 
   @Override
+  /*
+   * Takes an InputStream and an OutputStream. Reads from the InputStream,
+   * and copies all characters to the OutputStream.
+   */
   public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException
   {
     int nextChar;

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

@@ -5,14 +5,17 @@
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 
 // Handler value: example.HandlerString
-public class HandlerString implements RequestHandler<String, Integer>{
+public class HandlerString implements RequestHandler<String, String>{
 
   @Override
-  public Integer handleRequest(String event, Context context)
+  /*
+   * 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());
-    return context.getRemainingTimeInMillis();
+    return event.toLowerCase();
   }
 }

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

@@ -8,11 +8,21 @@
 public class HandlerWeatherData implements RequestHandler<WeatherData, WeatherData>{
 
   @Override
+  /*
+   * Takes in a WeatherData event object and updates its attributes with dummy values.
+   * Returns the updated WeatherData object.
+   */
   public WeatherData handleRequest(WeatherData event, Context context)
   {
     LambdaLogger logger = context.getLogger();
     logger.log("EVENT: " + event);
     logger.log("EVENT TYPE: " + event.getClass().toString());
+
+    event.setHumidityPct(50.5);
+    event.setPressureHPa(1005);
+    event.setWindKmh(28);
+    // Assumes temperature of event is already set
+    event.setTemperatureK(event.getTemperatureK() + 2);
     return event;
   }
 }

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

@@ -6,4 +6,4 @@ public class InputLengthException extends RuntimeException {
     public InputLengthException(String errorMessage) {
         super(errorMessage);
     }
-}
+}

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

@@ -1,26 +1,98 @@
 package example;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import org.junit.jupiter.api.Test;
 
 import com.amazonaws.services.lambda.runtime.Context;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.List;
 
 class InvokeTest {
   private static final Logger logger = LoggerFactory.getLogger(InvokeTest.class);
 
   @Test
-  void invokeTest() {
-    logger.info("Invoke TEST");
-    HashMap<String,String> event = new HashMap<String,String>();
+  void testHandler() {
+    logger.info("Invoke TEST - Handler");
+    var event = new HashMap<String,String>();
     Context context = new TestContext();
     Handler handler = new Handler();
-    String result = handler.handleRequest(event, context);
-    assertTrue(result.contains("200 OK"));
+    assertNull(handler.handleRequest(event, context));
   }
 
+  @Test
+  void testHandlerDivide() {
+    logger.info("Invoke TEST - HandlerDivide");
+    var event = List.of(20, 5);
+    Context context = new TestContext();
+    HandlerDivide handler = new HandlerDivide();
+    assertEquals(4, handler.handleRequest(event, context));
+  }
+
+  @Test
+  void testHandlerInteger() {
+    logger.info("Invoke TEST - HandlerInteger");
+    Integer event = 1;
+    Context context = new TestContext();
+    HandlerInteger handler = new HandlerInteger();
+    assertEquals(2, handler.handleRequest(event, context));
+  }
+
+  @Test
+  void testHandlerList() {
+    logger.info("Invoke TEST - HandlerList");
+    var event = List.of(1, 2, 3, 4);
+    Context context = new TestContext();
+    HandlerList handler = new HandlerList();
+    assertEquals(10, handler.handleRequest(event, context));
+  }
+
+  @Test
+  void testHandlerStream() throws IOException {
+    logger.info("Invoke TEST - HandlerStream");
+    String inputStr = "Hello world";
+    byte[] inputBytes = inputStr.getBytes();
+    ByteArrayInputStream inputStream = new ByteArrayInputStream(inputBytes);
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    Context context = new TestContext();
+    HandlerStream handler = new HandlerStream();
+    handler.handleRequest(inputStream, outputStream, context);
+    byte[] outputBytes = outputStream.toByteArray();
+    assertArrayEquals(inputBytes, outputBytes);
+    String outputStr = new String(outputBytes, StandardCharsets.UTF_8);
+    assertEquals(inputStr, outputStr);
+  }
+
+  @Test
+  void testHandlerString() {
+    logger.info("Invoke TEST - HandlerString");
+    String event = "HeLlO wOrLd";
+    Context context = new TestContext();
+    HandlerString handler = new HandlerString();
+    assertEquals("hello world", handler.handleRequest(event, context));
+  }
+
+  @Test
+  void testHandlerWeatherData() {
+    logger.info("Invoke TEST - HandlerWeatherData");
+    WeatherData inputData = new WeatherData();
+    inputData.setTemperatureK(298);
+    Context context = new TestContext();
+    HandlerWeatherData handler = new HandlerWeatherData();
+    WeatherData outputData = handler.handleRequest(inputData, context);
+    assertNotNull(outputData.getHumidityPct());
+    assertNotNull(outputData.getPressureHPa());
+    assertNotNull(outputData.getWindKmh());
+    assertEquals(300, outputData.getTemperatureK());
+  }
 }

sample-apps/java-basic/template-mvn.yml

@@ -7,9 +7,9 @@ Resources:
     Properties:
       CodeUri: target/java-basic-1.0-SNAPSHOT.jar
       Handler: example.Handler
-      Runtime: java8
+      Runtime: java11
       Description: Java function
-      MemorySize: 512
+      MemorySize: 2048
       Timeout: 10
       # Function's execution role
       Policies:

sample-apps/java-basic/template.yml

@@ -7,9 +7,9 @@ Resources:
     Properties:
       CodeUri: build/distributions/java-basic.zip
       Handler: example.Handler
-      Runtime: java8
+      Runtime: java11
       Description: Java function
-      MemorySize: 512
+      MemorySize: 2048
       Timeout: 10
       # Function's execution role
       Policies: