Merge "Update cookbook-plugin"
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
index 5140168..6d798cc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
@@ -30,7 +30,6 @@
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.account.GroupMembership;
import com.google.gerrit.server.account.ListGroupMembership;
-import com.google.gerrit.server.account.Realm;
import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
@@ -69,7 +68,6 @@
private final AuthConfig authConfig;
private final String anonymousCowardName;
private final Provider<String> canonicalUrl;
- private final Realm realm;
private final AccountCache accountCache;
private final GroupBackend groupBackend;
@@ -79,14 +77,12 @@
AuthConfig authConfig,
@AnonymousCowardName String anonymousCowardName,
@CanonicalWebUrl Provider<String> canonicalUrl,
- Realm realm,
AccountCache accountCache,
GroupBackend groupBackend) {
this.capabilityControlFactory = capabilityControlFactory;
this.authConfig = authConfig;
this.anonymousCowardName = anonymousCowardName;
this.canonicalUrl = canonicalUrl;
- this.realm = realm;
this.accountCache = accountCache;
this.groupBackend = groupBackend;
}
@@ -97,20 +93,20 @@
public IdentifiedUser create(Provider<ReviewDb> db, Account.Id id) {
return new IdentifiedUser(capabilityControlFactory,
- authConfig, anonymousCowardName, canonicalUrl, realm, accountCache,
+ authConfig, anonymousCowardName, canonicalUrl, accountCache,
groupBackend, null, db, id, null);
}
public IdentifiedUser create(SocketAddress remotePeer, Account.Id id) {
return new IdentifiedUser(capabilityControlFactory,
- authConfig, anonymousCowardName, canonicalUrl, realm, accountCache,
+ authConfig, anonymousCowardName, canonicalUrl, accountCache,
groupBackend, Providers.of(remotePeer), null, id, null);
}
public CurrentUser runAs(SocketAddress remotePeer, Account.Id id,
@Nullable CurrentUser caller) {
return new IdentifiedUser(capabilityControlFactory,
- authConfig, anonymousCowardName, canonicalUrl, realm, accountCache,
+ authConfig, anonymousCowardName, canonicalUrl, accountCache,
groupBackend, Providers.of(remotePeer), null, id, caller);
}
}
@@ -127,7 +123,6 @@
private final AuthConfig authConfig;
private final String anonymousCowardName;
private final Provider<String> canonicalUrl;
- private final Realm realm;
private final AccountCache accountCache;
private final GroupBackend groupBackend;
@@ -140,7 +135,7 @@
final AuthConfig authConfig,
final @AnonymousCowardName String anonymousCowardName,
final @CanonicalWebUrl Provider<String> canonicalUrl,
- final Realm realm, final AccountCache accountCache,
+ final AccountCache accountCache,
final GroupBackend groupBackend,
final @RemotePeer Provider<SocketAddress> remotePeerProvider,
@@ -149,7 +144,6 @@
this.authConfig = authConfig;
this.anonymousCowardName = anonymousCowardName;
this.canonicalUrl = canonicalUrl;
- this.realm = realm;
this.accountCache = accountCache;
this.groupBackend = groupBackend;
@@ -159,13 +153,13 @@
public IdentifiedUser create(Account.Id id) {
return new IdentifiedUser(capabilityControlFactory,
- authConfig, anonymousCowardName, canonicalUrl, realm, accountCache,
+ authConfig, anonymousCowardName, canonicalUrl, accountCache,
groupBackend, remotePeerProvider, dbProvider, id, null);
}
public IdentifiedUser runAs(Account.Id id, CurrentUser caller) {
return new IdentifiedUser(capabilityControlFactory,
- authConfig, anonymousCowardName, canonicalUrl, realm, accountCache,
+ authConfig, anonymousCowardName, canonicalUrl, accountCache,
groupBackend, remotePeerProvider, dbProvider, id, caller);
}
}
@@ -205,7 +199,7 @@
final AuthConfig authConfig,
final String anonymousCowardName,
final Provider<String> canonicalUrl,
- final Realm realm, final AccountCache accountCache,
+ final AccountCache accountCache,
final GroupBackend groupBackend,
@Nullable final Provider<SocketAddress> remotePeerProvider,
@Nullable final Provider<ReviewDb> dbProvider,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java
index b3e696c..ff4329d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.git;
-import com.google.gerrit.common.Nullable;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Project.SubmitType;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -22,7 +21,6 @@
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.changedetail.RebaseChange;
-import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.index.ChangeIndexer;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
@@ -30,7 +28,6 @@
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.PersonIdent;
@@ -63,7 +60,6 @@
final IdentifiedUser.GenericFactory identifiedUserFactory,
@GerritPersonIdent final PersonIdent myIdent,
final PatchSetInfoFactory patchSetInfoFactory,
- @CanonicalWebUrl @Nullable final Provider<String> urlProvider,
final GitReferenceUpdated gitRefUpdated, final RebaseChange rebaseChange,
final ProjectCache projectCache,
final ApprovalsUtil approvalsUtil,
