commit a8a81e461e966d22e8eda235ad11c004cd1a9344
author Luca Milanesio <luca.milanesio@gmail.com> Wed Apr 21 14:36:00 2021 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Wed Apr 21 14:36:00 2021 +0100
tree ac96015e757d88e3355b8653756c232cbf59ee88
parent 677f1e363b03d128db9cde87801b40f14c90f9a0
parent 0de09e4d16cf1a577af4d9bebddb25f2298d982e

Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Change source instance id type from UUID to String

Change-Id: If4cafd7e041ed9ed2c635871ae8ca6389578bbc7

src/main/java/com/gerritforge/gerrit/eventbroker/EventMessage.java

diff --git a/src/main/java/com/gerritforge/gerrit/eventbroker/EventMessage.java b/src/main/java/com/gerritforge/gerrit/eventbroker/EventMessage.java
index 204173e..0684ae4 100644
--- a/src/main/java/com/gerritforge/gerrit/eventbroker/EventMessage.java
+++ b/src/main/java/com/gerritforge/gerrit/eventbroker/EventMessage.java
@@ -48,12 +48,16 @@
     public final UUID eventId;
 
     /** Gerrit server instance id from which event was sent. */
-    public final UUID sourceInstanceId;
+    public final String sourceInstanceId;
 
     /** @deprecated required for interoperability with older JSON wire protocols */
     public final String eventType;
 
     public Header(UUID eventId, UUID sourceInstanceId) {
+      this(eventId, sourceInstanceId.toString());
+    }
+
+    public Header(UUID eventId, String sourceInstanceId) {
       this.eventId = eventId;
       this.sourceInstanceId = sourceInstanceId;
       this.eventType = "";