Merge branch 'master' into xray

Michael Wunderlich · Michael Wunderlich · commit a56e9d5f64a2 · 2016-12-15T03:02:56.000Z
Conflicts:
	build.gradle
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ build/*
 !.elasticbeanstalk/*.global.yml
 *.zip
 *.sh
+!bin/*.sh
 lib
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Deploy the source code for the project to your Elastic Beanstalk environment.
 5. Upload **eb-java-scorekeep-v1.zip** and click **Deploy**.
 6. Open the environment URL. 
 
-![Scorekeep front page](/img/scorekeep-frontpage.png)
+![Scorekeep flow](/img/scorekeep-flow.png)
 
 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.
 
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
 dependencyManagement {
     imports {
-        mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.52")
+        mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")
         mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.0-beta")
     }
 }
diff --git a/img/scorekeep-flow.png b/img/scorekeep-flow.png
diff --git a/public/app/userCollection.js b/public/app/userCollection.js
@@ -6,7 +6,7 @@ module.service('UserCollection', function(UserService, api) {
       return UserService.get({ id: userid })
     }
     var user = new UserService();
-    if ( username == "random") {
+    if ( username === "random") {
       return user.$save();
     } else {
       user.name = username;
diff --git a/src/main/java/scorekeep/MoveFactory.java b/src/main/java/scorekeep/MoveFactory.java
@@ -1,8 +1,10 @@
 package scorekeep;
-import java.util.*;
-import java.security.SecureRandom;
+
 import java.math.BigInteger;
-import java.lang.Exception;
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 
 public class MoveFactory {
   private SecureRandom random = new SecureRandom();
@@ -22,7 +24,7 @@ public Move newMove(String sessionId, String gameId, String userId, String moveT
     Move move = new Move(moveId, sessionId, gameId, userId, moveText);
     // load game state
     Game game = gameController.getGame(sessionId, gameId);
-    ArrayList<String> states = game.getStates();
+    List<String> states = game.getStates();
     State oldState = stateController.getState(sessionId, gameId, states.get(states.size() - 1));
     Set<String> oldTurn = oldState.getTurn();
     // check turn 
diff --git a/src/main/java/scorekeep/MoveModel.java b/src/main/java/scorekeep/MoveModel.java
@@ -1,28 +1,15 @@
 package scorekeep;
 
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.profile.ProfileCredentialsProvider;
-import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
-import com.amazonaws.regions.Regions;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.lang.Exception;
-import java.lang.Throwable;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class MoveModel {
   /** AWS SDK credentials. */
@@ -37,17 +24,13 @@ public void saveMove(Move move) throws SessionNotFoundException, GameNotFoundExc
     // check session
     String sessionId = move.getSession();
     String gameId = move.getGame();
-    try {
-      if (sessionModel.loadSession(sessionId) == null ) {
-        throw new SessionNotFoundException(sessionId);
-      }
-      if (gameModel.loadGame(gameId) == null ) {
-        throw new GameNotFoundException(gameId);
-      }
-      mapper.save(move);
-    } catch (Exception e) {
-      throw e;
+    if (sessionModel.loadSession(sessionId) == null ) {
+      throw new SessionNotFoundException(sessionId);
+    }
+    if (gameModel.loadGame(gameId) == null ) {
+      throw new GameNotFoundException(gameId);
     }
+    mapper.save(move);
   }
 
   public Move loadMove(String moveId) throws MoveNotFoundException {
diff --git a/src/main/java/scorekeep/StateModel.java b/src/main/java/scorekeep/StateModel.java
@@ -1,28 +1,15 @@
 package scorekeep;
 
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.profile.ProfileCredentialsProvider;
-import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
-import com.amazonaws.regions.Regions;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.lang.Exception;
-import java.lang.Throwable;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /** Saves state objects to DynamoDB
     Loads state objects from DynamoDB
@@ -41,17 +28,13 @@ public void saveState(State state) throws SessionNotFoundException, GameNotFound
     // check session
     String sessionId = state.getSession();
     String gameId = state.getGame();
-    try {
-      if (sessionModel.loadSession(sessionId) == null ) {
-        throw new SessionNotFoundException(sessionId);
-      }
-      if (gameModel.loadGame(gameId) == null ) {
-        throw new GameNotFoundException(gameId);
-      }
-      mapper.save(state);
-    } catch (Exception e) {
-      throw e;
+    if (sessionModel.loadSession(sessionId) == null ) {
+      throw new SessionNotFoundException(sessionId);
+    }
+    if (gameModel.loadGame(gameId) == null ) {
+      throw new GameNotFoundException(gameId);
     }
+    mapper.save(state);
   }
 
   public State loadState(String stateId) throws StateNotFoundException {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ dependencies {`
`45`	`45`
`46`	`46`	`dependencyManagement {`
`47`	`47`	`imports {`
`48`		`- mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.52")`
	`48`	`+ mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")`
`49`	`49`	`mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.0-beta")`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ module.service('UserCollection', function(UserService, api) {`
`6`	`6`	`return UserService.get({ id: userid })`
`7`	`7`	`}`
`8`	`8`	`var user = new UserService();`
`9`		`- if ( username == "random") {`
	`9`	`+ if ( username === "random") {`
`10`	`10`	`return user.$save();`
`11`	`11`	`} else {`
`12`	`12`	`user.name = username;`