commit 2edfacff528ee5594df0f5582ae5a1cd89873954
author Jorge Ruesga <j.ruesga.criado@gmail.com> Mon Apr 23 01:12:10 2018 +0200
committer Jorge Ruesga <j.ruesga.criado@gmail.com> Mon Apr 23 01:12:10 2018 +0200
tree 1b39b78652dd5aa8375c19103ed2f983f146746f
parent 05b34a04cf2dd4f1c64dd72110a79ab9653947df

cloud-notifications: fix stable-2.14

Change-Id: Ic02d913b309da8020b6f0d0aeb60e4a41aece8e3
Signed-off-by: Jorge Ruesga <j.ruesga.criado@gmail.com>

src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/VoteDeletedEventHandler.java

diff --git a/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/VoteDeletedEventHandler.java b/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/VoteDeletedEventHandler.java
index a54b3c9..72d65f3 100644
--- a/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/VoteDeletedEventHandler.java
+++ b/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/VoteDeletedEventHandler.java
@@ -15,8 +15,9 @@
  */
 package com.ruesga.gerrit.plugins.fcm.handlers;
 
-import java.util.Collection;
+import java.util.List;
 
+import com.google.common.collect.ImmutableList;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.common.ApprovalInfo;
 import com.google.gerrit.extensions.events.VoteDeletedListener;
@@ -78,9 +79,9 @@
         VoteDeletedInfo info = toVoteDeletedInfo(event);
         final String msg;
         if (info.votes.length == 1) {
-            msg = " remove " + info.votes[0].vote + " by " + info.votes[0].account;
+            msg = " removed " + info.votes[0].vote + " by " + info.votes[0].account;
         } else {
-            msg = " remove multiple votes";
+            msg = " removed multiple votes";
         }
         Notification notification = createNotification(event);
         notification.extra = getSerializer().toJson(info);
@@ -91,15 +92,25 @@
 
     private VoteDeletedInfo toVoteDeletedInfo(Event event) {
         VoteDeletedInfo info = new VoteDeletedInfo();
-        Collection<ApprovalInfo> approvals = event.getRemoved().values();
+        List<ApprovalInfo> approvals = ImmutableList.copyOf(event.getOldApprovals().values());
         int count = approvals.size();
         info.votes = new VoteDeletedEntryInfo[count];
-        for (int i = 0; i < count; i++)
-        for (ApprovalInfo approval : event.getRemoved().values()) {
+        for (int i = 0; i < count; i++) {
+            ApprovalInfo approval = approvals.get(i);
             info.votes[i] = new VoteDeletedEntryInfo();
-            info.votes[i].vote = approval.tag + + approval.value;
+            info.votes[i].vote = toVote(approval);
             info.votes[i].account = formatAccount(approval);
         }
         return info;
     }
+
+    private String toVote(ApprovalInfo approval) {
+        if (approval.value == null || approval.value == 0) {
+            return approval.tag;
+        } else if (approval.value > 0) {
+            return approval.tag + "+" + approval.value;
+        } else {
+            return approval.tag + approval.value;
+        }
+    }
 }