refactor(sdk): simplify GameLoader

Author: xeruf

sdk/src/server-api/sc/api/plugins/host/GameLoader.java

@@ -12,48 +12,29 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
 import java.util.zip.GZIPInputStream;
 
-public class GameLoader<T> implements IHistoryListener {
+public class GameLoader implements IHistoryListener {
   private static final Logger logger = LoggerFactory.getLogger(GameLoader.class);
   private volatile boolean finished;
-  private T obj = null;
-  private List<Class<T>> clazzes;
+  private int turn = 0;
+  private IGameState obj = null;
   private GameLoaderClient client;
 
-  public GameLoader(List<Class<T>> clazzes) {
-    this.finished = false;
-    this.clazzes = clazzes;
-  }
-
-  public GameLoader(Class<T>... clazz) {
-    this(Arrays.asList(clazz));
-  }
-
-  public T loadGame(String filename) {
-    try {
-      return loadGame(new File(filename));
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  public T loadGame(File file) throws IOException {
+  public IGameState loadGame(File file, int turn) throws IOException {
+    this.turn = turn;
     return loadGame(new FileInputStream(file), file.getName().endsWith(".gz"));
   }
 
-  public T loadGame(FileInputStream stream, boolean gzip) throws IOException {
+  public IGameState loadGame(FileInputStream stream, boolean gzip) throws IOException {
     if (gzip) {
       return loadGame(new GZIPInputStream(stream));
     } else {
       return loadGame(stream);
     }
   }
 
-  public T loadGame(InputStream file) throws IOException {
+  public IGameState loadGame(InputStream file) throws IOException {
     client = new GameLoaderClient(file);
     client.addListener(this);
     client.start();
@@ -79,15 +60,10 @@ public void onGameOver(String roomId, GameResult result) {
   @Override
   public void onNewState(String roomId, IGameState state) {
     logger.debug("Received new state");
-    if (!this.finished) {
-      for (Class<T> clazz : this.clazzes) {
-        if (clazz.isInstance(state)) {
-          logger.debug("Received game info of type {}", clazz.getName());
-          this.obj = clazz.cast(state);
-          this.finished = true;
-          this.client.stop();
-        }
-      }
+    if (!this.finished && state.getTurn() >= turn) {
+      this.obj = state;
+      this.finished = true;
+      this.client.stop();
     }
   }
 

server/src/sc/server/gaming/GameRoomManager.java

@@ -77,17 +77,16 @@ public synchronized GameRoom createGameRoom(String gameType) throws RescuableCli
     String gameFileLocation = Configuration.get(Configuration.GAMELOADFILE);
     if (gameFileLocation != null && !gameFileLocation.equals("")) {
       File gameFile = new File(gameFileLocation);
-      Integer turn = null;
+      int turn = 0;
       try {
         turn = Integer.parseInt(Configuration.get(Configuration.TURN_TO_LOAD));
       } catch(NumberFormatException ignored) {
       }
 
-      // TODO skip to turn
-      // TODO implement tests
+      // TODO test this
       logger.info("Loading game from file '{}' at turn {}", gameFile, turn);
       try {
-        game = plugin.createGameFromState(new GameLoader<IGameState>(IGameState.class).loadGame(gameFile));
+        game = plugin.createGameFromState(new GameLoader().loadGame(gameFile, turn));
       } catch(IOException e) {
         logger.error("Failed to load game from file", e);
         game = plugin.createGame();