fix test for Kinesis Lambda handler

Author: whummer

pom.xml

@@ -5,7 +5,7 @@
     <groupId>cloud.localstack</groupId>
     <artifactId>localstack-utils</artifactId>
     <packaging>jar</packaging>
-    <version>0.2.2</version>
+    <version>0.2.5</version>
     <name>localstack-utils</name>
 
     <description>Java utilities for the LocalStack platform.</description>
@@ -33,6 +33,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <aws.sdk.version>1.11.642</aws.sdk.version>
         <aws.sdkv2.version>2.13.39</aws.sdkv2.version>
+        <commons.lang3.version>3.5</commons.lang3.version>
+        <lambda.core.version>1.2.0</lambda.core.version>
     </properties>
 
     <dependencies>
@@ -53,8 +55,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.5</version>
-            <scope>provided</scope>
+            <version>${commons.lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -104,7 +105,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.2.0</version>
+            <version>${lambda.core.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -203,17 +204,48 @@
         <profile>
             <id>fatjar</id>
             <dependencies>
+                <!-- TODO: verify whether we still need a separate fatjar profile, or whether
+                    the specified libs could also be added to the test JAR directly. -->
                 <dependency>
                     <groupId>com.amazonaws</groupId>
                     <artifactId>aws-java-sdk</artifactId>
-                    <version>1.11.505</version>
+                    <version>${aws.sdk.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-java-sdk-core</artifactId>
+                    <version>${aws.sdk.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-java-sdk-dynamodb</artifactId>
+                    <version>${aws.sdk.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-lambda-java-core</artifactId>
+                    <version>${lambda.core.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-lambda-java-events</artifactId>
+                    <version>2.2.7</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                    <version>${commons.lang3.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                    <version>2.6</version>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>awssdkv1</id>
             <dependencies>
-
             </dependencies>
         </profile>
         <profile>
@@ -273,6 +305,7 @@
                     <artifactSet>
                         <includes>
                             <include>com.amazonaws:aws-java-sdk-core</include>
+                            <include>com.amazonaws:aws-java-sdk-dynamodb</include>
                             <include>com.amazonaws:aws-java-sdk-kinesis</include>
                             <include>com.amazonaws:aws-java-sdk-lambda</include>
                             <include>com.amazonaws:aws-java-sdk-sqs</include>
@@ -294,7 +327,8 @@
                     <relocations>
                         <!--Default relocations of-->
                         <!--http://central.maven.org/maven2/com/amazonaws/aws-java-sdk-bundle/1.11.301/aws-java-sdk-bundle-1.11.301.pom-->
-                        <relocation>
+                        <!-- TODO remove this section..? -->
+                        <!-- <relocation>
                             <pattern>org.joda</pattern>
                             <shadedPattern>com.amazonaws.thirdparty.joda</shadedPattern>
                         </relocation>
@@ -313,7 +347,7 @@
                         <relocation>
                             <pattern>software.amazon.ion</pattern>
                             <shadedPattern>com.amazonaws.thirdparty.ion</shadedPattern>
-                        </relocation>
+                        </relocation> -->
                     </relocations>
                 </configuration>
             </plugin>

src/test/java/cloud/localstack/sample/KinesisLambdaHandler.java

@@ -9,27 +9,16 @@
 /**
  * Test Lambda handler class triggered from a Kinesis event
  */
-public class KinesisLambdaHandler implements RequestHandler<Object, Object> {
-
-	@Override
-	public Object handleRequest(Object event, Context context) {
-		if(event instanceof KinesisEvent) {
-			return handleRequest((KinesisEvent)event, context);
-		}
-		return handleRequest((Map<?, ?>)event, context);
-	}
-
-	public Object handleRequest(Map<?, ?> event, Context context) {
-		System.err.println("Kinesis record: " + event);
-		return "{}";
-	}
+public class KinesisLambdaHandler implements RequestHandler<KinesisEvent, Object> {
 
 	public Object handleRequest(KinesisEvent event, Context context) {
+		String result = "";
 		for (KinesisEvent.KinesisEventRecord rec : event.getRecords()) {
 			String msg = new String(rec.getKinesis().getData().array());
 			System.err.println("Kinesis record: " + msg);
+			result += msg + " ";
 		}
-		return "{}";
+		return result;
 	}
 
 }