Merge pull request #56 from RADAR-base/release-0.2.1

yatharthranjan · web-flow · commit 78fdde513374 · 2018-02-22T11:40:23.000Z
Release 0.2.1
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ smtp.env
 
 /out/
 /libs/
+
+# Distribution
+/radar-backend-*
diff --git a/Dockerfile b/Dockerfile
@@ -47,4 +47,4 @@ COPY --from=builder /code/radar-backend-*/lib/* /usr/lib/
 # Load topics validator
 COPY ./src/main/docker/radar-backend-init /usr/bin
 
-CMD ["radar-backend-init"]
+ENTRYPOINT ["radar-backend-init"]
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ plugins {
 //---------------------------------------------------------------------------//
 
 group = 'org.radarcns'
-version = '0.2.0'
+version = '0.2.1'
 ext.description = 'Kafka backend for processing device data.'
 
 mainClassName = 'org.radarcns.RadarBackend'
diff --git a/radar.yml b/radar.yml
@@ -43,9 +43,14 @@ rest_proxy:
 
 #======================== Battery level monitor ========================#
 battery_monitor:
+  notify: # Each project can have a number of email addresses
+    - project_id: s1
+      email_address:
+        - test@thehyve.nl
+    - project_id: s2
+      email_address:
+        - radar@thehyve.nl
   level: LOW
-  email_address:
-    - radar@thehyve.nl
   email_host: localhost
   email_port: 25
   email_user: no-reply@radarcns.org
@@ -54,8 +59,13 @@ battery_monitor:
 
 #======================= Disconnection monitor==========================#
 disconnect_monitor:
-  email_address:
-    - test@thehyve.nl
+  notify:
+    - project_id: s1
+      email_address:
+        - test@thehyve.nl
+    - project_id: s2
+      email_address:
+        - radar@thehyve.nl
   email_host: localhost
   email_port: 25
   email_user: no-reply@radarcns.org
diff --git a/src/integrationTest/resources/org/radarcns/kafka/radar.yml b/src/integrationTest/resources/org/radarcns/kafka/radar.yml
@@ -41,15 +41,19 @@ schema_registry:
       protocol: http
 
 battery_monitor:
+  notify:
+    - project_id: test
+      email_address:
+        - notifier@email
   level: LOW
-  email_address:
-    - notifier@email
   topics:
     - android_empatica_e4_battery_level
 
 disconnect_monitor:
-  email_address:
-    - notifier2@email
+  notify:
+    - project_id: test
+      email_address:
+        - notifier@email
   email_host: localhost
   email_port: 25
   email_user: sender@email
diff --git a/src/main/java/org/radarcns/config/MonitorConfig.java b/src/main/java/org/radarcns/config/MonitorConfig.java
@@ -23,8 +23,8 @@
  * POJO representing a monitor configuration
  */
 public class MonitorConfig {
-    @JsonProperty("email_address")
-    private List<String> emailAddress;
+    @JsonProperty("notify")
+    private List<NotifyConfig> notifyConfig;
 
     @JsonProperty("email_host")
     private String emailHost;
@@ -43,12 +43,12 @@ public class MonitorConfig {
     @JsonProperty("message")
     private String message = null;
 
-    public List<String> getEmailAddress() {
-        return emailAddress;
+    public List<NotifyConfig> getNotifyConfig() {
+        return notifyConfig;
     }
 
-    public void setEmailAddress(List<String> emailAddress) {
-        this.emailAddress = emailAddress;
+    public void setNotifyConfig(List<NotifyConfig> notifyConfig) {
+        this.notifyConfig = notifyConfig;
     }
 
     public List<String> getTopics() {
diff --git a/src/main/java/org/radarcns/config/NotifyConfig.java b/src/main/java/org/radarcns/config/NotifyConfig.java
@@ -0,0 +1,41 @@
+package org.radarcns.config;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+
+/**
+ * POJO to store each email Notification configuration.
+ */
+public class NotifyConfig {
+    @JsonProperty("project_id")
+    private String projectId;
+
+    @JsonProperty("email_address")
+    private List<String> emailAddress;
+
+    @JsonCreator
+    public NotifyConfig(@JsonProperty("project_id") String projectId,
+                        @JsonProperty("email_address") List<String> emailAddress) {
+        this.projectId = projectId;
+        this.emailAddress = emailAddress;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public List<String> getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(List<String> emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+}
diff --git a/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java b/src/main/java/org/radarcns/monitor/BatteryLevelMonitor.java
@@ -31,6 +31,7 @@
 import org.radarcns.kafka.ObservationKey;
 import org.radarcns.monitor.BatteryLevelMonitor.BatteryLevelState;
 import org.radarcns.util.EmailSender;
+import org.radarcns.util.EmailSenders;
 import org.radarcns.util.RadarSingletonFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +44,7 @@ public class BatteryLevelMonitor extends
         AbstractKafkaMonitor<GenericRecord, GenericRecord, BatteryLevelState> {
     private static final Logger logger = LoggerFactory.getLogger(BatteryLevelMonitor.class);
 
-    private final EmailSender sender;
+    private final EmailSenders senders;
     private final Status minLevel;
     private final long logInterval;
     private long messageNumber;
@@ -52,19 +53,19 @@ public class BatteryLevelMonitor extends
      * BatteryLevelMonitor constructor.
      * @param radar RADAR properties
      * @param topics topics to monitor, each of which has a "batteryLevel" value field
-     * @param sender email sender for notifications, null if no notifications should be sent.
+     * @param senders email sender for notifications, null if no notifications should be sent.
      * @param minLevel minimum battery level, below which a notification should be sent
      * @param logInterval every how many messages to log, 0 for no log messages
      */
     public BatteryLevelMonitor(RadarPropertyHandler radar, Collection<String> topics,
-            EmailSender sender, Status minLevel, long logInterval) {
+                               EmailSenders senders, Status minLevel, long logInterval) {
         super(radar, topics, "battery_monitors", "1", new BatteryLevelState());
 
         Properties props = new Properties();
         props.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest");
         configure(props);
 
-        this.sender = sender;
+        this.senders = senders;
         this.minLevel = minLevel == null ? Status.CRITICAL : minLevel;
         this.logInterval = logInterval;
     }
@@ -108,6 +109,9 @@ protected void evaluateRecord(ConsumerRecord<GenericRecord, GenericRecord> recor
     }
 
     private void updateStatus(ObservationKey key, Status status) {
+
+        // Don't report if no email address for this projectId
+        EmailSender sender = senders.getEmailSenderForProject(key.getProjectId());
         if (sender == null) {
             return;
         }
diff --git a/src/main/java/org/radarcns/monitor/DisconnectMonitor.java b/src/main/java/org/radarcns/monitor/DisconnectMonitor.java
@@ -42,6 +42,7 @@
 import org.radarcns.kafka.ObservationKey;
 import org.radarcns.monitor.DisconnectMonitor.DisconnectMonitorState;
 import org.radarcns.util.EmailSender;
+import org.radarcns.util.EmailSenders;
 import org.radarcns.util.Monitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +57,7 @@ public class DisconnectMonitor extends AbstractKafkaMonitor<
 
     private final ScheduledExecutorService scheduler;
     private final long timeUntilReportedMissing;
-    private final EmailSender sender;
+    private final EmailSenders senders;
     private final Format dayFormat;
     private final int numRepetitions;
     private final long repeatInterval;
@@ -65,9 +66,9 @@ public class DisconnectMonitor extends AbstractKafkaMonitor<
     private final String message;
 
     public DisconnectMonitor(RadarPropertyHandler radar, Collection<String> topics, String groupId,
-                             EmailSender sender) {
+                             EmailSenders senders) {
         super(radar, topics, groupId, "1", new DisconnectMonitorState());
-        this.sender = sender;
+        this.senders = senders;
         this.dayFormat = DateFormat.getDateTimeInstance(
                 DateFormat.MEDIUM, DateFormat.SHORT, Locale.US);
         this.scheduler = Executors.newSingleThreadScheduledExecutor();
@@ -169,6 +170,13 @@ private void scheduleRepetition(final String key, final MissingRecordsReport rep
 
     private void reportMissing(String keyString, MissingRecordsReport report) {
         ObservationKey key = getStateStore().stringToKey(keyString);
+
+        // Don't report if no email address for this projectId
+        EmailSender sender = senders.getEmailSenderForProject(key.getProjectId());
+        if(sender == null) {
+            return;
+        }
+
         long timeout = report.getTimeout();
         logger.info("Device {} timeout {} (message {} of {}). Reporting it missing.", key,
                 timeout, report.getMessageNumber(), numRepetitions);
@@ -202,6 +210,14 @@ private void reportMissing(String keyString, MissingRecordsReport report) {
     }
 
     private void reportRecovered(ObservationKey key, long reportedMissingTime) {
+
+        // Don't report if no email address for this projectId
+        EmailSender sender = senders.getEmailSenderForProject(key.getProjectId());
+        if(sender == null) {
+            return;
+        }
+
+
         logger.info("Device {} seen again. Reporting it recovered.", key);
         try {
             Date reportedMissingDate = new Date(reportedMissingTime);
diff --git a/src/main/java/org/radarcns/monitor/KafkaMonitorFactory.java b/src/main/java/org/radarcns/monitor/KafkaMonitorFactory.java
@@ -24,13 +24,9 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
-import org.radarcns.config.BatteryMonitorConfig;
-import org.radarcns.config.DisconnectMonitorConfig;
-import org.radarcns.config.MonitorConfig;
-import org.radarcns.config.RadarBackendOptions;
-import org.radarcns.config.RadarPropertyHandler;
-import org.radarcns.config.SourceStatisticsMonitorConfig;
-import org.radarcns.util.EmailSender;
+
+import org.radarcns.config.*;
+import org.radarcns.util.EmailSenders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -106,7 +102,7 @@ private KafkaMonitor createBatteryLevelMonitor() throws IOException {
         }
 
         BatteryLevelMonitor.Status minLevel = BatteryLevelMonitor.Status.CRITICAL;
-        EmailSender sender = getSender(config);
+        EmailSenders senders = getSenders(config);
         Collection<String> topics = getTopics(config, "android_empatica_e4_battery_level");
 
         if (config.getLevel() != null) {
@@ -121,7 +117,7 @@ private KafkaMonitor createBatteryLevelMonitor() throws IOException {
         }
         long logInterval = config.getLogInterval();
 
-        return new BatteryLevelMonitor(properties, topics, sender, minLevel, logInterval);
+        return new BatteryLevelMonitor(properties, topics, senders, minLevel, logInterval);
     }
 
     private KafkaMonitor createDisconnectMonitor()
@@ -131,16 +127,15 @@ private KafkaMonitor createDisconnectMonitor()
             logger.warn("Disconnect monitor is not configured. Cannot start it.");
             return null;
         }
-        EmailSender sender = getSender(config);
+        EmailSenders senders = getSenders(config);
         Collection<String> topics = getTopics(config, "android_empatica_e4_temperature");
-        return new DisconnectMonitor(properties, topics, "disconnect_monitor", sender);
+        return new DisconnectMonitor(properties, topics, "disconnect_monitor", senders);
     }
 
-    private EmailSender getSender(MonitorConfig config) throws IOException {
-        if (config != null && config.getEmailAddress() != null) {
-            return new EmailSender(config.getEmailHost(), config.getEmailPort(),
-                    config.getEmailUser(),
-                    config.getEmailAddress());
+
+    private EmailSenders getSenders(MonitorConfig config) throws IOException {
+        if (config != null && config.getNotifyConfig() != null) {
+            return EmailSenders.parseConfig(config);
         }
         return null;
     }
diff --git a/src/main/java/org/radarcns/util/EmailSenders.java b/src/main/java/org/radarcns/util/EmailSenders.java
@@ -0,0 +1,48 @@
+package org.radarcns.util;
+
+import org.radarcns.config.MonitorConfig;
+import org.radarcns.config.NotifyConfig;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Class to store {@link EmailSender} associated with each project.
+ */
+public class EmailSenders {
+
+    private final Map<String,EmailSender> emailSenderMap;
+
+    public EmailSenders(Map<String, EmailSender> map) {
+        this.emailSenderMap = map;
+    }
+
+    /**
+     *
+     * Parses the {@link MonitorConfig} to map the corresponding
+     * {@link EmailSender} to each project. A project can have a list of
+     * associated email addresses.
+     *
+     * @param  config  Configuration of the Monitor containing project
+     *                 and email address mapping
+     * @throws IOException
+     */
+
+    public static EmailSenders parseConfig(MonitorConfig config) throws IOException{
+        Map<String, EmailSender> map = new HashMap<>();
+        for(NotifyConfig notifyConfig : config.getNotifyConfig()) {
+            map.put(notifyConfig.getProjectId(),
+                    new EmailSender(config.getEmailHost(), config.getEmailPort(),
+                            config.getEmailUser(), notifyConfig.getEmailAddress()));
+        }
+
+        return new EmailSenders(map);
+    }
+
+    public EmailSender getEmailSenderForProject(String projectId) {
+        return emailSenderMap.get(projectId);
+    }
+
+}
diff --git a/src/test/java/org/radarcns/monitor/BatteryLevelMonitorTest.java b/src/test/java/org/radarcns/monitor/BatteryLevelMonitorTest.java
diff --git a/src/test/java/org/radarcns/monitor/DisconnectMonitorTest.java b/src/test/java/org/radarcns/monitor/DisconnectMonitorTest.java
diff --git a/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java b/src/test/java/org/radarcns/monitor/KafkaMonitorFactoryTest.java
