opendev/gerrit
Code Issues Proposed changes

Adapt the use of @Inject and @AssistedInject

Browse Source 
This change adapts our use of @Inject and @AssistedInject to be in-line
with what the Guice documentation governs [0, 1].

Specifically, @Inject should be used even if the constructor has
@Assisted parameters as long as it is the only injected constructor in
that class. @AssistedInject should be used if there are multiple
constructors with @Assisted parameters.

[0] https://google.github.io/guice/api-docs/4.1/javadoc/index.html?com/google/inject/assistedinject/FactoryModuleBuilder.html
[1] https://google.github.io/guice/api-docs/4.1/javadoc/com/google/inject/assistedinject/AssistedInject.html

Change-Id: I725df1e294d0758f4c27f8b86ec26c21adeb3d8f
This commit is contained in:
Patrick Hiesel
2017-03-23 09:15:19 +01:00
parent 75a22f5159
commit 2b9574c785
29 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
View File

@@ -38,9 +38,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import io.searchbox.client.JestResult; import io.searchbox.client.JestResult;
import io.searchbox.core.Bulk; import io.searchbox.core.Bulk;
import io.searchbox.core.Bulk.Builder; import io.searchbox.core.Bulk.Builder;
@@ -76,7 +76,7 @@ public class ElasticAccountIndex extends AbstractElasticIndex<Account.Id, Accoun
private final AccountMapping mapping; private final AccountMapping mapping;
private final Provider<AccountCache> accountCache; private final Provider<AccountCache> accountCache;
@AssistedInject @Inject
ElasticAccountIndex( ElasticAccountIndex(
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,
SitePaths sitePaths, SitePaths sitePaths,

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
View File

@@ -54,9 +54,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import io.searchbox.client.JestResult; import io.searchbox.client.JestResult;
import io.searchbox.core.Bulk; import io.searchbox.core.Bulk;
import io.searchbox.core.Bulk.Builder; import io.searchbox.core.Bulk.Builder;
@@ -99,7 +99,7 @@ class ElasticChangeIndex extends AbstractElasticIndex<Change.Id, ChangeData>
private final Provider<ReviewDb> db; private final Provider<ReviewDb> db;
private final ChangeData.Factory changeDataFactory; private final ChangeData.Factory changeDataFactory;
@AssistedInject @Inject
ElasticChangeIndex( ElasticChangeIndex(
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,
Provider<ReviewDb> db, Provider<ReviewDb> db,

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
View File

@@ -35,9 +35,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import io.searchbox.client.JestResult; import io.searchbox.client.JestResult;
import io.searchbox.core.Bulk; import io.searchbox.core.Bulk;
import io.searchbox.core.Bulk.Builder; import io.searchbox.core.Bulk.Builder;
@@ -73,7 +73,7 @@ public class ElasticGroupIndex extends AbstractElasticIndex<AccountGroup.UUID, A
private final GroupMapping mapping; private final GroupMapping mapping;
private final Provider<GroupCache> groupCache; private final Provider<GroupCache> groupCache;
@AssistedInject @Inject
ElasticGroupIndex( ElasticGroupIndex(
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,
SitePaths sitePaths, SitePaths sitePaths,

4
gerrit-gpg/src/main/java/com/google/gerrit/gpg/GerritPushCertificateChecker.java
View File

@@ -17,8 +17,8 @@ package com.google.gerrit.gpg;
import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
@@ -30,7 +30,7 @@ public class GerritPushCertificateChecker extends PushCertificateChecker {
private final GitRepositoryManager repoManager; private final GitRepositoryManager repoManager;
private final AllUsersName allUsers; private final AllUsersName allUsers;
@AssistedInject @Inject
GerritPushCertificateChecker( GerritPushCertificateChecker(
GerritPublicKeyChecker.Factory keyCheckerFactory, GerritPublicKeyChecker.Factory keyCheckerFactory,
GitRepositoryManager repoManager, GitRepositoryManager repoManager,

4
gerrit-gpg/src/main/java/com/google/gerrit/gpg/api/GpgKeyApiImpl.java
View File

@@ -21,8 +21,8 @@ import com.google.gerrit.gpg.server.DeleteGpgKey;
import com.google.gerrit.gpg.server.GpgKey; import com.google.gerrit.gpg.server.GpgKey;
import com.google.gerrit.gpg.server.GpgKeys; import com.google.gerrit.gpg.server.GpgKeys;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -36,7 +36,7 @@ public class GpgKeyApiImpl implements GpgKeyApi {
private final DeleteGpgKey delete; private final DeleteGpgKey delete;
private final GpgKey rsrc; private final GpgKey rsrc;
@AssistedInject @Inject
GpgKeyApiImpl(GpgKeys.Get get, DeleteGpgKey delete, @Assisted GpgKey rsrc) { GpgKeyApiImpl(GpgKeys.Get get, DeleteGpgKey delete, @Assisted GpgKey rsrc) {
this.get = get; this.get = get;
this.delete = delete; this.delete = delete;

4
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -61,9 +61,9 @@ import com.google.gwtorm.protobuf.ProtobufCodec;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.OrmRuntimeException; import com.google.gwtorm.server.OrmRuntimeException;
import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
@@ -147,7 +147,7 @@ public class LuceneChangeIndex implements ChangeIndex {
private final ChangeSubIndex openIndex; private final ChangeSubIndex openIndex;
private final ChangeSubIndex closedIndex; private final ChangeSubIndex closedIndex;
@AssistedInject @Inject
LuceneChangeIndex( LuceneChangeIndex(
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,
SitePaths sitePaths, SitePaths sitePaths,

4
gerrit-server/src/main/java/com/google/gerrit/server/api/groups/GroupApiImpl.java
View File

@@ -42,8 +42,8 @@ import com.google.gerrit.server.group.PutName;
import com.google.gerrit.server.group.PutOptions; import com.google.gerrit.server.group.PutOptions;
import com.google.gerrit.server.group.PutOwner; import com.google.gerrit.server.group.PutOwner;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -73,7 +73,7 @@ class GroupApiImpl implements GroupApi {
private final GroupResource rsrc; private final GroupResource rsrc;
private final Index index; private final Index index;
@AssistedInject @Inject
GroupApiImpl( GroupApiImpl(
GetGroup getGroup, GetGroup getGroup,
GetDetail getDetail, GetDetail getDetail,

4
gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ChildProjectApiImpl.java
View File

@@ -19,8 +19,8 @@ import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.server.project.ChildProjectResource; import com.google.gerrit.server.project.ChildProjectResource;
import com.google.gerrit.server.project.GetChildProject; import com.google.gerrit.server.project.GetChildProject;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
public class ChildProjectApiImpl implements ChildProjectApi { public class ChildProjectApiImpl implements ChildProjectApi {
interface Factory { interface Factory {
@@ -30,7 +30,7 @@ public class ChildProjectApiImpl implements ChildProjectApi {
private final GetChildProject getChildProject; private final GetChildProject getChildProject;
private final ChildProjectResource rsrc; private final ChildProjectResource rsrc;
@AssistedInject @Inject
ChildProjectApiImpl(GetChildProject getChildProject, @Assisted ChildProjectResource rsrc) { ChildProjectApiImpl(GetChildProject getChildProject, @Assisted ChildProjectResource rsrc) {
this.getChildProject = getChildProject; this.getChildProject = getChildProject;
this.rsrc = rsrc; this.rsrc = rsrc;

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

@@ -122,7 +122,6 @@ import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
@@ -214,7 +213,7 @@ public class ChangeJson {
private AccountLoader accountLoader; private AccountLoader accountLoader;
private FixInput fix; private FixInput fix;
@AssistedInject @Inject
ChangeJson( ChangeJson(
Provider<ReviewDb> db, Provider<ReviewDb> db,
LabelNormalizer ln, LabelNormalizer ln,

4
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java
View File

@@ -32,9 +32,9 @@ import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
public class ChangeResource implements RestResource, HasETag { public class ChangeResource implements RestResource, HasETag {
@@ -56,7 +56,7 @@ public class ChangeResource implements RestResource, HasETag {
private final StarredChangesUtil starredChangesUtil; private final StarredChangesUtil starredChangesUtil;
private final ChangeControl control; private final ChangeControl control;
@AssistedInject @Inject
ChangeResource(StarredChangesUtil starredChangesUtil, @Assisted ChangeControl control) { ChangeResource(StarredChangesUtil starredChangesUtil, @Assisted ChangeControl control) {
this.starredChangesUtil = starredChangesUtil; this.starredChangesUtil = starredChangesUtil;
this.control = control; this.control = control;

4
gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
View File

@@ -50,8 +50,8 @@ import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.RepoContext;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -106,7 +106,7 @@ public class PatchSetInserter implements BatchUpdateOp {
private ChangeMessage changeMessage; private ChangeMessage changeMessage;
private ReviewerSet oldReviewers; private ReviewerSet oldReviewers;
@AssistedInject @Inject
public PatchSetInserter( public PatchSetInserter(
ApprovalsUtil approvalsUtil, ApprovalsUtil approvalsUtil,
ApprovalCopier approvalCopier, ApprovalCopier approvalCopier,

4
gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
View File

@@ -36,8 +36,8 @@ import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.RepoContext;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import org.eclipse.jgit.lib.CommitBuilder; import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
@@ -75,7 +75,7 @@ public class RebaseChangeOp implements BatchUpdateOp {
private PatchSetInserter patchSetInserter; private PatchSetInserter patchSetInserter;
private PatchSet rebasedPatchSet; private PatchSet rebasedPatchSet;
@AssistedInject @Inject
RebaseChangeOp( RebaseChangeOp(
PatchSetInserter.Factory patchSetInserterFactory, PatchSetInserter.Factory patchSetInserterFactory,
MergeUtil.Factory mergeUtilFactory, MergeUtil.Factory mergeUtilFactory,

4
gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java
View File

@@ -36,9 +36,9 @@ import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.validators.AssigneeValidationListener; import com.google.gerrit.server.validators.AssigneeValidationListener;
import com.google.gerrit.server.validators.ValidationException; import com.google.gerrit.server.validators.ValidationException;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ public class SetAssigneeOp implements BatchUpdateOp {
private Account newAssignee; private Account newAssignee;
private Account oldAssignee; private Account oldAssignee;
@AssistedInject @Inject
SetAssigneeOp( SetAssigneeOp(
AccountsCollection accounts, AccountsCollection accounts,
ChangeMessagesUtil cmUtil, ChangeMessagesUtil cmUtil,

4
gerrit-server/src/main/java/com/google/gerrit/server/change/SetHashtagsOp.java
View File

@@ -39,8 +39,8 @@ import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.validators.HashtagValidationListener; import com.google.gerrit.server.validators.HashtagValidationListener;
import com.google.gerrit.server.validators.ValidationException; import com.google.gerrit.server.validators.ValidationException;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
@@ -64,7 +64,7 @@ public class SetHashtagsOp implements BatchUpdateOp {
private Set<String> toRemove; private Set<String> toRemove;
private ImmutableSortedSet<String> updatedHashtags; private ImmutableSortedSet<String> updatedHashtags;
@AssistedInject @Inject
SetHashtagsOp( SetHashtagsOp(
NotesMigration notesMigration, NotesMigration notesMigration,
ChangeMessagesUtil cmUtil, ChangeMessagesUtil cmUtil,

4
gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java
View File

@@ -18,8 +18,8 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.util.ServerRequestContext; import com.google.gerrit.server.util.ServerRequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
/** /**
* Provider of the group(s) which should become owners of a newly created project. The only matching * Provider of the group(s) which should become owners of a newly created project. The only matching
@@ -40,7 +40,7 @@ public class ProjectOwnerGroupsProvider extends GroupSetProvider {
ProjectOwnerGroupsProvider create(Project.NameKey project); ProjectOwnerGroupsProvider create(Project.NameKey project);
} }
@AssistedInject @Inject
public ProjectOwnerGroupsProvider( public ProjectOwnerGroupsProvider(
GroupBackend gb, GroupBackend gb,
ThreadLocalRequestContext context, ThreadLocalRequestContext context,

4
gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java
View File

@@ -34,8 +34,8 @@ import com.google.gerrit.server.update.BatchUpdateOp;
import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.Context;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -64,7 +64,7 @@ public class AbandonOp implements BatchUpdateOp {
@Assisted ListMultimap<RecipientType, Account.Id> accountsToNotify); @Assisted ListMultimap<RecipientType, Account.Id> accountsToNotify);
} }
@AssistedInject @Inject
AbandonOp( AbandonOp(
AbandonedSender.Factory abandonedSenderFactory, AbandonedSender.Factory abandonedSenderFactory,
ChangeMessagesUtil cmUtil, ChangeMessagesUtil cmUtil,

4
gerrit-server/src/main/java/com/google/gerrit/server/git/GitModules.java
View File

@@ -23,8 +23,8 @@ import com.google.gerrit.server.git.MergeOpRepoManager.OpenRepo;
import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.util.RequestId; import com.google.gerrit.server.util.RequestId;
import com.google.gerrit.server.util.SubmoduleSectionParser; import com.google.gerrit.server.util.SubmoduleSectionParser;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -55,7 +55,7 @@ public class GitModules {
private final RequestId submissionId; private final RequestId submissionId;
Set<SubmoduleSubscription> subscriptions; Set<SubmoduleSubscription> subscriptions;
@AssistedInject @Inject
GitModules( GitModules(
@CanonicalWebUrl @Nullable String canonicalWebUrl, @CanonicalWebUrl @Nullable String canonicalWebUrl,
@Assisted Branch.NameKey branch, @Assisted Branch.NameKey branch,

4
gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java
View File

@@ -34,9 +34,9 @@ import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.util.RequestScopePropagator; import com.google.gerrit.server.util.RequestScopePropagator;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@@ -74,7 +74,7 @@ public class MergedByPushOp implements BatchUpdateOp {
private PatchSet patchSet; private PatchSet patchSet;
private PatchSetInfo info; private PatchSetInfo info;
@AssistedInject @Inject
MergedByPushOp( MergedByPushOp(
PatchSetInfoFactory patchSetInfoFactory, PatchSetInfoFactory patchSetInfoFactory,
ChangeMessagesUtil cmUtil, ChangeMessagesUtil cmUtil,

3
gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java
View File

@@ -22,7 +22,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.BatchRefUpdate; import org.eclipse.jgit.lib.BatchRefUpdate;
@@ -185,7 +184,7 @@ public class MetaDataUpdate implements AutoCloseable {
private boolean closeRepository; private boolean closeRepository;
private IdentifiedUser author; private IdentifiedUser author;
@AssistedInject @Inject
public MetaDataUpdate( public MetaDataUpdate(
GitReferenceUpdated gitRefUpdated, GitReferenceUpdated gitRefUpdated,
@Assisted Project.NameKey projectName, @Assisted Project.NameKey projectName,

4
gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java
View File

@@ -55,8 +55,8 @@ import com.google.gerrit.server.update.Context;
import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.RepoContext;
import com.google.gerrit.server.util.RequestScopePropagator; import com.google.gerrit.server.util.RequestScopePropagator;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import com.google.inject.util.Providers; import com.google.inject.util.Providers;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
@@ -134,7 +134,7 @@ public class ReplaceOp implements BatchUpdateOp {
private RequestScopePropagator requestScopePropagator; private RequestScopePropagator requestScopePropagator;
private boolean updateRef; private boolean updateRef;
@AssistedInject @Inject
ReplaceOp( ReplaceOp(
AccountResolver accountResolver, AccountResolver accountResolver,
ApprovalCopier approvalCopier, ApprovalCopier approvalCopier,

4
gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
View File

@@ -35,8 +35,8 @@ import com.google.gerrit.server.update.BatchUpdateListener;
import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.RepoContext;
import com.google.gerrit.server.update.RepoOnlyOp; import com.google.gerrit.server.update.RepoOnlyOp;
import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.update.UpdateException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
@@ -117,7 +117,7 @@ public class SubmoduleOp {
// map of superproject and its branches which has submodule subscriptions // map of superproject and its branches which has submodule subscriptions
private final SetMultimap<Project.NameKey, Branch.NameKey> branchesByProject; private final SetMultimap<Project.NameKey, Branch.NameKey> branchesByProject;
@AssistedInject @Inject
public SubmoduleOp( public SubmoduleOp(
GitModules.Factory gitmodulesFactory, GitModules.Factory gitmodulesFactory,
@GerritPersonIdent PersonIdent myIdent, @GerritPersonIdent PersonIdent myIdent,

4
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategy.java
View File

@@ -53,9 +53,9 @@ import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdate;
import com.google.gerrit.server.util.RequestId; import com.google.gerrit.server.util.RequestId;
import com.google.inject.Inject;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@@ -145,7 +145,7 @@ public abstract class SubmitStrategy {
final MergeUtil mergeUtil; final MergeUtil mergeUtil;
final boolean dryrun; final boolean dryrun;
@AssistedInject @Inject
Arguments( Arguments(
AccountCache accountCache, AccountCache accountCache,
ApprovalsUtil approvalsUtil, ApprovalsUtil approvalsUtil,

4
gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
View File

@@ -43,9 +43,9 @@ import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
import com.google.gerrit.server.update.ChainedReceiveCommands; import com.google.gerrit.server.update.ChainedReceiveCommands;
import com.google.gwtorm.server.OrmConcurrencyException; import com.google.gwtorm.server.OrmConcurrencyException;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@@ -206,7 +206,7 @@ public class NoteDbUpdateManager implements AutoCloseable {
private String refLogMessage; private String refLogMessage;
private PersonIdent refLogIdent; private PersonIdent refLogIdent;
@AssistedInject @Inject
NoteDbUpdateManager( NoteDbUpdateManager(
@GerritPersonIdent Provider<PersonIdent> serverIdent, @GerritPersonIdent Provider<PersonIdent> serverIdent,
GitRepositoryManager repoManager, GitRepositoryManager repoManager,

4
gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentNotes.java
View File

@@ -24,8 +24,8 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.reviewdb.client.RevId;
import com.google.gerrit.reviewdb.client.RobotComment; import com.google.gerrit.reviewdb.client.RobotComment;
import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage; import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
@@ -44,7 +44,7 @@ public class RobotCommentNotes extends AbstractChangeNotes<RobotCommentNotes> {
private RevisionNoteMap<RobotCommentsRevisionNote> revisionNoteMap; private RevisionNoteMap<RobotCommentsRevisionNote> revisionNoteMap;
private ObjectId metaId; private ObjectId metaId;
@AssistedInject @Inject
RobotCommentNotes(Args args, @Assisted Change change) { RobotCommentNotes(Args args, @Assisted Change change) {
super(args, change.getId(), PrimaryStorage.of(change), false); super(args, change.getId(), PrimaryStorage.of(change), false);
this.change = change; this.change = change;

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryLoader.java
View File

@@ -16,8 +16,8 @@ package com.google.gerrit.server.patch;
import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -36,7 +36,7 @@ public class DiffSummaryLoader implements Callable<DiffSummary> {
private final DiffSummaryKey key; private final DiffSummaryKey key;
private final Project.NameKey project; private final Project.NameKey project;
@AssistedInject @Inject
DiffSummaryLoader(PatchListCache plc, @Assisted DiffSummaryKey k, @Assisted Project.NameKey p) { DiffSummaryLoader(PatchListCache plc, @Assisted DiffSummaryKey k, @Assisted Project.NameKey p) {
patchListCache = plc; patchListCache = plc;
key = k; key = k;

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java
View File

@@ -18,8 +18,8 @@ package com.google.gerrit.server.patch;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.ConfigUtil;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.util.List; import java.util.List;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@@ -52,7 +52,7 @@ class IntraLineLoader implements Callable<IntraLineDiff> {
private final IntraLineDiffKey key; private final IntraLineDiffKey key;
private final IntraLineDiffArgs args; private final IntraLineDiffArgs args;
@AssistedInject @Inject
IntraLineLoader( IntraLineLoader(
@DiffExecutor ExecutorService diffExecutor, @DiffExecutor ExecutorService diffExecutor,
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
View File

@@ -29,8 +29,8 @@ import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.InMemoryInserter; import com.google.gerrit.server.git.InMemoryInserter;
import com.google.gerrit.server.git.MergeUtil; import com.google.gerrit.server.git.MergeUtil;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -86,7 +86,7 @@ public class PatchListLoader implements Callable<PatchList> {
private final long timeoutMillis; private final long timeoutMillis;
private final boolean save; private final boolean save;
@AssistedInject @Inject
PatchListLoader( PatchListLoader(
GitRepositoryManager mgr, GitRepositoryManager mgr,
PatchListCache plc, PatchListCache plc,

4
gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java
View File

@@ -26,9 +26,9 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -64,7 +64,7 @@ public class DeleteRef {
DeleteRef create(ProjectResource r); DeleteRef create(ProjectResource r);
} }
@AssistedInject @Inject
DeleteRef( DeleteRef(
Provider<IdentifiedUser> identifiedUser, Provider<IdentifiedUser> identifiedUser,
GitRepositoryManager repoManager, GitRepositoryManager repoManager,

3
gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java
View File

@@ -69,7 +69,6 @@ import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
@@ -375,7 +374,7 @@ class ReviewDbBatchUpdate extends BatchUpdate {
private final long skewMs; private final long skewMs;
private final List<CheckedFuture<?, IOException>> indexFutures = new ArrayList<>(); private final List<CheckedFuture<?, IOException>> indexFutures = new ArrayList<>();
@AssistedInject @Inject
ReviewDbBatchUpdate( ReviewDbBatchUpdate(
@GerritServerConfig Config cfg, @GerritServerConfig Config cfg,
AllUsersName allUsers, AllUsersName allUsers,