Merge branch 'master' into xray-gettingstarted

Author: mwunderl

README.md

@@ -11,7 +11,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIgnore;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
 
-@DynamoDBTable( tableName = Constants.GAME_TABLE )
+@DynamoDBTable( tableName = TableNames.GAME_TABLE )
 public class Game {
 
   private String id;

src/main/java/scorekeep/Game.java

@@ -17,9 +17,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.security.SecureRandom;
-import java.math.BigInteger;
-
 @RestController
 @RequestMapping(value="/api/game/{sessionId}")
 /** Routes for game CRUD 
@@ -28,11 +25,10 @@
     Use GameModel to persist updated Game objects to DynamoDB
 **/
 public class GameController {
-  private SecureRandom random = new SecureRandom();
-  private GameFactory gameFactory = new GameFactory();
-  private RulesFactory rulesFactory = new RulesFactory();
-  private StateFactory stateFactory = new StateFactory();
-  private GameModel model = new GameModel();
+  private final GameFactory gameFactory = new GameFactory();
+  private final RulesFactory rulesFactory = new RulesFactory();
+  private final StateFactory stateFactory = new StateFactory();
+  private final GameModel model = new GameModel();
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
   /* GET /game/SESSION/ */
   @RequestMapping(method=RequestMethod.GET)

src/main/java/scorekeep/GameController.java

@@ -1,20 +1,17 @@
 package scorekeep;
 import java.util.*;
-import java.security.SecureRandom;
-import java.math.BigInteger;
 import java.lang.Exception;
 
 public class GameFactory {
-  private SecureRandom random = new SecureRandom();
   private final HashMap<String, Game> allGames = new HashMap<String, Game>(1);
-  private GameModel model = new GameModel();
-  private SessionController sessionController = new SessionController();
+  private final GameModel model = new GameModel();
+  private final SessionController sessionController = new SessionController();
 
   public GameFactory(){
   }
 
   public Game newGame(String sessionId) throws SessionNotFoundException, GameNotFoundException {
-    String gameId = new BigInteger(40, random).toString(32).toUpperCase();
+    String gameId = Identifiers.random();
     Game game = new Game(gameId, sessionId);
     model.saveGame(game);
     // Register game to session

src/main/java/scorekeep/GameFactory.java

@@ -1,6 +1,5 @@
 package scorekeep;
 
-import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
@@ -15,22 +14,17 @@
 public class GameModel {
   /** AWS SDK credentials. */
   private AmazonDynamoDB client = AmazonDynamoDBClientBuilder.standard()
-        .withRegion(Regions.fromName(System.getenv("AWS_REGION")))
         .build();
   private DynamoDBMapper mapper = new DynamoDBMapper(client);
-  private SessionModel sessionModel = new SessionModel();
+  private final SessionModel sessionModel = new SessionModel();
 
   public void saveGame(Game game) throws SessionNotFoundException {
-    try {
-      // check session
-      String sessionId = game.getSession();
-      if (sessionModel.loadSession(sessionId) == null ) {
-        throw new SessionNotFoundException(sessionId);
-      }
-      mapper.save(game);
-    } catch (Exception e) {
-      throw e;
+    // check session
+    String sessionId = game.getSession();
+    if (sessionModel.loadSession(sessionId) == null ) {
+      throw new SessionNotFoundException(sessionId);
     }
+    mapper.save(game);
   }
 
   public Game loadGame(String gameId) throws GameNotFoundException {

src/main/java/scorekeep/GameModel.java

@@ -0,0 +1,13 @@
+package scorekeep;
+
+import java.security.SecureRandom;
+import java.math.BigInteger;
+
+public class Identifiers {
+  private static final SecureRandom secureRandom = new SecureRandom();
+
+  public static String random() {
+    return new BigInteger(40, secureRandom).toString(32).toUpperCase();
+  }
+
+}

src/main/java/scorekeep/Identifiers.java

@@ -9,7 +9,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIgnore;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
 
-@DynamoDBTable( tableName = Constants.MOVE_TABLE )
+@DynamoDBTable( tableName = TableNames.MOVE_TABLE )
 public class Move {
 
   private String id;
@@ -21,53 +21,48 @@ public class Move {
   public Move() {
   }
 
-  public Move(String id, String session, String game, String user, String move) {
-    this.id = id;
-    this.session = session;
-    this.game = game;
-    this.user = user;
-    this.move = move;
-  }
-
   @DynamoDBHashKey(attributeName="id")
   public String getId() {
     return id;
   }
-  public void setId(String id){
+  public Move setId(String id){
     this.id = id;
+    return this;
   }
 
   @DynamoDBIndexHashKey(globalSecondaryIndexName="game-index",attributeName="game")
   public String getGame() {
     return game;
   }
-  public void setGame(String gameId){
+  public Move setGame(String gameId){
     this.game = gameId;
+    return this;
   }
 
   @DynamoDBAttribute(attributeName="session")  
   public String getSession() {
     return session;
   }
-  public void setSession(String sessionId) {
+  public Move setSession(String sessionId) {
     this.session = sessionId;
+    return this;
   }
 
   @DynamoDBAttribute(attributeName="user")  
   public String getUser() {
     return user;
   }
-  public void setUser(String userId) {
+  public Move setUser(String userId) {
     this.user = userId;
+    return this;
   }
 
   @DynamoDBAttribute(attributeName="move")  
   public String getMove() {
     return move;
   }
-  public void setMove(String moveId) {
+  public Move setMove(String moveId) {
     this.move = moveId;
+    return this;
   }
-
-
 }

src/main/java/scorekeep/Move.java

@@ -14,16 +14,12 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.security.SecureRandom;
-import java.math.BigInteger;
-
 @RestController
 @RequestMapping(value="/api/move/{sessionId}/{gameId}")
 public class MoveController {
-  private SecureRandom random = new SecureRandom();
-  private MoveFactory moveFactory = new MoveFactory();
-  private MoveModel model = new MoveModel();
-  private GameController gameController = new GameController();
+  private final MoveFactory moveFactory = new MoveFactory();
+  private final MoveModel model = new MoveModel();
+  private final GameController gameController = new GameController();
   /* GET /move/SESSION/GAME */
   @RequestMapping(method=RequestMethod.GET)
   public List<Move> getMoves(@PathVariable String sessionId, @PathVariable String gameId) throws SessionNotFoundException, GameNotFoundException {

src/main/java/scorekeep/MoveController.java

@@ -1,7 +1,5 @@
 package scorekeep;
 
-import java.math.BigInteger;
-import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
@@ -12,22 +10,25 @@
 import org.slf4j.LoggerFactory;
 
 public class MoveFactory {
-  private static final Logger logger = LoggerFactory.getLogger("scorekeep.MoveFactory");
-  private SecureRandom random = new SecureRandom();
+  private static final Logger logger = LoggerFactory.getLogger(MoveFactory.class);
   private final HashMap<String, Move> allMoves = new HashMap<String, Move>(1);
-  private MoveModel moveModel = new MoveModel();
-  private StateModel stateModel = new StateModel();
-  private GameController gameController = new GameController();
-  private StateController stateController = new StateController();
-  private RulesFactory rulesFactory = new RulesFactory(); 
+  private final MoveModel moveModel = new MoveModel();
+  private final StateModel stateModel = new StateModel();
+  private final GameController gameController = new GameController();
+  private final StateController stateController = new StateController();
+  private final RulesFactory rulesFactory = new RulesFactory(); 
 
   public MoveFactory(){
   }
 
   public Move newMove(String sessionId, String gameId, String userId, String moveText) throws SessionNotFoundException, GameNotFoundException, StateNotFoundException, RulesException {
-    String moveId = new BigInteger(40, random).toString(32).toUpperCase();
-    String stateId = new BigInteger(40, random).toString(32).toUpperCase();
-    Move move = new Move(moveId, sessionId, gameId, userId, moveText);
+    String moveId = Identifiers.random();
+    String stateId = Identifiers.random();
+    Move move = new Move().setId(moveId)
+                          .setSession(sessionId)
+                          .setGame(gameId)
+                          .setUser(userId)
+                          .setMove(moveText);
     String newStateText = "";
     // load game state
     Game game = gameController.getGame(sessionId, gameId);
@@ -57,7 +58,7 @@ 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")) {
-      Utils.sendNotification("Scorekeep game completed", "Winner: " + userId);
+      Sns.sendNotification("Scorekeep game completed", "Winner: " + userId);
     }
     // register state and move id to game
     gameController.setGameMove(sessionId, gameId, moveId);

src/main/java/scorekeep/MoveFactory.java

@@ -1,6 +1,5 @@
 package scorekeep;
 
-import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
@@ -14,11 +13,10 @@
 public class MoveModel {
   /** AWS SDK credentials. */
   private AmazonDynamoDB client = AmazonDynamoDBClientBuilder.standard()
-        .withRegion(Regions.fromName(System.getenv("AWS_REGION")))
         .build();
   private DynamoDBMapper mapper = new DynamoDBMapper(client);
-  private SessionModel sessionModel = new SessionModel();
-  private GameModel gameModel = new GameModel();
+  private final SessionModel sessionModel = new SessionModel();
+  private final GameModel gameModel = new GameModel();
 
   public void saveMove(Move move) throws SessionNotFoundException, GameNotFoundException {
     // check session

src/main/java/scorekeep/MoveModel.java

@@ -2,55 +2,79 @@
 
 public class Rules {
 
-  private final String id;
-  private final String name;
-  private final String[] categories;
-  private final Integer[] users;
-  private final Integer teams;
-  private final String[] phases;
-  private final String[] moves;
-  private final String initialState;
-
-  public Rules(String id, String name, String[] categories, Integer[] users, Integer teams, String[] phases, String[] moves, String initialState) {
-    this.id = id;
-    this.name = name;
-    this.categories = categories;
-    this.users = users;
-    this.teams = teams;
-    this.phases = phases;
-    this.moves = moves;
-    this.initialState = initialState;
-  }
+  private String id;
+  private String name;
+  private String[] categories;
+  private Integer[] users;
+  private Integer teams;
+  private String[] phases;
+  private String[] moves;
+  private String initialState;
+
+  public Rules() {
+  };
 
   public String getId() {
     return id;
   }
+  public Rules setId(String id){
+    this.id = id;
+    return this;
+  }
 
   public String getName() {
     return name;
   }
+  public Rules setName(String name){
+    this.name = name;
+    return this;
+  }
 
   public String[] getCategories() {
     return categories;
   }
+  public Rules setCategories(String[] categories){
+    this.categories = categories;
+    return this;
+  }
 
   public Integer[] getUsers() {
     return users;
   }
+  public Rules setUsers(Integer[] users){
+    this.users = users;
+    return this;
+  }
 
   public Integer getTeams() {
     return teams;
   }
+  public Rules setTeams(Integer teams){
+    this.teams = teams;
+    return this;
+  }
 
   public String[] getPhases() {
     return phases;
   }
+  public Rules setPhases(String[] phases){
+    this.phases = phases;
+    return this;
+  }
 
   public String[] getMoves() {
     return moves;
   }
+  public Rules setMoves(String[] moves){
+    this.moves = moves;
+    return this;
+  }
 
   public String getInitialState() {
     return initialState;
   }
+  public Rules setInitialState(String initialState){
+    this.initialState = initialState;
+    return this;
+  }
 }

src/main/java/scorekeep/Rules.java

@@ -9,14 +9,10 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
-import java.security.SecureRandom;
-import java.math.BigInteger;
-
 @RestController
 @RequestMapping(value="/api/rules")
 public class RulesController {
-  private SecureRandom random = new SecureRandom();
-  private RulesFactory rulesFactory = new RulesFactory();
+  private final RulesFactory rulesFactory = new RulesFactory();
 
   /* GET /rules */
   @RequestMapping(method=RequestMethod.GET)