Handle model updates for new devices in Validator

Author: khyatimahendru

validator/src/main/java/com/google/daq/mqtt/validator/Validator.java

@@ -187,7 +187,7 @@ public class Validator {
       "Message validate");
   private Set<String> targetDevices;
   private final LoggingHandler outputLogger;
-  private ImmutableSet<String> expectedDevices;
+  private Set<String> expectedDevices;
   private File outBaseDir;
   private File schemaRoot;
   private String schemaSpec;
@@ -244,6 +244,11 @@ public Map<String, ReportingDevice> getReportingDevices() {
     return reportingDevices;
   }
 
+  @VisibleForTesting
+  public Set<String> getExpectedDevices() {
+    return expectedDevices;
+  }
+
   Validator processArgs(List<String> argListRaw) {
     List<String> argList = new ArrayList<>(argListRaw);
     try {
@@ -453,7 +458,7 @@ private void setMessageTraceDir(String writeDirArg) {
   private void initializeExpectedDevices() {
     Set<String> siteDevices = siteModel.getDeviceIds();
     try {
-      expectedDevices = ImmutableSet.copyOf(siteDevices);
+      expectedDevices = new HashSet<>(siteDevices);
       for (String device : siteDevices) {
         ReportingDevice reportingDevice = newReportingDevice(device);
         try {
@@ -612,25 +617,28 @@ private void handleUdmiConfig(UdmiConfig udmiConfig) {
   }
 
   private boolean handleMetadataUpdate(Map<String, String> attributes, Object messageObject) {
-    String deviceId = attributes.get("deviceId");
     String subFolderRaw = attributes.get(SUBFOLDER_PROPERTY_KEY);
     String subTypeRaw = attributes.get(SUBTYPE_PROPERTY_KEY);
 
-    if (SubType.MODEL.value().equals(subTypeRaw) && SubFolder.UPDATE.value().equals(subFolderRaw)) {
-      if (reportingDevices.containsKey(deviceId)) {
-        ReportingDevice device = reportingDevices.get(deviceId);
-        Metadata metadata = convertTo(Metadata.class,
-            requireNonNull(messageObject, "messageObject is null"));
+    if (!SubType.MODEL.value().equals(subTypeRaw)
+        || !SubFolder.UPDATE.value().equals(subFolderRaw)) {
+      return false;
+    }
 
-        if (catchToNull(() -> metadata.cloud.operation) == Operation.DELETE) {
-          reportingDevices.remove(deviceId);
-        } else if (metadata.system != null) {
-          device.setMetadata(metadata);
-        }
-      }
-      return true;
+    String deviceId = attributes.get("deviceId");
+    Metadata metadata = convertTo(Metadata.class,
+        requireNonNull(messageObject, "messageObject is null"));
+    ReportingDevice device = reportingDevices.computeIfAbsent(deviceId, this::newReportingDevice);
+
+    if (catchToNull(() -> metadata.cloud.operation) == Operation.DELETE) {
+      reportingDevices.remove(deviceId);
+    } else {
+      ifNotNullThen(metadata.system, () -> {
+        device.setMetadata(metadata);
+        expectedDevices.add(deviceId);
+      });
     }
-    return false;
+    return true;
   }
 
   protected synchronized void validateMessage(MessageBundle message) {

validator/src/test/java/com/google/daq/mqtt/validator/BasicTest.java

@@ -1,5 +1,6 @@
 package com.google.daq.mqtt.validator;
 
+import static com.google.udmi.util.Common.DEVICE_ID_KEY;
 import static com.google.udmi.util.Common.TIMESTAMP_KEY;
 import static com.google.udmi.util.JsonUtil.getInstant;
 import static com.google.udmi.util.JsonUtil.isoConvert;
@@ -16,6 +17,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.junit.Test;
 import udmi.schema.CloudModel;
 import udmi.schema.CloudModel.Operation;
@@ -183,4 +185,26 @@ public void deviceDeleteMetadataUpdate() {
     assertNull(reportingDevices.get(TestCommon.DEVICE_ID));
   }
 
+  @Test
+  public void addNewDeviceWithModelUpdate() {
+    Metadata messageObject = new Metadata();
+    messageObject.version = TestCommon.UDMI_VERSION;
+    messageObject.system = new SystemModel();
+    messageObject.system.description = "New description";
+    MessageBundle messageBundle = getMessageBundle(MODEL_SUBTYPE, UPDATE_SUBFOLDER, messageObject);
+
+    String newDeviceId = TestCommon.DEVICE_ID + "_1";
+    messageBundle.attributes.put(DEVICE_ID_KEY, newDeviceId);
+
+    validator.validateMessage(messageBundle);
+
+    Map<String, ReportingDevice> reportingDevices = validator.getReportingDevices();
+    Set<String> expectedDevices = validator.getExpectedDevices();
+
+    assertTrue(expectedDevices.contains(newDeviceId));
+    assertTrue(reportingDevices.containsKey(newDeviceId));
+    assertEquals(messageObject.system.description,
+        reportingDevices.get(newDeviceId).getMetadata().system.description);
+  }
+
 }