Improve loading config from profiles

Author: Tony Brar

core/src/main/java/org/teamtators/rotator/config/ConfigLoader.java

@@ -26,16 +26,6 @@ public ConfigLoader(@Named("configDir") String configDir) {
         this.configDir = configDir;
     }
 
-    public JsonNode load(String fileName) {
-        String filePath = configDir + File.separator + fileName;
-        try (InputStream fileStream = new FileInputStream(filePath)) {
-            logger.debug("Loading config from path {}", filePath);
-            return objectMapper.reader().readTree(fileStream);
-        } catch (IOException e) {
-            throw new ConfigException(String.format("Error loading config %s", fileName), e);
-        }
-    }
-
     /**
      * Get a config, modified for the specified profile
      *
@@ -44,26 +34,43 @@ public JsonNode load(String fileName) {
      * @return Combined config for profile
      */
     public JsonNode getProfileConfig(String configName, String profileName) {
-        // TODO: check if that profile even exists
         JsonNode mainConfig = load(configName);
-        File f = new File(configDir + File.separator + profileName + File.separator + configName);
+        if (profileName.equals("empty")) {
+            return mainConfig;
+        }
+        File file = new File(configDir + File.separator + profileName + File.separator + configName);
+        File folder = new File(configDir + File.separator + profileName);
         // check if we should just use default config
-        if (profileName.equals("empty") || !f.exists()) {
+        if (!file.exists()) {
+            logger.info("No profile config file exists for {}, using base config", configName);
+            return mainConfig;
+        } else if (!folder.exists()) {
+            logger.warn("No such profile as {} found, base config will be used.", profileName);
             return mainConfig;
         } else {
             JsonNode profileConfig = load(profileName + File.separator + configName);
             return mergeNodes(mainConfig, profileConfig);
         }
     }
 
+    private JsonNode load(String fileName) {
+        String filePath = configDir + File.separator + fileName;
+        try (InputStream fileStream = new FileInputStream(filePath)) {
+            logger.debug("Loading config from path {}", filePath);
+            return objectMapper.reader().readTree(fileStream);
+        } catch (IOException e) {
+            throw new ConfigException(String.format("Error loading config %s", fileName), e);
+        }
+    }
+
     /**
      * Combine two JsonNodes
      *
      * @param mainNode   Node to merge into
      * @param updateNode Node to merge with
      * @return Combined node
      */
-    public static JsonNode mergeNodes(JsonNode mainNode, JsonNode updateNode) {
+    private JsonNode mergeNodes(JsonNode mainNode, JsonNode updateNode) {
         Iterator<String> fieldNames = updateNode.fieldNames();
         while (fieldNames.hasNext()) {
             String fieldName = fieldNames.next();

desktop/src/main/java/org/teamtators/rotator/Main.java

@@ -45,7 +45,7 @@ public void start() {
 
         commandStore.setRobot(robot);
 
-        String profileName = configLoader.load("profile.yml").textValue();
+        String profileName = configLoader.getProfileConfig("profile.yml", "empty").textValue();
         logger.debug("Loading configs with profile {}");
         ObjectNode commandsConfig = (ObjectNode) configLoader.getProfileConfig("commands.yml", profileName);
         ObjectNode simulationConfig = (ObjectNode) configLoader.getProfileConfig("subsystems.yml", profileName);

rio/src/main/java/org/teamtators/rotator/Robot.java

@@ -65,7 +65,7 @@ private void initialize() {
         commandStore.setRobot(robot);
 
         logger.debug("Created injector. Loading configs");
-        String profileName = configLoader.load("profile.yml").textValue();
+        String profileName = configLoader.getProfileConfig("profile.yml", "empty").textValue();
         logger.debug("Currently active config profile: {}", profileName);
         ObjectNode commandsConfig = (ObjectNode) configLoader.getProfileConfig("commands.yml", profileName);
         ObjectNode subsystemsConfig = (ObjectNode) configLoader.getProfileConfig("subsystems.yml", profileName);