opendev/gerrit
Code Issues Proposed changes

SubmittedTogether: Error out on nonVisibleChanges unless o=NON_VISIBLE_CHANGES passed

Browse Source 
Make SubmittedTogether#apply(ChangeResource, EnumSet) fail if it is
called (for example from ChangeApi) for a change set with non-visible
changes without the NON_VISIBLE_CHANGES option.  Without this change
only #apply(ChangeResource) would fail in that case.

As a side effect, this stops Eclipse from warning about the unused
EnumSet parameter.

Change-Id: I1dbc58d9bc6c799661ecec44439d535ee93017b8
This commit is contained in:
Jonathan Nieder
2016-06-20 14:07:18 -07:00
parent c59d65d502
commit 62ef32d669
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/change/SubmittedTogether.java
View File

@@ -81,10 +81,6 @@ public class SubmittedTogether implements RestReadView<ChangeResource> {
ResourceConflictException, IOException, OrmException {
SubmittedTogetherInfo info = apply(resource, options);
if (options.isEmpty()) {
if (info.nonVisibleChanges != 0) {
throw new AuthException(
"change would be submitted with a change that you cannot see");
}
return info.changes;
}
return info;
@@ -92,7 +88,7 @@ public class SubmittedTogether implements RestReadView<ChangeResource> {
public SubmittedTogetherInfo apply(ChangeResource resource,
EnumSet<SubmittedTogetherOption> options)
throws IOException, OrmException {
throws AuthException, IOException, OrmException {
Change c = resource.getChange();
try {
List<ChangeData> cds;
@@ -112,6 +108,12 @@ public class SubmittedTogether implements RestReadView<ChangeResource> {
hidden = 0;
}
if (hidden != 0
&& !options.contains(SubmittedTogetherOption.NON_VISIBLE_CHANGES)) {
throw new AuthException(
"change would be submitted with a change that you cannot see");
}
if (cds.size() <= 1 && hidden == 0) {
cds = Collections.emptyList();
} else {