Merge branch 'master' into lambda

Author: mwunderl

README.md

@@ -69,10 +69,12 @@ The `master` branch shows the use of Spring, Angular, nginx, the [AWS SDK for Ja
 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 an [Amazon Cognito](http://aws.amazon.com/cognito) user pool.
+- [`cognito`](https://github.com/awslabs/eb-java-scorekeep/tree/cognito) - Support login and store users in an [Amazon Cognito](http://aws.amazon.com/cognito) user pool. Get AWS SDK credentials and make service calls with a Cognito identity pool.
+- [`cognito-basic`](https://github.com/awslabs/eb-java-scorekeep/tree/cognito-basic) - Use Cognito for user ID storage. User pool only, no identity pool.
 - [`lambda`](https://github.com/awslabs/eb-java-scorekeep/tree/lambda) - Call an [AWS Lambda](http://aws.amazon.com/lambda) function to generate random names.
 - [`sql`](https://github.com/awslabs/eb-java-scorekeep/tree/sql) - Use JDBC to store game histories in an attached PostgreSQL database instance.
-- [`xray`](https://github.com/awslabs/eb-java-scorekeep/tree/xray) - Use the [AWS X-Ray SDK for Java](http://docs.aws.amazon.com/xray-sdk-for-java/latest/javadoc/) to instrument incoming requests, SDK clients, SQL queries, HTTP clients, and sections of code.
+- [`xray`](https://github.com/awslabs/eb-java-scorekeep/tree/xray) - Use the [AWS X-Ray SDK for Java](http://docs.aws.amazon.com/xray-sdk-for-java/latest/javadoc/) to instrument incoming requests, functions, SDK clients, SQL queries, HTTP clients, startup code, and AWS Lambda functions.
+- [`xray-cognito`](https://github.com/awslabs/eb-java-scorekeep/tree/xray-cognito) - Use AWS credentials obtained with Amazon Cognito to upload trace data to X-Ray from the browser.
 - [`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 SDK for Java to instrument incoming requests and SDK clients (no additional configuration required).
 
 Use the procedures in the following sections to run the project on Elastic Beanstalk and configure it for local testing and development.
@@ -126,7 +128,7 @@ Deploy the source code for the project to your Elastic Beanstalk environment.
 
 **To deploy the source code**
 
-1. Download the source bundle: [eb-java-scorekeep-v1.zip](https://github.com/awslabs/eb-java-scorekeep/releases/download/v1.3/eb-java-scorekeep-v1.zip)
+1. Download the source bundle: [eb-java-scorekeep-v1.zip](https://github.com/awslabs/eb-java-scorekeep/releases/download/v1.5/eb-java-scorekeep-v1.zip)
 2. Open the [Elastic Beanstalk console](console.aws.amazon.com/elasticbeanstalk/home).
 3. Choose your environment's name to open the Dashboard.
 4. Choose **Upload and Deploy**.

public/index.html

@@ -4,8 +4,8 @@
     <title>Scorekeep</title>
     <meta charset="utf-8"/>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
-    <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-route.js"></script>
-    <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-resource.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-route.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-resource.js"></script>
     <script src="app/scorekeep.js"></script>
     <script src="app/routes.js"></script>
     <script src="app/services.js"></script>

src/main/java/scorekeep/MoveFactory.java

@@ -4,8 +4,10 @@
 import java.util.List;
 import java.util.Set;
 import java.lang.Class;
+import java.lang.Thread;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +18,7 @@ public class MoveFactory {
   private final StateModel stateModel = new StateModel();
   private final GameController gameController = new GameController();
   private final StateController stateController = new StateController();
-  private final RulesFactory rulesFactory = new RulesFactory(); 
+  private final RulesFactory rulesFactory = new RulesFactory();
 
   public MoveFactory(){
   }
@@ -58,7 +60,12 @@ public Move newMove(String sessionId, String gameId, String userId, String moveT
     State newState = new State(stateId, sessionId, gameId, newStateText, newTurn);
     // send notification on game end
     if ( newStateText.startsWith("A") || newStateText.startsWith("B")) {
-      Sns.sendNotification("Scorekeep game completed", "Winner: " + userId);
+      Thread comm = new Thread() {
+        public void run() {
+          Sns.sendNotification("Scorekeep game completed", "Winner: " + userId);
+        }
+      };
+      comm.start();
     }
     // register state and move id to game
     gameController.setGameMove(sessionId, gameId, moveId);

src/main/java/scorekeep/UserFactory.java

@@ -56,6 +56,7 @@ public String randomName() throws IOException {
       Map<String, String> jsonMap = mapper.readValue(inputStream, Map.class);
       String name = jsonMap.get("name");
       EntityUtils.consume(entity);
+      Sns.sendNotification("Scorekeep user created", "Name: " + name);
       return name;
     } finally {
       response.close();

src/main/java/scorekeep/WebConfig.java

@@ -17,7 +17,10 @@ public Filter SimpleCORSFilter() {
 
   static {
     if ( System.getenv("NOTIFICATION_EMAIL") != null ){
-      Sns.createSubscription();
+      try { Sns.createSubscription(); }
+      catch (Exception e ) {
+        logger.warn("Failed to create subscription for email "+  System.getenv("NOTIFICATION_EMAIL"));
+      }
     }
   }
 }