Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Set version to 3.0.5-SNAPSHOT
  Set version to 3.0.4
  ReviewerAddedEvent: extend event with 'adder'
  Post/Delete GPG keys: Remove incorrect comments

Change-Id: I4c19ac3df0e113aac3fb98eb6edc1cac47910126

Documentation/cmd-stream-events.txt

@@ -234,6 +234,8 @@ patchSet:: link:json.html#patchSet[patchSet attribute]
 
 reviewer:: link:json.html#account[account attribute]
 
+adder:: user that added the reviewer as link:json.html#account[account attribute]
+
 eventCreatedOn:: Time in seconds since the UNIX epoch when this event was
 created.
 

java/com/google/gerrit/gpg/server/DeleteGpgKey.java

@@ -109,7 +109,6 @@ public class DeleteGpgKey implements RestModifyView<GpgKey, Input> {
           }
           break;
         case LOCK_FAILURE:
-          // should not happen since this case is already handled by PublicKeyStore#save
         case FORCED:
         case IO_FAILURE:
         case NEW:

java/com/google/gerrit/gpg/server/PostGpgKeys.java

@@ -275,7 +275,6 @@ public class PostGpgKeys implements RestModifyView<AccountResource, GpgKeysInput
         case NO_CHANGE:
           break;
         case LOCK_FAILURE:
-          // should not happen since this case is already handled by PublicKeyStore#save
         case IO_FAILURE:
         case NOT_ATTEMPTED:
         case REJECTED:

java/com/google/gerrit/server/events/ReviewerAddedEvent.java

@@ -21,6 +21,7 @@ import com.google.gerrit.server.data.AccountAttribute;
 public class ReviewerAddedEvent extends PatchSetEvent {
   static final String TYPE = "reviewer-added";
   public Supplier<AccountAttribute> reviewer;
+  public Supplier<AccountAttribute> adder;
 
   public ReviewerAddedEvent(Change change) {
     super(TYPE, change);

java/com/google/gerrit/server/events/StreamEventsApiListener.java

@@ -317,6 +317,7 @@ public class StreamEventsApiListener
 
       event.change = changeAttributeSupplier(change, notes);
       event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes));
+      event.adder = accountAttributeSupplier(ev.getWho());
       for (AccountInfo reviewer : ev.getReviewers()) {
         event.reviewer = accountAttributeSupplier(reviewer);
         dispatcher.run(d -> d.postEvent(event));