commit fa92467dcece08694fc0bd9c6714599bde67002d
author Gustaf Lundh <gustaflh@axis.com> Tue Jan 24 15:34:10 2017 +0100
committer Gustaf Lundh <gustaflh@axis.com> Tue Jan 31 14:33:20 2017 +0000
tree 8fa1565015f1158b5a258fb33a6a816a5f9fce57
parent 6d2fedd8e630e157efb6e7299cd64657e9e56a21

PatchSetAttribute: patchset.number should be int

Change-Id: I06a8191de477be22bb363a8c24363b2be2e16b99

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java
index 443a1fb..11595d0 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java
@@ -123,7 +123,7 @@
     changes = executeSuccessfulQuery("--current-patch-set " + changeId);
     assertThat(changes.size()).isEqualTo(1);
     assertThat(changes.get(0).currentPatchSet).isNotNull();
-    assertThat(changes.get(0).currentPatchSet.number).isEqualTo("2");
+    assertThat(changes.get(0).currentPatchSet.number).isEqualTo(2);
 
     gApi.changes().id(changeId).current().review(ReviewInput.approve());
     changes = executeSuccessfulQuery("--current-patch-set " + changeId);

gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java b/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java
index 824d800..8e43657 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 public class PatchSetAttribute {
-  public String number;
+  public int number;
   public String revision;
   public List<String> parents;
   public String ref;

gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
index 750a3f9..a777a23a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
@@ -402,8 +402,7 @@
   public void addPatchSetComments(PatchSetAttribute patchSetAttribute,
       Collection<Comment> comments) {
     for (Comment comment : comments) {
-      if (comment.key.patchSetId ==
-          Integer.parseInt(patchSetAttribute.number)) {
+      if (comment.key.patchSetId == patchSetAttribute.number) {
         if (patchSetAttribute.comments == null) {
           patchSetAttribute.comments = new ArrayList<>();
         }
@@ -474,7 +473,7 @@
       Change change, PatchSet patchSet) {
     PatchSetAttribute p = new PatchSetAttribute();
     p.revision = patchSet.getRevision().get();
-    p.number = Integer.toString(patchSet.getPatchSetId());
+    p.number = patchSet.getPatchSetId();
     p.ref = patchSet.getRefName();
     p.uploader = asAccountAttribute(patchSet.getUploader());
     p.createdOn = patchSet.getCreatedOn().getTime() / 1000L;