migrate device configuration properties

Author: dernasherbrezon

src/main/java/ru/r2cloud/util/Configuration.java

@@ -587,14 +587,7 @@ private DeviceConfiguration getDeviceConfiguration(String id, DeviceType deviceT
 			config.setMaximumFrequency(maxFrequency);
 		}
 		config.setHost(getProperty(prefix + "host"));
-		String portStr = getProperty(prefix + "port");
-		if (portStr != null) {
-			try {
-				config.setPort(Integer.parseInt(portStr));
-			} catch (Exception e) {
-				// ignore. legacy serialDevice setting
-			}
-		}
+		config.setPort(getInteger(prefix + "port"));
 		config.setUsername(getProperty(prefix + "username"));
 		config.setPassword(getProperty(prefix + "password"));
 		config.setRtlDeviceId(getProperty(prefix + "index"));
@@ -603,11 +596,7 @@ private DeviceConfiguration getDeviceConfiguration(String id, DeviceType deviceT
 			gain = 0.0;
 		}
 		config.setGain(gain.floatValue());
-		String serialDevice = getProperty(prefix + "serialDevice");
-		if (serialDevice == null) {
-			serialDevice = getProperty(prefix + "port");
-		}
-		config.setSerialDevice(serialDevice);
+		config.setSerialDevice(getProperty(prefix + "serialDevice"));
 		String address = getProperty(prefix + "btaddress");
 		if (address != null) {
 			config.setBtAddress(address.toLowerCase(Locale.UK));

src/main/java/ru/r2cloud/util/MigrateConfiguration.java

@@ -40,6 +40,13 @@ public void migrate() {
 				}
 			}
 		}
+		List<String> loraAtDevices = config.getProperties("loraat.devices");
+		if (!loraAtDevices.isEmpty()) {
+			for (String cur : loraAtDevices) {
+				String prefix = "loraat.device." + cur + ".";
+				migrate(prefix + "serialDevice", prefix + "port");
+			}
+		}
 		config.update();
 	}
 

src/test/java/ru/r2cloud/util/MigrateConfigurationTest.java

@@ -25,8 +25,17 @@ public class MigrateConfigurationTest {
 
 	@Test
 	public void testRtlSdrConfigurationMigration() throws Exception {
+		assertMigration("expected.pre.r2cloud.properties", "pre.r2cloud.properties");
+	}
+
+	@Test
+	public void testLoraAtMigration() throws Exception {
+		assertMigration("expected.pre.loraat.properties", "pre.loraat.properties");
+	}
+
+	private void assertMigration(String expectedProperties, String preMigrationProperties) throws Exception {
 		File userSettingsLocation = new File(tempFolder.getRoot(), ".r2cloud-" + UUID.randomUUID().toString());
-		try (InputStream is = MigrateConfigurationTest.class.getClassLoader().getResourceAsStream("migration/pre.r2cloud.properties"); FileOutputStream fos = new FileOutputStream(userSettingsLocation)) {
+		try (InputStream is = MigrateConfigurationTest.class.getClassLoader().getResourceAsStream("migration/" + preMigrationProperties); FileOutputStream fos = new FileOutputStream(userSettingsLocation)) {
 			Properties props = new Properties();
 			props.load(is);
 			props.store(fos, "");
@@ -37,7 +46,7 @@ public void testRtlSdrConfigurationMigration() throws Exception {
 		}
 		MigrateConfiguration migrateConfiguration = new MigrateConfiguration(config);
 		migrateConfiguration.migrate();
-		assertPropertiesEquals("migration/expected.pre.r2cloud.properties", userSettingsLocation);
+		assertPropertiesEquals("migration/" + expectedProperties, userSettingsLocation);
 	}
 
 	private static void assertPropertiesEquals(String expected, File actual) throws Exception {

src/test/resources/migration/expected.pre.loraat.properties

@@ -0,0 +1,2 @@
+loraat.devices=0
+loraat.device.0.serialDevice=/dev/ttyUSB0

src/test/resources/migration/pre.loraat.properties

@@ -0,0 +1,2 @@
+loraat.devices=0
+loraat.device.0.port=/dev/ttyUSB0