From 0bfa5d48e39bc87961fb20d65b05b86ee2f82afb Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 15 Oct 2017 12:02:25 +0300 Subject: [PATCH 1/3] Revert from murmur3_128 to sha1 in LibraryDownloader All the hashes are stored as sha1. This was broken by ca5b7a548c09093f210b70675091e7dd641d37b2. Change-Id: I6a86929509d7f2dc5b9bb0d1659293cf7770bb27 --- .../java/com/google/gerrit/pgm/init/LibraryDownloader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java index 80b2f25350..0b31ee22ab 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java @@ -275,13 +275,14 @@ class LibraryDownloader { } } + @SuppressWarnings("deprecation") // Use Hashing.sha1 for compatibility. private void verifyFileChecksum() { if (sha1 == null) { System.err.println(); System.err.flush(); return; } - Hasher h = Hashing.murmur3_128().newHasher(); + Hasher h = Hashing.sha1().newHasher(); try (InputStream in = Files.newInputStream(dst); OutputStream out = Funnels.asOutputStream(h)) { ByteStreams.copy(in, out); From 50c4013bda569ce9f8363d071f101aa851f32c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Mon, 16 Oct 2017 08:38:05 -0400 Subject: [PATCH 2/3] Order alphabetically the registered events Change-Id: I46dcf4cee3b2facf49dd0d499604d2ddc95bc9b0 --- .../java/com/google/gerrit/server/events/EventTypes.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java index 74453f3803..c4921fd42c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java @@ -30,13 +30,13 @@ public class EventTypes { register(CommitReceivedEvent.TYPE, CommitReceivedEvent.class); register(DraftPublishedEvent.TYPE, DraftPublishedEvent.class); register(HashtagsChangedEvent.TYPE, HashtagsChangedEvent.class); - register(RefUpdatedEvent.TYPE, RefUpdatedEvent.class); + register(PatchSetCreatedEvent.TYPE, PatchSetCreatedEvent.class); + register(ProjectCreatedEvent.TYPE, ProjectCreatedEvent.class); register(RefReceivedEvent.TYPE, RefReceivedEvent.class); + register(RefUpdatedEvent.TYPE, RefUpdatedEvent.class); register(ReviewerAddedEvent.TYPE, ReviewerAddedEvent.class); register(ReviewerDeletedEvent.TYPE, ReviewerDeletedEvent.class); - register(PatchSetCreatedEvent.TYPE, PatchSetCreatedEvent.class); register(TopicChangedEvent.TYPE, TopicChangedEvent.class); - register(ProjectCreatedEvent.TYPE, ProjectCreatedEvent.class); } /** From 9c72471ba33bdd9daf5be7fd69f094913ffa7f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Mon, 16 Oct 2017 08:41:04 -0400 Subject: [PATCH 3/3] Add missing registration for VoteDeletedEvent Without this, code trying to deserialize this event type will fail with: com.google.gson.JsonParseException: Unknown event type: vote-deleted Change-Id: I0a9db2e0ec117c4b47e689d0e7c596b38a4f1f4a --- .../main/java/com/google/gerrit/server/events/EventTypes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java index c4921fd42c..448e09f91a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java @@ -37,6 +37,7 @@ public class EventTypes { register(ReviewerAddedEvent.TYPE, ReviewerAddedEvent.class); register(ReviewerDeletedEvent.TYPE, ReviewerDeletedEvent.class); register(TopicChangedEvent.TYPE, TopicChangedEvent.class); + register(VoteDeletedEvent.TYPE, VoteDeletedEvent.class); } /**