opendev/gerrit
Code Issues Proposed changes

Create ChangeResource with ChangeNotes and CurrentUser

Browse Source 
After removing all callers of ChangeResource#getChangeControl()
ChangeResource can be constructed using ChangeNotes and CurrentUser
instead of ChangeControl.

Change-Id: I6707a29309065857d881666992344a4eaae641dc
This commit is contained in:
Patrick Hiesel
2017-09-13 10:19:35 +02:00
parent 10e803378c
commit 371b97cb07
8 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -102,7 +102,6 @@ import com.google.gerrit.server.notedb.ChangeNoteUtil;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.MutableNotesMigration;
import com.google.gerrit.server.notedb.PatchSetState;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.Util;
import com.google.gerrit.server.query.change.ChangeData;
@@ -253,7 +252,6 @@ public abstract class AbstractDaemonTest {
@Inject private InProcessProtocol inProcessProtocol;
@Inject private Provider<AnonymousUser> anonymousUser;
@Inject private SchemaFactory<ReviewDb> reviewDbProvider;
@Inject private ChangeControl.GenericFactory changeControlFactory;
private List<Repository> toClose;
@@ -1119,8 +1117,7 @@ public abstract class AbstractDaemonTest {
protected ChangeResource parseChangeResource(String changeId) throws Exception {
List<ChangeNotes> notes = changeFinder.find(changeId);
assertThat(notes).hasSize(1);
return changeResourceFactory.create(
changeControlFactory.controlFor(notes.get(0), atrScope.get().getUser()));
return changeResourceFactory.create(notes.get(0), atrScope.get().getUser());
}
protected String createGroup(String name) throws Exception {