opendev/gerrit
Code Issues Proposed changes

Hoist BranchNameKey to top level

Browse Source 
The rest of Branch was completely unused, so rather than leave it as a
completely empty container for NameKey, remove it entirely.

Change-Id: I8fc7389f47eb27ed10d052397224d4e3d4316f36
This commit is contained in:
Dave Borowitz
2019-04-23 13:50:54 -07:00
parent 59b42fbf18
commit aee58d9905
96 changed files with 522 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/args4j/ChangeIdHandler.java
View File

@@ -18,7 +18,7 @@ import static com.google.gerrit.util.cli.Localizable.localizable;
import com.google.common.base.Splitter;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.BranchNameKey;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.query.change.ChangeData;
@@ -60,7 +60,7 @@ public class ChangeIdHandler extends OptionHandler<Change.Id> {
try {
final Change.Key key = Change.Key.parse(tokens.get(2));
final Project.NameKey project = Project.nameKey(tokens.get(0));
final Branch.NameKey branch = Branch.nameKey(project, tokens.get(1));
final BranchNameKey branch = BranchNameKey.create(project, tokens.get(1));
for (ChangeData cd : queryProvider.get().byBranchKey(branch, key)) {
setter.addValue(cd.getId());
return 1;