commit 2cb6112e081e97d4dfd8e677b6f02c779db95e85
author Martin Fick <mfick@codeaurora.org> Wed Oct 16 12:24:13 2019 -0600
committer Nasser Grainawi <nasser@codeaurora.org> Wed May 20 12:20:36 2020 -0600
tree a589ecb7c5f808cdc4c49700b5d15b68d3320a37
parent 8738fded0d6e0240e748b950a4a9b84ac8595896

Make persistent task keys stable

GSON was used to create json as the input for sha1 task keys, however
gson can order the json keys differently anytime. Use the values in a
specific order to create stable keys.

Bug: Issue 11760
Change-Id: I6900b5ddb3ba8ab7b5cf7803ae9dd551b5980a59

src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
index 19becdf..b1fbb10 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
@@ -69,7 +69,8 @@
 
   public String persist(ReplicateRefUpdate r) {
     String json = GSON.toJson(r) + "\n";
-    String eventKey = sha1(json).name();
+    String key = r.project + "\n" + r.ref + "\n" + r.uri + "\n" + r.remote;
+    String eventKey = sha1(key).name();
     Path file = refUpdates().resolve(eventKey);
 
     if (Files.exists(file)) {
@@ -91,8 +92,8 @@
   }
 
   public void delete(ReplicateRefUpdate r) {
-    String taskJson = GSON.toJson(r) + "\n";
-    String taskKey = sha1(taskJson).name();
+    String key = r.project + "\n" + r.ref + "\n" + r.uri + "\n" + r.remote;
+    String taskKey = sha1(key).name();
     Path file = refUpdates().resolve(taskKey);
 
     if (disableDeleteForTesting) {