Move the CommandFactory initialization to reload method.

Author: Aleksi Salmela

src/main/java/fi/helsinki/cs/tmc/cli/core/CommandAnnotationProcessor.java

@@ -73,7 +73,7 @@ private void generateSourceFile(Map<String, String> map) throws IOException {
             }
 
             bwriter.append("\npublic class " + CLASS_NAME + " {\n");
-            bwriter.append(TAB + "static {\n");
+            bwriter.append(TAB + "public " + CLASS_NAME + "() {\n");
             for (Entry<String, String> entry : map.entrySet()) {
                 String classPath = entry.getValue();
                 String[] parts = classPath.split("\\.");

src/main/java/fi/helsinki/cs/tmc/cli/core/CommandFactory.java

@@ -5,7 +5,6 @@
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -16,19 +15,11 @@
 public class CommandFactory {
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CommandFactory.class);
-    private static final Map<String, Class<Command>> commands = new HashMap<>();
-    private static final Map<String, List<Class<Command>>> packages = new HashMap<>();
+    private static Map<String, Class<Command>> commands;
+    private static Map<String, List<Class<Command>>> packages;
 
     static {
-        /* Force load the CommandList so that it's static initialization block is executed.
-         * This hack is used instead of import so that the IDEs won't cry about the nonexistent
-         * class.
-         */
-        try {
-            Class.forName("fi.helsinki.cs.tmc.cli.core.CommandList");
-        } catch (ClassNotFoundException ex) {
-            System.out.println("Fail " + ex);
-        }
+        CommandFactory.reload();
     }
 
     /**
@@ -121,4 +112,19 @@ public static List<Class<Command>> getCategoryCommands(String category) {
     public static Class<Command> castToCommandClass(Class command) {
         return command;
     }
+
+    protected static void reload() {
+        CommandFactory.commands = new HashMap<>();
+        CommandFactory.packages = new HashMap<>();
+
+        /* Run constructor of the CommandList.
+         * This hack is used instead of import so that the IDEs won't cry about the nonexistent
+         * class.
+         */
+        try {
+            Class.forName("fi.helsinki.cs.tmc.cli.core.CommandList").newInstance();
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) {
+            logger.warn("CommandList initialization failed", ex);
+        }
+    }
 }