From b73c698e4dda4ad9004b7f231c991dcfbb71e3ab Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 13 Sep 2020 12:58:07 -0700 Subject: [PATCH] Never overwrite hardware config file (#122) * Never overwrite hardware config file * Remove unneeded assert --- .../org/photonvision/common/configuration/ConfigManager.java | 5 ----- .../org/photonvision/common/configuration/ConfigTest.java | 3 --- 2 files changed, 8 deletions(-) diff --git a/photon-server/src/main/java/org/photonvision/common/configuration/ConfigManager.java b/photon-server/src/main/java/org/photonvision/common/configuration/ConfigManager.java index f2443d9eb..c63130079 100644 --- a/photon-server/src/main/java/org/photonvision/common/configuration/ConfigManager.java +++ b/photon-server/src/main/java/org/photonvision/common/configuration/ConfigManager.java @@ -162,11 +162,6 @@ public class ConfigManager { // Delete old configs FileUtils.deleteDirectory(camerasFolder.toPath()); - try { - JacksonUtils.serialize(hardwareConfigFile.toPath(), config.getHardwareConfig()); - } catch (IOException e) { - logger.error("Could not save hardware config!", e); - } try { JacksonUtils.serialize(networkConfigFile.toPath(), config.getNetworkConfig()); } catch (IOException e) { diff --git a/photon-server/src/test/java/org/photonvision/common/configuration/ConfigTest.java b/photon-server/src/test/java/org/photonvision/common/configuration/ConfigTest.java index 631e89a7b..646693f26 100644 --- a/photon-server/src/test/java/org/photonvision/common/configuration/ConfigTest.java +++ b/photon-server/src/test/java/org/photonvision/common/configuration/ConfigTest.java @@ -79,9 +79,6 @@ public class ConfigTest { .toString()); Assertions.assertTrue(camConfDir.exists(), "TestCamera config folder not found!"); - Assertions.assertTrue( - Files.exists(Path.of(configMgr.configDirectoryFile.toString(), "hardwareConfig.json")), - "hardwareConfig.json file not found!"); Assertions.assertTrue( Files.exists(Path.of(configMgr.configDirectoryFile.toString(), "networkSettings.json")), "networkSettings.json file not found!");