refactor(server): sort Configuration options a bit

Author: xeruf

helpers/test-client/src/sc/TestClient.java

@@ -64,20 +64,22 @@ public static void main(String[] args) {
 
     // define commandline options
     CmdLineParser parser = new CmdLineParser();
+    Option hostOption = parser.addStringOption('h', "host");
+    Option portOption = parser.addIntegerOption('p', "port");
     Option loglevelOption = parser.addStringOption("loglevel");
+
+    Option noTimeoutOption = parser.addBooleanOption("no-timeout");
+    Option[] noTimeoutOptions = {parser.addBooleanOption("no-timeout1"), parser.addBooleanOption("no-timeout2")};
+
     Option serverOption = parser.addBooleanOption("start-server");
     Option serverLocationOption = parser.addStringOption("server");
-    Option hostOption = parser.addStringOption('h', "host");
-    Option portOption = parser.addIntegerOption('p', "port");
 
     Option numberOfTestsOption = parser.addIntegerOption('t', "tests");
     Option minTestsOption = parser.addIntegerOption("min-tests");
     Option significanceOption = parser.addDoubleOption("significance");
 
-    Option noTimeoutOption = parser.addBooleanOption("no-timeout");
     Option[] execOptions = {parser.addStringOption("player1"), parser.addStringOption("player2")};
     Option[] nameOptions = {parser.addStringOption("name1"), parser.addStringOption("name2")};
-    Option[] noTimeoutOptions = {parser.addBooleanOption("no-timeout1"), parser.addBooleanOption("no-timeout2")};
 
     try {
       parser.parse(args);
@@ -99,7 +101,6 @@ public static void main(String[] args) {
         logger.setLevel(level);
     }
 
-    boolean startServer = (boolean) parser.getOptionValue(serverOption, false);
     String host = (String) parser.getOptionValue(hostOption, "localhost");
     int port = (int) parser.getOptionValue(portOption, SharedConfiguration.DEFAULT_TESTSERVER_PORT);
 
@@ -128,7 +129,7 @@ public static void main(String[] args) {
     logger.info("Players: " + Arrays.toString(players));
 
     try {
-      if (startServer) {
+      if ((boolean) parser.getOptionValue(serverOption, false)) {
         File serverLocation = findInClasspath((File) parser.getOptionValue(serverLocationOption, new File("server.jar")));
         logger.info("Starting server from {}", serverLocation);
         ProcessBuilder builder = new ProcessBuilder("java", "-classpath", classpath, "-Dfile.encoding=UTF-8", "-jar", serverLocation.getPath(), "--port", String.valueOf(port));

server/src/main/java/sc/server/Application.java

@@ -2,6 +2,7 @@
 
 import jargs.gnu.CmdLineParser;
 import jargs.gnu.CmdLineParser.IllegalOptionValueException;
+import jargs.gnu.CmdLineParser.Option;
 import jargs.gnu.CmdLineParser.UnknownOptionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,11 +74,11 @@ public static void main(String[] params) {
   public static void parseArguments(String[] params)
           throws IllegalOptionValueException, UnknownOptionException {
     CmdLineParser parser = new CmdLineParser();
-    CmdLineParser.Option pluginDirOption = parser.addStringOption(Configuration.PLUGINS_OPTION);
-    CmdLineParser.Option loadGameFileOption = parser.addStringOption(Configuration.GAMELOADFILE_OPTION);
-    CmdLineParser.Option turnToLoadOption = parser.addIntegerOption(Configuration.TURN_OPTION);
-    CmdLineParser.Option saveReplayOption = parser.addBooleanOption(Configuration.SAVE_REPLAY);
-    CmdLineParser.Option portOption = parser.addIntegerOption('p', Configuration.PORT_KEY);
+    Option pluginDirOption = parser.addStringOption(Configuration.PLUGINS_OPTION);
+    Option loadGameFileOption = parser.addStringOption(Configuration.GAMELOADFILE);
+    Option turnToLoadOption = parser.addIntegerOption(Configuration.TURN_TO_LOAD);
+    Option saveReplayOption = parser.addBooleanOption(Configuration.SAVE_REPLAY);
+    Option portOption = parser.addIntegerOption('p', Configuration.PORT_KEY);
     parser.parse(params);
 
     String path = (String) parser.getOptionValue(pluginDirOption, null);
@@ -99,7 +100,7 @@ public static void parseArguments(String[] params)
     if (path != null) {
       File pluginDir = new File(path).getAbsoluteFile();
       if (pluginDir.exists() && pluginDir.isDirectory()) {
-        Configuration.set(Configuration.PLUGIN_PATH_KEY, path);
+        Configuration.set(Configuration.PLUGINS_OPTION, path);
         logger.info("Loading plugins from {}", pluginDir);
       } else {
         logger.warn("Could not find {} to load plugins from", pluginDir);
@@ -116,7 +117,7 @@ public static void addShutdownHook() {
         // continues the main-method of this class
         synchronized(SYNCOBJ) {
           SYNCOBJ.notifyAll();
-          logger.info("Exiting application...");
+          logger.info("Exiting Application...");
         }
       });
       shutdown.setName("ShutdownHook");

server/src/main/java/sc/server/Configuration.java

@@ -20,20 +20,18 @@ public class Configuration {
 
   public static final char DEBUG_SHORT_OPTION = 'd';
   public static final String DEBUG_OPTION = "debug";
-  public static final String PLUGINS_OPTION = "plugins";
-  public static final String GAMELOADFILE_OPTION = "loadGameFile";
+
   public static final String GAMELOADFILE = "loadGameFile";
-  public static final String TURN_OPTION = "turn";
-  public static final String TURN_TO_LOAD = "turnToLoad";
-  public static final String PLUGIN_PATH_DEFAULT_KEY = "./plugins";
+  public static final String TURN_TO_LOAD = "turn";
   public static final String SAVE_REPLAY = "saveReplay";
   public static final String PAUSED = "paused";
   public static final String TIMEOUT = "timeout";
   public static final String LISTEN_LOCAL_KEY = "local";
 
   public static final String PASSWORD_KEY = "password";
   public static final String PORT_KEY = "port";
-  public static final String PLUGIN_PATH_KEY = "plugins";
+  public static final String PLUGINS_OPTION = "plugins";
+  public static final String PLUGINS_PATH_DEFAULT = "./plugins";
 
   private static final Properties properties = new Properties();
 
@@ -67,7 +65,7 @@ public static boolean getListenLocal() {
   }
 
   public static String getPluginPath() {
-    return get(PLUGIN_PATH_KEY, String.class, PLUGIN_PATH_DEFAULT_KEY);
+    return get(PLUGINS_OPTION, String.class, PLUGINS_PATH_DEFAULT);
   }
 
   public static String getAdministrativePassword() {