More project reorganization and build fixes.

awslabs · Mar 2, 2016 · ba11587 · ba11587
1 parent ce81f6a
commit ba11587
Show file tree

Hide file tree

Showing 22 changed files with 366 additions and 136 deletions.
diff --git a/...LambdaTestConsumer/license/asl/header.txt → .../KinesisAggregator/license/asl/header.txt b/...LambdaTestConsumer/license/asl/header.txt → .../KinesisAggregator/license/asl/header.txt
diff --git a/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KinesisAggRecord.java b/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KinesisAggRecord.java
@@ -1,3 +1,19 @@
+/**
+ * Kinesis Producer Library Deaggregation Examples for AWS Lambda/Java
+ *
+ * Copyright 2014, Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 package com.amazonaws.kinesis.agg;
 
 import java.io.ByteArrayOutputStream;

diff --git a/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplAggregator.java b/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplAggregator.java
@@ -1,3 +1,19 @@
+/**
+ * Kinesis Producer Library Deaggregation Examples for AWS Lambda/Java
+ *
+ * Copyright 2014, Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 package com.amazonaws.kinesis.agg;
 
 import java.nio.ByteBuffer;

diff --git a/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplAggregatorListener.java b/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplAggregatorListener.java
@@ -1,3 +1,19 @@
+/**
+ * Kinesis Producer Library Deaggregation Examples for AWS Lambda/Java
+ *
+ * Copyright 2014, Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 package com.amazonaws.kinesis.agg;
 
 import java.nio.ByteBuffer;

diff --git a/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplBatchAggregator.java b/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplBatchAggregator.java
@@ -1,3 +1,19 @@
+/**
+ * Kinesis Producer Library Deaggregation Examples for AWS Lambda/Java
+ *
+ * Copyright 2014, Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 package com.amazonaws.kinesis.agg;
 
 import java.nio.ByteBuffer;

diff --git a/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplProgressiveAggregator.java b/java/KinesisAggregator/src/main/java/com/amazonaws/kinesis/agg/KplProgressiveAggregator.java
@@ -1,3 +1,19 @@
+/**
+ * Kinesis Producer Library Deaggregation Examples for AWS Lambda/Java
+ *
+ * Copyright 2014, Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 package com.amazonaws.kinesis.agg;
 
 import java.nio.ByteBuffer;

diff --git a/java/KinesisDeaggregator/.classpath b/java/KinesisDeaggregator/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/java/KinesisLambdaTestConsumer/.gitignore → java/KinesisDeaggregator/.gitignore b/java/KinesisLambdaTestConsumer/.gitignore → java/KinesisDeaggregator/.gitignore
diff --git a/java/KinesisLambdaTestConsumer/.project → java/KinesisDeaggregator/.project b/java/KinesisLambdaTestConsumer/.project → java/KinesisDeaggregator/.project
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>KinesisDeaggregator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>KinesisDeaggregator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/java/KinesisLambdaTestConsumer/README.md → java/KinesisDeaggregator/README.md b/java/KinesisLambdaTestConsumer/README.md → java/KinesisDeaggregator/README.md
@@ -49,50 +49,50 @@ Using Lists rather than Java Streams, this same funcitonality can be provided by
 			logger.log(e.getMessage());
 		}
 ```
-
+
 ## Instructions for Use
-
-1. Run Maven->Install to build the project
-2. Create a new Lambda function in your AWS account
-3. Skip blueprint selection
-4. Choose Java 8 as the runtime
-5. Choose the built file (from step #2) KinesisLambdaTestConsumer-1.0-dev.jar as the code for the function (NOT the KinesisLambdaTestConsumer-0.0.1.jar file).
-6. Choose com.amazonaws.KinesisLambdaReceiver as the Handler
-7. Set the default batch size as required for your Stream throughput
-8. Set the Role, Memory and Timeout appropriately.
-9. Connect your new Lambda function to the Kinesis stream you'll be publishing to
+
+1. Run Maven->Install to build the project
+2. Create a new Lambda function in your AWS account
+3. Skip blueprint selection
+4. Choose Java 8 as the runtime
+5. Choose the built file (from step #2) KinesisLambdaTestConsumer-1.0-dev.jar as the code for the function (NOT the KinesisLambdaTestConsumer-0.0.1.jar file).
+6. Choose com.amazonaws.KinesisLambdaReceiver as the Handler
+7. Set the default batch size as required for your Stream throughput
+8. Set the Role, Memory and Timeout appropriately.
+9. Connect your new Lambda function to the Kinesis stream you'll be publishing to
 
 ## IAM Role
-
-This is a sample IAM policy for the Lambda execution role:
-
-```
- {
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Action": [
-        "lambda:InvokeFunction"
-      ],
-      "Resource": [
-        "*"
-      ]
-    },
-    {
-      "Effect": "Allow",
-      "Action": [
-        "kinesis:GetRecords",
-        "kinesis:GetShardIterator",
-        "kinesis:DescribeStream",
-        "kinesis:ListStreams",
-        "logs:CreateLogGroup",
-        "logs:CreateLogStream",
-        "logs:PutLogEvents"
-      ],
-      "Resource": "*"
-    }
-  ]
+
+This is a sample IAM policy for the Lambda execution role:
+
+```
+ {
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "lambda:InvokeFunction"
+      ],
+      "Resource": [
+        "*"
+      ]
+    },
+    {
+      "Effect": "Allow",
+      "Action": [
+        "kinesis:GetRecords",
+        "kinesis:GetShardIterator",
+        "kinesis:DescribeStream",
+        "kinesis:ListStreams",
+        "logs:CreateLogGroup",
+        "logs:CreateLogStream",
+        "logs:PutLogEvents"
+      ],
+      "Resource": "*"
+    }
+  ]
 }
 ```
 

diff --git a/...ist/KinesisLambdaTestConsumer-1.0-dev.jar → ...ist/KinesisLambdaTestConsumer-1.0-dev.jar b/...ist/KinesisLambdaTestConsumer-1.0-dev.jar → ...ist/KinesisLambdaTestConsumer-1.0-dev.jar
diff --git a/java/KinesisDeaggregator/license/asl/header.txt b/java/KinesisDeaggregator/license/asl/header.txt
@@ -0,0 +1,14 @@
+Kinesis Producer Library Deaggregation Examples for AWS Lambda/Java
+
+Copyright 2014, Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+
+Licensed under the Amazon Software License (the "License").
+You may not use this file except in compliance with the License.
+A copy of the License is located at
+
+ http://aws.amazon.com/asl/
+
+or in the "license" file accompanying this file. This file is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing
+permissions and limitations under the License.
diff --git a/java/KinesisLambdaTestConsumer/pom.xml → java/KinesisDeaggregator/pom.xml b/java/KinesisLambdaTestConsumer/pom.xml → java/KinesisDeaggregator/pom.xml
@@ -1,58 +1,58 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>KinesisDeaggregator</artifactId>
-	<packaging>jar</packaging>
-	<parent>
-		<groupId>com.amazonaws.services.lambda</groupId>
-		<artifactId>kpl-lambda-java</artifactId>
-		<version>1.0</version>
-	</parent>
-	<build>
-		<defaultGoal>clean compile</defaultGoal>
-		<sourceDirectory>src/main/java</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<shadedArtifactAttached>true</shadedArtifactAttached>
-							<shadedClassifierName>dev</shadedClassifierName>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>com.amazonaws</groupId>
-			<artifactId>amazon-kinesis-client</artifactId>
-			<version>${aws-kinesis-client.version}</version>
-			<!-- remove legacy dependency on the full java aws sdk -->
-			<exclusions>
-				<exclusion>
-					<groupId>com.amazonaws</groupId>
-					<artifactId>aws-java-sdk</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.amazonaws</groupId>
-			<artifactId>aws-lambda-java-events</artifactId>
-			<version>${aws-lambda-sdk.version}</version>
-		</dependency>
-	</dependencies>
-	<version>1.1.0</version>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>KinesisDeaggregator</artifactId>
+	<packaging>jar</packaging>
+	<parent>
+		<groupId>com.amazonaws.services.lambda</groupId>
+		<artifactId>kpl-lambda-java</artifactId>
+		<version>1.0</version>
+	</parent>
+	<build>
+		<defaultGoal>clean compile</defaultGoal>
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<createDependencyReducedPom>false</createDependencyReducedPom>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<shadedArtifactAttached>true</shadedArtifactAttached>
+							<shadedClassifierName>dev</shadedClassifierName>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>amazon-kinesis-client</artifactId>
+			<version>${aws-kinesis-client.version}</version>
+			<!-- remove legacy dependency on the full java aws sdk -->
+			<exclusions>
+				<exclusion>
+					<groupId>com.amazonaws</groupId>
+					<artifactId>aws-java-sdk</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-lambda-java-events</artifactId>
+			<version>${aws-lambda-sdk.version}</version>
+		</dependency>
+	</dependencies>
+	<version>1.1.0</version>
 </project>