opendev/gerrit
Code Issues Proposed changes

Use Guice to feed dependencies to ApprovalsUtil

Browse Source 
Classes shouldn't use static methods with long dependency lists. They
should use Guice injection to get their dependencies, especially if
they are very common ones like ReviewDb or ApprovalTypes.

ChangeUtil is a disaster so just paper over the one call site that is
harder to clean up.

Change-Id: Ia32fbf32175dcc84f8ae78361b128ce527ea99fa
This commit is contained in:
Shawn O. Pearce
2012-04-27 18:20:48 -07:00
parent 1eee2c9d8f
commit 8a7bbc13a4
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.server;
import com.google.gerrit.common.ChangeHookRunner;
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Change.Status;
@@ -243,7 +242,7 @@ public class ChangeUtil {
final PatchSetInfoFactory patchSetInfoFactory,
final ReplicationQueue replication, PersonIdent myIdent,
final ChangeControl.Factory changeControlFactory,
final ApprovalTypes approvalTypes) throws NoSuchChangeException,
final ApprovalsUtil approvalsUtil) throws NoSuchChangeException,
EmailException, OrmException, MissingObjectException,
IncorrectObjectTypeException, IOException,
PatchSetInfoNotAvailableException, InvalidChangeOperationException {
@@ -384,7 +383,7 @@ public class ChangeUtil {
replication.scheduleUpdate(change.getProject(), ru.getName());
ApprovalsUtil.copyVetosToLatestPatchSet(db, change, approvalTypes);
approvalsUtil.copyVetosToLatestPatchSet(change);
final ChangeMessage cmsg =
new ChangeMessage(new ChangeMessage.Key(changeId,
@@ -594,7 +593,7 @@ public class ChangeUtil {
}
db.changeMessages().insert(Collections.singleton(cmsg));
ApprovalsUtil.syncChangeStatus(db, change);
new ApprovalsUtil(db, null).syncChangeStatus(change);
// Email the reviewers
final ReplyToChangeSender cm = senderFactory.create(change);