From b9128edf9a737ec4d207552178239cbd4ac0e5b4 Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Sun, 5 Nov 2017 03:25:25 +0000 Subject: [PATCH 1/8] Change client id Changed client id to 2 since Disconnect Monitor has id 1 --- src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java index 3d140bc2..0b44ccee 100644 --- a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java +++ b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java @@ -60,7 +60,7 @@ public class BatteryLevelMonitor extends */ public BatteryLevelMonitor(RadarPropertyHandler radar, Collection topics, EmailSender sender, Status minLevel, long logInterval) { - super(radar, topics, "battery_monitors", "1", new BatteryLevelState()); + super(radar, topics, "battery_monitors", "2", new BatteryLevelState()); Properties props = new Properties(); props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest"); From 21d28e0b4ebefe069248fefbb2a5a80fd192445d Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Sun, 5 Nov 2017 03:26:32 +0000 Subject: [PATCH 2/8] Fix battery monitor test --- .../java/org/radarcns/monitor/KafkaMonitorFactoryTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java b/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java index cbfd41b5..e858c98c 100644 --- a/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java +++ b/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java @@ -55,7 +55,7 @@ public void createBatteryMonitor() throws Exception { assertEquals(BatteryLevelMonitor.class, monitor.getClass()); BatteryLevelMonitor batteryMonitor = (BatteryLevelMonitor) monitor; batteryMonitor.evaluateRecords(new ConsumerRecords<>(Collections.emptyMap())); - assertTrue(new File(config.getPersistencePath(), "battery_monitors_1.yml").isFile()); + assertTrue(new File(config.getPersistencePath(), "battery_monitors_2.yml").isFile()); } @Test(expected = IOException.class) @@ -148,4 +148,4 @@ public static ConfigRadar getBatteryMonitorConfig(int port, TemporaryFolder fold config.setBatteryMonitor(getBatteryMonitorConfig(port)); return config; } -} \ No newline at end of file +} From 8d455bb256598a411d1f19d0fa11ef3271cfad38 Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Mon, 6 Nov 2017 11:18:10 +0000 Subject: [PATCH 3/8] Update BatteryLevelMonitor.java Remove the email alert for battery monitor for normal level --- src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java index 3d140bc2..476a8592 100644 --- a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java +++ b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java @@ -97,7 +97,7 @@ protected void evaluateRecord(ConsumerRecord recor key.getSourceId(), key.getUserId(), record.value()); } } else if (previousLevel <= Status.LOW.getLevel()) { - updateStatus(key, Status.NORMAL); + // updateStatus(key, Status.NORMAL); logger.info("Battery of sensor {} of user {} is has returned to normal: {}", key.getSourceId(), key.getUserId(), record.value()); } From a01a973ca3d795a8ef05a85d4bb657806cac5843 Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Mon, 6 Nov 2017 11:41:46 +0000 Subject: [PATCH 4/8] Update BatteryLevelMonitor.java Added reason for removing normal battery alert --- src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java index 476a8592..0cda9153 100644 --- a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java +++ b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java @@ -97,6 +97,8 @@ protected void evaluateRecord(ConsumerRecord recor key.getSourceId(), key.getUserId(), record.value()); } } else if (previousLevel <= Status.LOW.getLevel()) { + // Remove the email alert for battery monitor for normal level because it is not crucial + // and to prevent spamming a user's email account. Uncomment the line below if needed. // updateStatus(key, Status.NORMAL); logger.info("Battery of sensor {} of user {} is has returned to normal: {}", key.getSourceId(), key.getUserId(), record.value()); From 9bdeb4c5e099231b89f9dbc07e0d5b58073781e1 Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Mon, 6 Nov 2017 11:57:40 +0000 Subject: [PATCH 5/8] Checkstyle fix --- src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java index 0cda9153..f8474dd4 100644 --- a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java +++ b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java @@ -97,8 +97,9 @@ protected void evaluateRecord(ConsumerRecord recor key.getSourceId(), key.getUserId(), record.value()); } } else if (previousLevel <= Status.LOW.getLevel()) { - // Remove the email alert for battery monitor for normal level because it is not crucial - // and to prevent spamming a user's email account. Uncomment the line below if needed. + // Remove the email alert for battery monitor for normal level because + // it is not crucial and to prevent spamming a user's email account. + // Uncomment the line below if needed. // updateStatus(key, Status.NORMAL); logger.info("Battery of sensor {} of user {} is has returned to normal: {}", key.getSourceId(), key.getUserId(), record.value()); From 0edc0c782008fcfacf7337f9d50358c32e5171dd Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Mon, 6 Nov 2017 13:20:59 +0000 Subject: [PATCH 6/8] Fix Battery monitor tests --- .../java/org/radarcns/monitor/BatteryLevelMonitorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/radarcns/monitor/BatteryLevelMonitorTest.java b/src/test/java/org/radarcns/monitor/BatteryLevelMonitorTest.java index 4bbc8854..6f2cc21c 100644 --- a/src/test/java/org/radarcns/monitor/BatteryLevelMonitorTest.java +++ b/src/test/java/org/radarcns/monitor/BatteryLevelMonitorTest.java @@ -89,14 +89,14 @@ public void evaluateRecord() throws Exception { sendMessage(monitor, 1.0f, false); sendMessage(monitor, 0.1f, true); sendMessage(monitor, 0.1f, false); - sendMessage(monitor, 0.3f, true); + sendMessage(monitor, 0.3f, false); sendMessage(monitor, 0.4f, false); sendMessage(monitor, 0.01f, true); sendMessage(monitor, 0.01f, false); sendMessage(monitor, 0.1f, false); sendMessage(monitor, 0.1f, false); sendMessage(monitor, 0.01f, true); - sendMessage(monitor, 1f, true); + sendMessage(monitor, 1f, false); } private void sendMessage(BatteryLevelMonitor monitor, float batteryLevel, boolean sentMessage) @@ -130,4 +130,4 @@ public void retrieveState() throws Exception { Map values = state2.getLevels(); assertThat(values, hasEntry(measurementKeyToString(key1), 0.1f)); } -} \ No newline at end of file +} From 69b652c71633d6f298b5adf3a0eb0ac7d4e3fe06 Mon Sep 17 00:00:00 2001 From: yatharthranjan Date: Tue, 7 Nov 2017 11:09:42 +0000 Subject: [PATCH 7/8] Tuning the Client Ids --- .idea/.name | 1 - .idea/compiler.xml | 23 +------------------ .../monitor/AbstractKafkaMonitor.java | 7 +++--- .../radarcns/monitor/BatteryLevelMonitor.java | 2 +- .../monitor/KafkaMonitorFactoryTest.java | 6 +++-- 5 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 1a452025..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -radar-backend \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 6e0a691c..69eaff7a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,31 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/main/java/org/radarcns/monitor/AbstractKafkaMonitor.java b/src/main/java/org/radarcns/monitor/AbstractKafkaMonitor.java index 46380bec..798263e6 100644 --- a/src/main/java/org/radarcns/monitor/AbstractKafkaMonitor.java +++ b/src/main/java/org/radarcns/monitor/AbstractKafkaMonitor.java @@ -88,10 +88,11 @@ public AbstractKafkaMonitor(RadarPropertyHandler radar, Collection topic properties = new Properties(); String deserializer = KafkaAvroDeserializer.class.getName(); + String monitorClientId = getClass().getName() + "-" + clientId; properties.setProperty(KEY_DESERIALIZER_CLASS_CONFIG, deserializer); properties.setProperty(VALUE_DESERIALIZER_CLASS_CONFIG, deserializer); properties.setProperty(GROUP_ID_CONFIG, groupId); - properties.setProperty(CLIENT_ID_CONFIG, clientId); + properties.setProperty(CLIENT_ID_CONFIG, monitorClientId); properties.setProperty(ENABLE_AUTO_COMMIT_CONFIG, "true"); properties.setProperty(AUTO_COMMIT_INTERVAL_MS_CONFIG, "1001"); properties.setProperty(SESSION_TIMEOUT_MS_CONFIG, "15101"); @@ -105,7 +106,7 @@ public AbstractKafkaMonitor(RadarPropertyHandler radar, Collection topic this.topics = topics; this.pollTimeout = new AtomicLong(Long.MAX_VALUE); this.done = false; - this.clientId = clientId; + this.clientId = monitorClientId; this.groupId = groupId; PersistentStateStore localStateStore; @@ -121,7 +122,7 @@ public AbstractKafkaMonitor(RadarPropertyHandler radar, Collection topic S localState = stateDefault; if (stateStore != null && stateDefault != null) { try { - localState = stateStore.retrieveState(groupId, clientId, stateDefault); + localState = stateStore.retrieveState(groupId, monitorClientId, stateDefault); logger.info("Using existing {} from persistence store.", stateDefault.getClass().getName()); } catch (IOException ex) { diff --git a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java index 4e1d8738..f8474dd4 100644 --- a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java +++ b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java @@ -60,7 +60,7 @@ public class BatteryLevelMonitor extends */ public BatteryLevelMonitor(RadarPropertyHandler radar, Collection topics, EmailSender sender, Status minLevel, long logInterval) { - super(radar, topics, "battery_monitors", "2", new BatteryLevelState()); + super(radar, topics, "battery_monitors", "1", new BatteryLevelState()); Properties props = new Properties(); props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest"); diff --git a/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java b/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java index e858c98c..67b7fe22 100644 --- a/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java +++ b/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java @@ -55,7 +55,8 @@ public void createBatteryMonitor() throws Exception { assertEquals(BatteryLevelMonitor.class, monitor.getClass()); BatteryLevelMonitor batteryMonitor = (BatteryLevelMonitor) monitor; batteryMonitor.evaluateRecords(new ConsumerRecords<>(Collections.emptyMap())); - assertTrue(new File(config.getPersistencePath(), "battery_monitors_2.yml").isFile()); + assertTrue(new File(config.getPersistencePath(), "battery_monitors_" + + BatteryLevelMonitor.class.getName() + "-1.yml").isFile()); } @Test(expected = IOException.class) @@ -79,7 +80,8 @@ public void createDisconnectMonitor() throws Exception { assertEquals(DisconnectMonitor.class, monitor.getClass()); DisconnectMonitor disconnectMonitor = (DisconnectMonitor) monitor; disconnectMonitor.evaluateRecords(new ConsumerRecords<>(Collections.emptyMap())); - assertTrue(new File(config.getPersistencePath(), "disconnect_monitor_1.yml").isFile()); + assertTrue(new File(config.getPersistencePath(), "disconnect_monitor_" + + DisconnectMonitor.class.getName() + "-1.yml").isFile()); } @Test From a83d4448df58ad798566dbe7ae6bebce08c4375d Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Tue, 28 Nov 2017 16:39:43 +0000 Subject: [PATCH 8/8] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6c289c14..211603d4 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ plugins { //---------------------------------------------------------------------------// group = 'org.radarcns' -version = '0.1-alpha.3-SNAPSHOT' +version = '0.1' ext.description = 'Kafka backend for processing device data.' mainClassName = 'org.radarcns.RadarBackend'