WIP integrating Avro-style policy messages

[aquarium] / src / main / avro / aquarium-events.avdl

diff --git a/src/main/avro/aquarium-events.avdl b/src/main/avro/aquarium-events.avdl
index a42a5e3..e911c7f 100644 (file)
--- a/src/main/avro/aquarium-events.avdl
+++ b/src/main/avro/aquarium-events.avdl
@@ -38,8 +38,8 @@ protocol AquariumEvents {
   import idl "aquarium-anyvalue.avdl";
 
   record ResourceEventMsg {
-    string @aliases(["originalID", "ID"]) id;
-    string @aliases(["_id", "inStoreID"]) idInStore;
+    string @aliases(["id"]) originalID; // From message creator
+    union {string, null} @aliases(["_id", "idInStore"]) inStoreID; // From Aquarium (message recipient)
     long occurredMillis;
     long receivedMillis = 0;
     string userID;
@@ -52,8 +52,8 @@ protocol AquariumEvents {
   }
 
   record IMEventMsg {
-    string @aliases(["originalID", "ID"]) id;
-    string @aliases(["_id", "inStoreID"]) idInStore;
+    string @aliases(["id"]) originalID; // From message creator
+    union {string, null} @aliases(["_id", "idInStore"]) inStoreID; // From Aquarium (message recipient)
     long occurredMillis;
     long receivedMillis = 0;
     string userID;