Remove unused injected parameters Change-Id: I741f26844fee0ea8ce98c3bc640c4a5ac2ca8045
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java index 93e7159..03010b4 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java
@@ -23,9 +23,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig; import com.googlesource.gerrit.plugins.github.oauth.OAuthFilter; -import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol; import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; import com.googlesource.gerrit.plugins.github.oauth.OAuthWebFilter; import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; @@ -54,8 +52,6 @@ @Inject public GitHubOAuthFilter(ScopedProvider<GitHubLogin> loginProvider, - GitHubOAuthConfig githubOAuthConfig, - OAuthProtocol oauth, Provider<CurrentUser> userProvider, AccountCache accountCache) { this.loginProvider = loginProvider;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java index e2ed847..06bd28b 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java
@@ -13,9 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import com.google.gerrit.server.account.GroupBackend; -import com.google.gerrit.server.git.MetaDataUpdate; -import com.google.gerrit.server.project.ProjectCache; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -43,9 +40,6 @@ @Inject public GitCloneStep(GitHubConfig gitConfig, - MetaDataUpdate.User metaDataUpdateFactory, - GroupBackend groupBackend, - ProjectCache projectCache, GitHubRepository.Factory gitHubRepoFactory, @Assisted("organisation") String organisation, @Assisted("name") String repository)
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java index d49bb1b..7fe85d4 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
@@ -35,7 +35,6 @@ import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; -import com.googlesource.gerrit.plugins.github.GitHubURL; import com.googlesource.gerrit.plugins.github.git.GitJobStatus.Code; import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; @@ -92,8 +91,8 @@ private AccountImporter accountImporter; @Inject - public PullRequestImportJob(@GitHubURL String gitHubUrl, - GitRepositoryManager repoMgr, PullRequestCreateChange createChange, + public PullRequestImportJob(GitRepositoryManager repoMgr, + PullRequestCreateChange createChange, ProjectCache projectCache, Provider<ReviewDb> schema, AccountImporter accountImporter, GitHubRepository.Factory gitHubRepoFactory,
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java index 8353cce..5a454d0 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java
@@ -31,9 +31,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.inject.Inject; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.UserScopedProvider; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +47,6 @@ @Inject GitHubGroupBackend( - UserScopedProvider<GitHubLogin> ghLogin, GitHubGroupMembership.Factory ghMembershipProvider, GitHubGroupsCache ghOrganisationCache) { this.ghMembershipProvider = ghMembershipProvider;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java index e6c070a..193024e 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java
@@ -20,16 +20,13 @@ import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.PluginUser; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.account.ListGroupMembership; -import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Injector; import org.eclipse.jgit.lib.Config; @@ -47,10 +44,8 @@ private final CurrentUser remoteUser; Destination(final Injector injector, final RemoteConfig rc, final Config cfg, - final SchemaFactory<ReviewDb> db, final RemoteSiteUser.Factory replicationUserFactory, final PluginUser pluginUser, - final GitRepositoryManager gitRepositoryManager, final GroupBackend groupBackend) { remote = rc;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java index 83352a4..0d94796 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java
@@ -16,12 +16,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PluginUser; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; import com.google.inject.Injector; @@ -61,24 +58,20 @@ private final List<Destination> configs; - private final SchemaFactory<ReviewDb> database; private final RemoteSiteUser.Factory replicationUserFactory; private final PluginUser pluginUser; - private final GitRepositoryManager gitRepositoryManager; private final GroupBackend groupBackend; boolean replicateAllOnPluginStart; private final List<String> organisations; @Inject GitHubDestinations(final Injector i, final SitePaths site, - final RemoteSiteUser.Factory ruf, final SchemaFactory<ReviewDb> db, - final GitRepositoryManager grm, final GroupBackend gb, final PluginUser pu) + final RemoteSiteUser.Factory ruf, + final GroupBackend gb, final PluginUser pu) throws ConfigInvalidException, IOException { injector = i; - database = db; pluginUser = pu; replicationUserFactory = ruf; - gitRepositoryManager = grm; groupBackend = gb; configs = getDestinations(site.etc_dir.resolve("replication.config")); organisations = getOrganisations(configs); @@ -138,8 +131,8 @@ .setForceUpdate(true)); } - dest.add(new Destination(injector, c, cfg, database, - replicationUserFactory, pluginUser, gitRepositoryManager, + dest.add(new Destination(injector, c, cfg, + replicationUserFactory, pluginUser, groupBackend)); } return dest.build();