Identifiers utility class

Author: mwunderl

src/main/java/scorekeep/GameFactory.java

@@ -1,11 +1,8 @@
 package scorekeep;
 import java.util.*;
-import java.security.SecureRandom;
-import java.math.BigInteger;
 import java.lang.Exception;
 
 public class GameFactory {
-  private final SecureRandom random = new SecureRandom();
   private final HashMap<String, Game> allGames = new HashMap<String, Game>(1);
   private final GameModel model = new GameModel();
   private final SessionController sessionController = new SessionController();
@@ -14,7 +11,7 @@ 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/Identifiers.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/MoveFactory.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;
@@ -13,7 +11,6 @@
 
 public class MoveFactory {
   private static final Logger logger = LoggerFactory.getLogger(MoveFactory.class);
-  private final SecureRandom random = new SecureRandom();
   private final HashMap<String, Move> allMoves = new HashMap<String, Move>(1);
   private final MoveModel moveModel = new MoveModel();
   private final StateModel stateModel = new StateModel();
@@ -25,8 +22,8 @@ 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();
+    String moveId = Identifiers.random();
+    String stateId = Identifiers.random();
     Move move = new Move(moveId, sessionId, gameId, userId, moveText);
     String newStateText = "";
     // load game state

src/main/java/scorekeep/SessionFactory.java

@@ -1,18 +1,15 @@
 package scorekeep;
 import java.util.*;
-import java.security.SecureRandom;
-import java.math.BigInteger;
 import java.lang.Exception;
 
 public class SessionFactory {
-  private final SecureRandom random = new SecureRandom();
   private final SessionModel model = new SessionModel();
 
   public SessionFactory(){
   }
 
   public Session newSession() {
-    String id = new BigInteger(40, random).toString(32).toUpperCase();
+    String id = Identifiers.random();
     Session session = new Session(id);
     model.saveSession(session);
     return session;

src/main/java/scorekeep/StateFactory.java

@@ -1,18 +1,15 @@
 package scorekeep;
 import java.util.*;
-import java.security.SecureRandom;
-import java.math.BigInteger;
 import java.lang.Exception;
 
 public class StateFactory {
-  private final SecureRandom random = new SecureRandom();
   private final StateModel model = new StateModel();
 
   public StateFactory(){
   }
 
   public State newState(String sessionId, String gameId, String stateText, Set<String> turn) throws SessionNotFoundException, GameNotFoundException {
-    String id = new BigInteger(40, random).toString(32).toUpperCase();
+    String id = Identifiers.random();
     State state = new State(id, sessionId, gameId, stateText, turn);
     model.saveState(state);
     return state;

src/main/java/scorekeep/UserFactory.java

@@ -10,20 +10,17 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.SecureRandom;
 import java.util.List;
 import java.util.Map;
 
 public class UserFactory {
-  private final SecureRandom random = new SecureRandom();
   private final UserModel model = new UserModel();
 
   public UserFactory(){
   }
 
   public User newUser() throws IOException {
-    String id = new BigInteger(40, random).toString(32).toUpperCase();
+    String id = Identifiers.random();
     User user = new User(id);
     String name = randomName();
     user.setName(name);
@@ -32,7 +29,7 @@ public User newUser() throws IOException {
   }
 
   public User newUser(String name) throws IOException {
-    String id = new BigInteger(40, random).toString(32).toUpperCase();
+    String id = Identifiers.random();
     User user = new User(id);
     user.setName(name);
     model.saveUser(user);