Merge branch 'lambda' into xray

Author: mwunderl

README.md

@@ -36,9 +36,11 @@ In [`application-pgsql.properties`](https://github.com/awslabs/eb-java-scorekeep
 Hibernate also calls the database during application startup. No segment is available to the X-Ray SDK during startup, so we create one manually in [`RdsWebConfig.java`](https://github.com/awslabs/eb-java-scorekeep/blob/xray/src/main/java/scorekeep/RdsWebConfig.java#L83) by overriding Hibernate's `SchemaExport` class.
 
 # Scorekeep
-Scorekeep is a RESTful web API implemented in Java that uses Spring to provide an HTTP interface for creating and managing game sessions and users. This project includes the scorekeep API and a frontend web app that consumes it. The frontend and API can run on the same server and domain or separately, with the API running in Elastic Beanstalk and the frontend served statically by a CDN.
+Scorekeep is a RESTful web API implemented in Java that uses Spring to provide an HTTP interface for creating and managing game sessions and users. This project includes the Scorekeep API and a frontend web app that consumes it. The frontend and API can run on the same server and domain or separately, with the API running in Elastic Beanstalk and the frontend served statically by a CDN.
 
-The project shows the use of Spring, Angular, nginx, the AWS SDK for Java, DynamoDB, Gradle, CORS, and Elastic Beanstalk features that let you run both components on the same EC2 instance, create required DynamoDB tables as part of the Elastic Beanstalk environment, and build the API from source on-instance during deployment.
+The `master` branch shows the use of Spring, Angular, nginx, the AWS SDK for Java, DynamoDB, Gradle, CORS, and Elastic Beanstalk features that let you run both components on the same EC2 instance, create required DynamoDB and SNS resources as part of the Elastic Beanstalk environment, and build the API from source on-instance during deployment.
+
+Other branches extend the application's functionality and show the use of other AWS services. See the readme in each branch for details about the integration, and instructions for use.
 
 **Branches**
 - [`cognito`](https://github.com/awslabs/eb-java-scorekeep/tree/cognito) - Support login and store users in a Cognito user pool.
@@ -47,9 +49,35 @@ The project shows the use of Spring, Angular, nginx, the AWS SDK for Java, Dynam
 - [`xray`](https://github.com/awslabs/eb-java-scorekeep/tree/xray) - Use the AWS X-Ray SDK to instrument incoming requests, SDK clients, SQL queries, HTTP clients, and sections of code.
 - [`xray-gettingstarted`](https://github.com/awslabs/eb-java-scorekeep/tree/xray-gettingstarted) ([tutorial](https://docs.aws.amazon.com/xray/latest/devguide/xray-gettingstarted.html)) - Use the AWS X-Ray to instrument incoming requests and SDK clients (no additional configuration required).
 
-Use the procedures in the following sections to run the project on AWS Elastic Beanstalk and configure it for local testing and development. 
+Use the procedures in the following sections to run the project on AWS Elastic Beanstalk and configure it for local testing and development.
+
+**Sections**
+- [Prerequisites](#prerequisites)
+- [Deploy the application](#deploy-the-application)
+- [Configure notifications](#configure-notifications)
+- [How it works](#how-it-works)
+- [Running the project locally](#running-the-project-locally)
+- [Contributing](#contributing)
+
+# Prerequisites
+- User permissions - Elastic Beanstalk, IAM*
+- Instance profile with permission to use DynamoDB and SNS
+- Elastic Beanstalk environment running Java 8
+
+*If you don't have permission to manage permissions in IAM, get someone who does to add DynamoDB and SNS permissions to the default Elastic Beanstalk instance profile.
+
+## Get permission to use Elastic Beanstalk
+If you are using an IAM user with limited permissions, good work! Add Elastic Beanstalk permissions to your user account to get started.
+
+*To add Elastic Beanstalk permissions to an IAM user*
+
+1. Sign in to a user or role with administrator permissions.
+2. Open the [users page](https://console.aws.amazon.com/iam/home#/users) of the IAM console.
+3. Choose a user.
+4. Click **Add permissions**.
+5. Add the  **AWSElasticBeanstalkFullAccess** managed policy.
 
-## Create an AWS Elastic Beanstalk environment
+## Create an Elastic Beanstalk environment
 Create a Java 8 SE environment in Elastic Beanstalk to host the application.
 
 *To create an Elastic Beanstalk environment running the Java 8 SE platform*
@@ -69,7 +97,7 @@ When the Scorekeep API runs in AWS Elastic Beanstalk, it uses the permissions of
 3. Select [AmazonDynamoDBFullAccess](https://console.aws.amazon.com/iam/home#policies/arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess) and click **Attach Policy**.
 3. Select [AmazonSNSFullAccess](https://console.aws.amazon.com/iam/home#policies/arn:aws:iam::aws:policy/AmazonSNSFullAccess) and click **Attach Policy**.
 
-## Deploy the application
+# Deploy the application
 Deploy the source code for the project to your Elastic Beanstalk environment.
 
 *To deploy the source code*
@@ -85,7 +113,7 @@ Deploy the source code for the project to your Elastic Beanstalk environment.
 
 Click through the app to explore its functionality. Use the network console in your browser to see the HTTP requests that it sends to the API to read and write users, sessions, games, moves and game state to DynamoDB via the API.
 
-## Configure Notifications
+# Configure notifications
 The API uses Amazon SNS to send a notification email when a game ends. To enable notifications, configure your email address in an environment variable.
 
 *To enable notifications*
@@ -195,4 +223,30 @@ When you run both the API and frontend in the same Elastic Beanstalk environment
 
         ~/eb-java-scorekeep$ git archive -o scorekeep-v1.zip HEAD
 
-5. Open your environment's Dashboard in the [Elastic Beanstalk Management Console](console.aws.amazon.com/elasticbeanstalk/home) and deploy the updated code.
+5. Open your environment's Dashboard in the [Elastic Beanstalk Management Console](console.aws.amazon.com/elasticbeanstalk/home) and deploy the updated code.
+
+# Contributing
+
+This sample application could be better with your help!
+
+- Add a new game!
+  - Implement game logic in game class. See [TicTacToe.java](https://github.com/awslabs/eb-java-scorekeep/blob/master/src/main/java/scorekeep/TicTacToe.java)
+  - Add the class to [RulesFactory.java](https://github.com/awslabs/eb-java-scorekeep/blob/master/src/main/java/scorekeep/RulesFactory.java)
+- Create your own client frontend!
+  - Web frameworks - Angular 2, React, ember, etc
+  - Mobile app
+  - Desktop application
+- Integrate with other AWS services!
+  - CICD with CodeCommit, CodePipeline, CodeBuild, and CodeDeploy
+  - Analytics with Kinesis, Athena, EMR, or QuickSight
+  - Security with VPC
+  - Performance with ElastiCache
+  - Scalability with CloudFront
+  - Portability with ECS or CloudFormation
+  - Accessibility with Polly
+- Write tests!
+  - Unit tests
+  - Integration tests
+  - Functional tests
+  - Load tests
+- File an [issue](https://github.com/awslabs/eb-java-scorekeep/issues) to report a bug or request new features.

src/main/java/scorekeep/GameModel.java

@@ -6,16 +6,17 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
-import com.amazonaws.xray.AWSXRay;
-import com.amazonaws.xray.entities.Segment;
-import com.amazonaws.xray.entities.Subsegment;
-import com.amazonaws.xray.handlers.TracingHandler;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.amazonaws.xray.AWSXRay;
+import com.amazonaws.xray.entities.Segment;
+import com.amazonaws.xray.entities.Subsegment;
+import com.amazonaws.xray.handlers.TracingHandler;
+
 public class GameModel {
   /** AWS SDK credentials. */
   private AmazonDynamoDB client = AmazonDynamoDBClientBuilder.standard()

src/main/java/scorekeep/SessionModel.java

@@ -5,12 +5,13 @@
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScanExpression;
+
+import java.util.List;
+
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Subsegment;
 import com.amazonaws.xray.handlers.TracingHandler;
 
-import java.util.List;
-
 public class SessionModel {
   /** AWS SDK credentials. */
   private AmazonDynamoDB client = AmazonDynamoDBClientBuilder.standard()

src/main/java/scorekeep/UserFactory.java

@@ -1,6 +1,5 @@
 package scorekeep;
 
-import com.amazonaws.xray.proxies.apache.http.HttpClientBuilder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -22,6 +21,8 @@
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.lambda.model.ResourceNotFoundException;
 
+import com.amazonaws.xray.proxies.apache.http.HttpClientBuilder;
+
 public class UserFactory {
   private SecureRandom random = new SecureRandom();
   private UserModel model = new UserModel();

src/main/java/scorekeep/UserModel.java

@@ -5,12 +5,13 @@
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScanExpression;
+
+import java.util.List;
+
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Subsegment;
 import com.amazonaws.xray.handlers.TracingHandler;
 
-import java.util.List;
-
 public class UserModel {
   /** AWS SDK credentials. */
   private AmazonDynamoDB client = AmazonDynamoDBClientBuilder.standard()