opendev/gerrit
Code Issues Proposed changes

GetRevisionActions: Use Provider<MergeSuperSet>

Browse Source 
This was missed in I5f086adf.

Change-Id: Ib088d289024f2c2cd0b72c06727bde128f9de311
This commit is contained in:
Dave Borowitz
2016-09-15 11:36:39 -04:00
parent 1e1a37670c
commit a2fef427d1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/change/GetRevisionActions.java
View File

@@ -41,14 +41,14 @@ public class GetRevisionActions implements ETagView<RevisionResource> {
private final ActionJson delegate; private final ActionJson delegate;
private final Config config; private final Config config;
private final Provider<ReviewDb> dbProvider; private final Provider<ReviewDb> dbProvider;
private final MergeSuperSet mergeSuperSet; private final Provider<MergeSuperSet> mergeSuperSet;
private final ChangeResource.Factory changeResourceFactory; private final ChangeResource.Factory changeResourceFactory;
@Inject @Inject
GetRevisionActions( GetRevisionActions(
ActionJson delegate, ActionJson delegate,
Provider<ReviewDb> dbProvider, Provider<ReviewDb> dbProvider,
MergeSuperSet mergeSuperSet, Provider<MergeSuperSet> mergeSuperSet,
ChangeResource.Factory changeResourceFactory, ChangeResource.Factory changeResourceFactory,
@GerritServerConfig Config config) { @GerritServerConfig Config config) {
this.delegate = delegate; this.delegate = delegate;
@@ -72,7 +72,7 @@ public class GetRevisionActions implements ETagView<RevisionResource> {
h.putBoolean(Submit.wholeTopicEnabled(config)); h.putBoolean(Submit.wholeTopicEnabled(config));
ReviewDb db = dbProvider.get(); ReviewDb db = dbProvider.get();
ChangeSet cs = ChangeSet cs =
mergeSuperSet.completeChangeSet(db, rsrc.getChange(), user); mergeSuperSet.get().completeChangeSet(db, rsrc.getChange(), user);
for (ChangeData cd : cs.changes()) { for (ChangeData cd : cs.changes()) {
changeResourceFactory.create(cd.changeControl()).prepareETag(h, user); changeResourceFactory.create(cd.changeControl()).prepareETag(h, user);
} }