Add optional id for events

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/ActivityEvent.java

@@ -2,9 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
-public class ActivityEvent {
+@EqualsAndHashCode(callSuper = true)
+public class ActivityEvent extends InnerEvent {
   @JsonProperty
   private String activityId;
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/ConnectionAcceptedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class ConnectionAcceptedEvent {
+public class ConnectionAcceptedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/ConnectionRequestedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class ConnectionRequestedEvent {
+public class ConnectionRequestedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/FormRepliedEvent.java

@@ -4,7 +4,7 @@
 import lombok.Data;
 
 @Data
-public class FormRepliedEvent {
+public class FormRepliedEvent extends InnerEvent {
   @JsonProperty
   private String formId;
 

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/ImCreatedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class ImCreatedEvent {
+public class ImCreatedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/InnerEvent.java

@@ -0,0 +1,10 @@
+package com.symphony.bdk.workflow.swadl.v1.event;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class InnerEvent {
+  @JsonProperty
+  private String id;
+}

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/MessageReceivedEvent.java

@@ -4,7 +4,7 @@
 import lombok.Data;
 
 @Data
-public class MessageReceivedEvent {
+public class MessageReceivedEvent extends InnerEvent {
   @JsonProperty
   private String content = "";
   @JsonProperty

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/MessageSuppressedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class MessageSuppressedEvent {
+public class MessageSuppressedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/PostSharedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class PostSharedEvent {
+public class PostSharedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RequestReceivedEvent.java

@@ -9,7 +9,7 @@
  * Not a Datafeed event. Manually created when API calls are made to the bot directly.
  */
 @Data
-public class RequestReceivedEvent {
+public class RequestReceivedEvent extends InnerEvent {
   @JsonProperty
   private String token;
 

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RoomCreatedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class RoomCreatedEvent {
+public class RoomCreatedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RoomDeactivatedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class RoomDeactivatedEvent {
+public class RoomDeactivatedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RoomMemberDemotedFromOwnerEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class RoomMemberDemotedFromOwnerEvent {
+public class RoomMemberDemotedFromOwnerEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RoomMemberPromotedToOwnerEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class RoomMemberPromotedToOwnerEvent {
+public class RoomMemberPromotedToOwnerEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RoomReactivatedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class RoomReactivatedEvent {
+public class RoomReactivatedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/RoomUpdatedEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class RoomUpdatedEvent {
+public class RoomUpdatedEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/TimerFiredEvent.java

@@ -6,7 +6,7 @@
 import javax.annotation.Nullable;
 
 @Data
-public class TimerFiredEvent {
+public class TimerFiredEvent extends InnerEvent {
   @JsonProperty
   @Nullable
   private String at;

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/UserJoinedRoomEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class UserJoinedRoomEvent {
+public class UserJoinedRoomEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/UserLeftRoomEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class UserLeftRoomEvent {
+public class UserLeftRoomEvent extends InnerEvent {
 }

workflow-language/src/main/java/com/symphony/bdk/workflow/swadl/v1/event/UserRequestedToJoinRoomEvent.java

@@ -3,5 +3,5 @@
 import lombok.Data;
 
 @Data
-public class UserRequestedToJoinRoomEvent {
+public class UserRequestedToJoinRoomEvent extends InnerEvent {
 }

workflow-language/src/main/resources/swadl-schema-1.0.json

@@ -1217,6 +1217,11 @@
                     "description": "If true, the event is only triggered if the bot is mentioned.",
                     "type": "boolean",
                     "default": false
+                },
+                "id": {
+                    "description": "Event's identifier, should be unique across workflow. As it can be used as a variable identifier only alphanumerical characters are allowed.",
+                    "type": "string",
+                    "pattern": "^(?!variables$)([a-zA-Z][a-zA-Z0-9_]+)$"
                 }
             }
         },
@@ -1272,6 +1277,11 @@
         "room-member-promoted-to-owner-event-inner": {
             "type": "object",
             "properties": {
+                "id": {
+                    "description": "Event's identifier, should be unique across workflow. As it can be used as a variable identifier only alphanumerical characters are allowed.",
+                    "type": "string",
+                    "pattern": "^(?!variables$)([a-zA-Z][a-zA-Z0-9_]+)$"
+                }
             }
         },
         "room-member-demoted-from-owner-event-inner": {
@@ -1282,11 +1292,21 @@
         "user-joined-room-event-inner": {
             "type": "object",
             "properties": {
+                "id": {
+                    "description": "Event's identifier, should be unique across workflow. As it can be used as a variable identifier only alphanumerical characters are allowed.",
+                    "type": "string",
+                    "pattern": "^(?!variables$)([a-zA-Z][a-zA-Z0-9_]+)$"
+                }
             }
         },
         "user-left-room-event-inner": {
             "type": "object",
             "properties": {
+                "id": {
+                    "description": "Event's identifier, should be unique across workflow. As it can be used as a variable identifier only alphanumerical characters are allowed.",
+                    "type": "string",
+                    "pattern": "^(?!variables$)([a-zA-Z][a-zA-Z0-9_]+)$"
+                }
             }
         },
         "user-requested-join-room-event-inner": {
@@ -1334,6 +1354,11 @@
                 "activity-id": {
                     "description": "The completed (without errors) activity triggering this event.",
                     "$ref": "#/definitions/id"
+                },
+                "id": {
+                    "description": "Event's identifier, should be unique across workflow. As it can be used as a variable identifier only alphanumerical characters are allowed.",
+                    "type": "string",
+                    "pattern": "^(?!variables$)([a-zA-Z][a-zA-Z0-9_]+)$"
                 }
             },
             "required": [