diff options
author | Edwin Kempin <ekempin@google.com> | 2018-10-17 16:31:26 +0200 |
---|---|---|
committer | Edwin Kempin <ekempin@google.com> | 2018-10-18 12:55:28 +0200 |
commit | a6a5c935a9ced386ee830565c6337810bf9c9090 (patch) | |
tree | e06c980101f0d500c5559c20113abab55341041f | |
parent | ed3506fd2f7a2385c2aa8fe8a6f34bfb2a6c854d (diff) |
ActionJson: Update copy methods to copy fields that have been added recently
Add a comment to ChangeInfo and RevisionInfo to make it less likely that
this goes out of sync again.
Change-Id: Ibd2d103feb3766487c899581a265d8d07a19a70d
Signed-off-by: Edwin Kempin <ekempin@google.com>
3 files changed, 11 insertions, 4 deletions
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java index f802049762..97f9ba1e8a 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.Map; public class ChangeInfo { + // ActionJson#copy(List, ChangeInfo) must be adapted if new fields are added that are not + // protected by any ListChangesOption. public String id; public String project; public String branch; diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java index fc443dd08a..f2629014cf 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java @@ -19,6 +19,8 @@ import java.sql.Timestamp; import java.util.Map; public class RevisionInfo { + // ActionJson#copy(List, RevisionInfo) must be adapted if new fields are added that are not + // protected by any ListChangesOption. public transient boolean isCurrent; public ChangeKind kind; public int _number; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java index c26ff80ac3..7aa6e4e731 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java @@ -115,8 +115,8 @@ public class ActionJson { if (visitors.isEmpty()) { return null; } - // Include all fields from ChangeJson#toChangeInfo that are not protected by - // any ListChangesOptions. + // Include all fields from ChangeJson#toChangeInfo that are not protected by any + // ListChangesOptions. ChangeInfo copy = new ChangeInfo(); copy.project = changeInfo.project; copy.branch = changeInfo.branch; @@ -128,6 +128,7 @@ public class ActionJson { copy.mergeable = changeInfo.mergeable; copy.insertions = changeInfo.insertions; copy.deletions = changeInfo.deletions; + copy.hasReviewStarted = changeInfo.hasReviewStarted; copy.isPrivate = changeInfo.isPrivate; copy.subject = changeInfo.subject; copy.status = changeInfo.status; @@ -135,10 +136,12 @@ public class ActionJson { copy.created = changeInfo.created; copy.updated = changeInfo.updated; copy._number = changeInfo._number; + copy.revertOf = changeInfo.revertOf; copy.starred = changeInfo.starred; copy.stars = changeInfo.stars; copy.submitted = changeInfo.submitted; copy.submitter = changeInfo.submitter; + copy.unresolvedCommentCount = changeInfo.unresolvedCommentCount; copy.workInProgress = changeInfo.workInProgress; copy.id = changeInfo.id; return copy; @@ -148,8 +151,8 @@ public class ActionJson { if (visitors.isEmpty()) { return null; } - // Include all fields from ChangeJson#toRevisionInfo that are not protected - // by any ListChangesOptions. + // Include all fields from ChangeJson#toRevisionInfo that are not protected by any + // ListChangesOptions. RevisionInfo copy = new RevisionInfo(); copy.isCurrent = revisionInfo.isCurrent; copy._number = revisionInfo._number; |