opendev/gerrit
Code Issues Proposed changes

ChangeJson: Remove unused ChangeControl arg from submitRecords

Browse Source 
Change-Id: Ib72adc2a95116b44b79daf5181a0ff60d558fdab
This commit is contained in:
Dave Borowitz
2014-10-14 16:08:16 -07:00
parent bfe384bbb8
commit 6289b6a8da
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -353,14 +353,10 @@ public class ChangeJson {
return c.isMergeable();
}
private List<SubmitRecord> submitRecords(ChangeControl ctl, ChangeData cd)
throws OrmException {
private List<SubmitRecord> submitRecords(ChangeData cd) throws OrmException {
if (cd.getSubmitRecords() != null) {
return cd.getSubmitRecords();
}
if (ctl == null) {
return ImmutableList.of();
}
PatchSet ps = cd.currentPatchSet();
if (ps == null) {
return ImmutableList.of();
@@ -422,7 +418,7 @@ public class ChangeJson {
LabelTypes labelTypes, boolean standard) throws OrmException {
// Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167.
Map<String, LabelInfo> labels = new TreeMap<>(labelTypes.nameComparator());
for (SubmitRecord rec : submitRecords(ctl, cd)) {
for (SubmitRecord rec : submitRecords(cd)) {
if (rec.labels == null) {
continue;
}
@@ -623,7 +619,7 @@ public class ChangeJson {
LabelTypes labelTypes = ctl.getLabelTypes();
SetMultimap<String, String> permitted = LinkedHashMultimap.create();
for (SubmitRecord rec : submitRecords(ctl, cd)) {
for (SubmitRecord rec : submitRecords(cd)) {
if (rec.labels == null) {
continue;
}