restart after changing lat/lon

+ config listeners are no longer userd. remove them.

src/main/java/ru/r2cloud/device/DeviceManager.java

@@ -20,14 +20,13 @@
 import ru.r2cloud.satellite.ObservationRequestComparator;
 import ru.r2cloud.satellite.SatelliteDao;
 import ru.r2cloud.util.Clock;
-import ru.r2cloud.util.ConfigListener;
 import ru.r2cloud.util.Configuration;
 import ru.r2cloud.util.NamingThreadFactory;
 import ru.r2cloud.util.SafeRunnable;
 import ru.r2cloud.util.ThreadPoolFactory;
 import ru.r2cloud.util.Util;
 
-public class DeviceManager implements Lifecycle, ConfigListener {
+public class DeviceManager implements Lifecycle {
 
 	private static final Logger LOG = LoggerFactory.getLogger(DeviceManager.class);
 
@@ -45,8 +44,6 @@ public DeviceManager(Configuration config, SatelliteDao dao, ThreadPoolFactory t
 		this.config = config;
 		this.threadpoolFactory = threadpoolFactory;
 		this.clock = clock;
-		this.config.subscribe(this, "locaiton.lat");
-		this.config.subscribe(this, "locaiton.lon");
 	}
 
 	public void addDevice(Device device) {
@@ -177,18 +174,6 @@ public void stop() {
 		}
 	}
 
-	@Override
-	public void onConfigUpdated() {
-		if (config.getProperty("locaiton.lat") != null && config.getProperty("locaiton.lon") != null) {
-			LOG.info("base station location changed. reschedule");
-			stop();
-			start();
-		} else {
-			LOG.info("missing location. cancelling all observations");
-			stop();
-		}
-	}
-
 	public List<DeviceStatus> getStatus() {
 		List<DeviceStatus> result = new ArrayList<>(devices.size());
 		for (Device cur : devices) {

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

@@ -20,7 +20,6 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -45,7 +44,6 @@ public class Configuration {
 	private static final Set<PosixFilePermission> MODE600 = new HashSet<>();
 
 	private final Properties systemSettings = new Properties();
-	private final Map<String, List<ConfigListener>> listeners = new ConcurrentHashMap<>();
 	private final Set<String> changedProperties = new HashSet<>();
 
 	static {
@@ -160,25 +158,6 @@ public void update() {
 		} catch (IOException e) {
 			throw new IllegalArgumentException(e);
 		}
-		Set<ConfigListener> toNotify = new HashSet<>();
-		synchronized (changedProperties) {
-			for (String cur : changedProperties) {
-				List<ConfigListener> curListener = listeners.get(cur);
-				if (curListener == null) {
-					continue;
-				}
-				toNotify.addAll(curListener);
-			}
-			changedProperties.clear();
-		}
-
-		for (ConfigListener cur : toNotify) {
-			try {
-				cur.onConfigUpdated();
-			} catch (Exception e) {
-				LOG.error("unable to notify listener: {}", cur, e);
-			}
-		}
 	}
 
 	public long getThreadPoolShutdownMillis() {
@@ -846,17 +825,6 @@ public void remove(String name) {
 		userSettings.remove(name);
 	}
 
-	public void subscribe(ConfigListener listener, String... names) {
-		for (String cur : names) {
-			List<ConfigListener> previous = this.listeners.get(cur);
-			if (previous == null) {
-				previous = new ArrayList<>();
-				this.listeners.put(cur, previous);
-			}
-			previous.add(listener);
-		}
-	}
-
 	public File getTempDirectory() {
 		String tmpDirectory = getProperty("server.tmp.directory");
 		if (tmpDirectory != null) {

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

@@ -3,10 +3,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -39,49 +35,6 @@ public class ConfigurationTest {
 	private TestConfiguration config;
 	private MockFileSystem fs;
 
-	@Test
-	public void notCalled() {
-		ConfigListener listener = mock(ConfigListener.class);
-		Integer value = new Random().nextInt();
-		config.subscribe(listener, UUID.randomUUID().toString());
-		config.setProperty(UUID.randomUUID().toString(), value);
-		config.setProperty(UUID.randomUUID().toString(), value);
-		config.update();
-
-		verify(listener, never()).onConfigUpdated();
-	}
-
-	@Test
-	public void listenToUpdate() {
-		ConfigListener listener = mock(ConfigListener.class);
-		String propName = UUID.randomUUID().toString();
-		Integer value = new Random().nextInt();
-
-		config.subscribe(listener, propName);
-		config.setProperty(propName, value);
-		config.setProperty(UUID.randomUUID().toString(), value);
-		config.update();
-
-		verify(listener, atLeast(1)).onConfigUpdated();
-	}
-
-	@Test
-	public void twoListenersUpdated() {
-		ConfigListener listener1 = mock(ConfigListener.class);
-		ConfigListener listener2 = mock(ConfigListener.class);
-		String propName = UUID.randomUUID().toString();
-		Integer value = new Random().nextInt();
-
-		config.subscribe(listener1, propName);
-		config.subscribe(listener2, propName);
-		config.setProperty(propName, value);
-		config.setProperty(UUID.randomUUID().toString(), value);
-		config.update();
-
-		verify(listener1, atLeast(1)).onConfigUpdated();
-		verify(listener2, atLeast(1)).onConfigUpdated();
-	}
-
 	@Test
 	public void update() {
 		String propName = UUID.randomUUID().toString();