cleanup

Author: Michael Wunderlich

.ebextensions/dev.config

@@ -4,6 +4,7 @@ option_settings:
   aws:elasticbeanstalk:command:
     DeploymentPolicy: AllAtOnce
     IgnoreHealthCheck: "true"
+    Timeout: 300
   aws:elasticbeanstalk:monitoring:
     Automatically Terminate Unhealthy Instances: "false"
   aws:elasticbeanstalk:healthreporting:system:

.gitignore

@@ -7,4 +7,5 @@ build/*
 !.elasticbeanstalk/*.global.yml
 *.zip
 *.sh
+!bin/*.sh
 lib

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;

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 

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 {

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 {