opendev/gerrit
Code Issues Proposed changes

Rename getCurrentUser to getUser

Browse Source 
It is never ambiguous to say "User" instead of "CurrentUser". Save
some typing.

Change-Id: I03a051f1fd3758ba63749cded20a7c135b6cf58a
This commit is contained in:
Dave Borowitz
2015-10-19 09:53:49 -04:00
parent c42c0cd81c
commit 85f0487714
82 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
View File

@@ -76,7 +76,7 @@ public class AcceptanceTestRequestScope {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
if (user == null) {
throw new IllegalStateException("user == null, forgot to set it?");
}
@@ -153,7 +153,7 @@ public class AcceptanceTestRequestScope {
}
private Context newContinuingContext(Context ctx) {
return new Context(ctx, ctx.getSession(), ctx.getCurrentUser());
return new Context(ctx, ctx.getSession(), ctx.getUser());
}
public Context set(Context ctx) {

4
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java
View File

@@ -187,7 +187,7 @@ class InProcessProtocol extends TestProtocol<Context> {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return get(USER_KEY, null);
}
@@ -326,7 +326,7 @@ class InProcessProtocol extends TestProtocol<Context> {
throw new ServiceNotAuthorizedException();
}
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
IdentifiedUser user = (IdentifiedUser) ctl.getUser();
rp.setRefLogIdent(user.newRefLogIdent());
rp.setTimeout(config.getTimeout());
rp.setMaxObjectSizeLimit(config.getMaxObjectSizeLimit());

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@@ -376,7 +376,7 @@ public class AccountIT extends AbstractDaemonTest {
// Check raw external IDs.
Account.Id currAccountId =
((IdentifiedUser) atrScope.get().getCurrentUser()).getAccountId();
((IdentifiedUser) atrScope.get().getUser()).getAccountId();
assertThat(
GpgKeys.getGpgExtIds(db, currAccountId)
.transform(new Function<AccountExternalId, String>() {

2
gerrit-gpg/src/test/java/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
View File

@@ -126,7 +126,7 @@ public class GerritPublicKeyCheckerTest {
requestContext.setContext(new RequestContext() {
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java
View File

@@ -136,7 +136,7 @@ public abstract class CacheBasedWebSession implements WebSession {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
if (user == null) {
if (isSignedIn()) {
user = identified.create(val.getAccountId());

10
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
View File

@@ -177,7 +177,7 @@ public class GitOverHttpServlet extends GitServlet {
throw new RepositoryNotFoundException(projectName);
}
CurrentUser user = pc.getCurrentUser();
CurrentUser user = pc.getUser();
user.setAccessPath(AccessPath.GIT);
if (!pc.isVisible()) {
@@ -292,12 +292,12 @@ public class GitOverHttpServlet extends GitServlet {
throws ServiceNotAuthorizedException {
final ProjectControl pc = (ProjectControl) req.getAttribute(ATT_CONTROL);
if (!(pc.getCurrentUser().isIdentifiedUser())) {
if (!(pc.getUser().isIdentifiedUser())) {
// Anonymous users are not permitted to push.
throw new ServiceNotAuthorizedException();
}
final IdentifiedUser user = (IdentifiedUser) pc.getCurrentUser();
final IdentifiedUser user = (IdentifiedUser) pc.getUser();
final ReceiveCommits rc = factory.create(pc, db).getReceiveCommits();
ReceivePack rp = rc.getReceivePack();
rp.setRefLogIdent(user.newRefLogIdent());
@@ -367,13 +367,13 @@ public class GitOverHttpServlet extends GitServlet {
return;
}
if (!(pc.getCurrentUser().isIdentifiedUser())) {
if (!(pc.getUser().isIdentifiedUser())) {
chain.doFilter(request, response);
return;
}
AdvertisedObjectsCacheKey cacheKey = AdvertisedObjectsCacheKey.create(
((IdentifiedUser) pc.getCurrentUser()).getAccountId(),
((IdentifiedUser) pc.getUser()).getAccountId(),
projectName);
if (isGet) {

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java
View File

@@ -78,7 +78,7 @@ public class HttpLogoutServlet extends HttpServlet {
final HttpServletResponse rsp) throws IOException {
final String sid = webSession.get().getSessionId();
final CurrentUser currentUser = webSession.get().getCurrentUser();
final CurrentUser currentUser = webSession.get().getUser();
final String what = "sign out";
final long when = TimeUtil.nowMs();

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRequestContext.java
View File

@@ -34,8 +34,8 @@ class HttpRequestContext implements RequestContext {
}
@Override
public CurrentUser getCurrentUser() {
return session.get().getCurrentUser();
public CurrentUser getUser() {
return session.get().getUser();
}
@Override

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/RunAsFilter.java
View File

@@ -84,7 +84,7 @@ class RunAsFilter implements Filter {
return;
}
CurrentUser self = session.get().getCurrentUser();
CurrentUser self = session.get().getUser();
if (!self.getCapabilities().canRunAs()) {
replyError(req, res,
SC_FORBIDDEN,

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSession.java
View File

@@ -25,7 +25,7 @@ public interface WebSession {
public String getXGerritAuth();
public boolean isValidXGerritAuth(String keyIn);
public AccountExternalId.Key getLastLoginExternalId();
public CurrentUser getCurrentUser();
public CurrentUser getUser();
public void login(AuthResult res, boolean rememberMe);
/** Set the user account for this current request only. */

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
View File

@@ -551,8 +551,8 @@ class GitwebServlet extends HttpServlet {
}
String remoteUser = null;
if (project.getCurrentUser().isIdentifiedUser()) {
final IdentifiedUser u = (IdentifiedUser) project.getCurrentUser();
if (project.getUser().isIdentifiedUser()) {
final IdentifiedUser u = (IdentifiedUser) project.getUser();
final String user = u.getUserName();
env.set("GERRIT_USER_NAME", user);
if (user != null && !user.isEmpty()) {

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
View File

@@ -48,7 +48,7 @@ public class BaseServiceImplementation {
return null;
}
protected CurrentUser getCurrentUser() {
protected CurrentUser getUser() {
return currentUser.get();
}

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
View File

@@ -134,7 +134,7 @@ final class GerritJsonServlet extends JsonServlet<GerritJsonServlet.GerritCall>
Audit note = method.getAnnotation(Audit.class);
if (note != null) {
final String sid = call.getWebSession().getSessionId();
final CurrentUser username = call.getWebSession().getCurrentUser();
final CurrentUser username = call.getWebSession().getUser();
final Multimap<String, ?> args =
extractParams(note, call);
final String what = extractWhat(note, call);
@@ -275,7 +275,7 @@ final class GerritJsonServlet extends JsonServlet<GerritJsonServlet.GerritCall>
} else if (session.isSignedIn() && session.isValidXGerritAuth(keyIn)) {
// The session must exist, and must be using this token.
//
session.getCurrentUser().setAccessPath(AccessPath.JSON_RPC);
session.getUser().setAccessPath(AccessPath.JSON_RPC);
return true;
}
return false;

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java
View File

@@ -141,7 +141,7 @@ class AccountServiceImpl extends BaseServiceImplementation implements
AccountProjectWatch watch =
new AccountProjectWatch(new AccountProjectWatch.Key(
((IdentifiedUser) ctl.getCurrentUser()).getAccountId(),
((IdentifiedUser) ctl.getUser()).getAccountId(),
nameKey, filter));
try {
db.accountProjectWatches().insert(Collections.singleton(watch));

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java
View File

@@ -177,7 +177,7 @@ class PatchSetDetailFactory extends Handler<PatchSetDetail> {
detail.setInfo(infoFactory.get(db, patchSet.getId()));
detail.setPatches(patches);
final CurrentUser user = control.getCurrentUser();
final CurrentUser user = control.getUser();
if (user.isIdentifiedUser() && edit == null) {
// If we are signed in, compute the number of draft comments by the
// current user on each of these patch files. This way they can more

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java
View File

@@ -60,7 +60,7 @@ class PatchDetailServiceImpl extends BaseServiceImplementation implements
public PatchScript call() throws Exception {
ChangeControl control = changeControlFactory.validateFor(
patchKey.getParentKey().getParentKey(),
getCurrentUser());
getUser());
return patchScriptFactoryFactory.create(
control, patchKey.getFileName(), psa, psb, dp).call();
}

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java
View File

@@ -131,7 +131,7 @@ public class ReviewProjectAccess extends ProjectAccessHandler<Change.Id> {
try (RevWalk rw = new RevWalk(md.getRepository());
ObjectInserter objInserter = md.getRepository().newObjectInserter();
BatchUpdate bu = updateFactory.create(
db, change.getProject(), ctl.getCurrentUser(),
db, change.getProject(), ctl.getUser(),
change.getCreatedOn())) {
bu.setRepository(md.getRepository(), rw, objInserter);
bu.insertChange(

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

@@ -288,7 +288,7 @@ public class ChangeUtil {
.append(change.getKey().get());
ins.setMessage(msgBuf.toString());
try (BatchUpdate bu = updateFactory.create(
db.get(), change.getProject(), refControl.getCurrentUser(),
db.get(), change.getProject(), refControl.getUser(),
change.getCreatedOn())) {
bu.setRepository(git, revWalk, oi);
bu.insertChange(ins);

2
gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java
View File

@@ -58,7 +58,7 @@ public class CapabilityControl {
}
/** Identity of the user the control will compute for. */
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

6
gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java
View File

@@ -121,7 +121,7 @@ public class GroupControl {
return group;
}
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}
@@ -144,8 +144,8 @@ public class GroupControl {
isOwner = false;
} else if (isOwner == null) {
AccountGroup.UUID ownerUUID = accountGroup.getOwnerGroupUUID();
isOwner = getCurrentUser().getEffectiveGroups().contains(ownerUUID)
|| getCurrentUser().getCapabilities().canAdministrateServer();
isOwner = getUser().getEffectiveGroups().contains(ownerUUID)
|| getUser().getCapabilities().canAdministrateServer();
}
return isOwner;
}

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

@@ -81,7 +81,7 @@ public class Abandon implements RestModifyView<ChangeResource, AbandonInput>,
final AbandonInput input)
throws RestApiException, UpdateException, OrmException {
ChangeControl control = req.getControl();
IdentifiedUser caller = (IdentifiedUser) control.getCurrentUser();
IdentifiedUser caller = (IdentifiedUser) control.getUser();
if (!control.canAbandon()) {
throw new AuthException("abandon not permitted");
}
@@ -95,7 +95,7 @@ public class Abandon implements RestModifyView<ChangeResource, AbandonInput>,
Op op = new Op(msgTxt, account);
Change c = control.getChange();
try (BatchUpdate u = batchUpdateFactory.create(dbProvider.get(),
c.getProject(), control.getCurrentUser(), TimeUtil.nowTs())) {
c.getProject(), control.getUser(), TimeUtil.nowTs())) {
u.addOp(c.getId(), op).execute();
}
return op.change;

8
gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java
View File

@@ -62,11 +62,11 @@ public class ActionJson {
private Map<String, ActionInfo> toActionMap(ChangeControl ctl) {
Map<String, ActionInfo> out = new LinkedHashMap<>();
if (!ctl.getCurrentUser().isIdentifiedUser()) {
if (!ctl.getUser().isIdentifiedUser()) {
return out;
}
Provider<CurrentUser> userProvider = Providers.of(ctl.getCurrentUser());
Provider<CurrentUser> userProvider = Providers.of(ctl.getUser());
for (UiAction.Description d : UiActions.from(
changeViews,
new ChangeResource(ctl),
@@ -89,9 +89,9 @@ public class ActionJson {
private Map<String, ActionInfo> toActionMap(RevisionResource rsrc) {
Map<String, ActionInfo> out = new LinkedHashMap<>();
if (rsrc.getControl().getCurrentUser().isIdentifiedUser()) {
if (rsrc.getControl().getUser().isIdentifiedUser()) {
Provider<CurrentUser> userProvider = Providers.of(
rsrc.getControl().getCurrentUser());
rsrc.getControl().getUser());
for (UiAction.Description d : UiActions.from(
revisions, rsrc, userProvider)) {
out.put(d.getId(), new ActionInfo(d));

6
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
View File

@@ -149,9 +149,9 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
}
private static IdentifiedUser checkUser(RefControl ctl) {
checkArgument(ctl.getCurrentUser().isIdentifiedUser(),
checkArgument(ctl.getUser().isIdentifiedUser(),
"only IdentifiedUser may create change");
return (IdentifiedUser) ctl.getCurrentUser();
return (IdentifiedUser) ctl.getUser();
}
@Override
@@ -308,7 +308,7 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
hooks.doPatchsetCreatedHook(change, patchSet, db);
if (approvals != null && !approvals.isEmpty()) {
hooks.doCommentAddedHook(change,
((IdentifiedUser) refControl.getCurrentUser()).getAccount(),
((IdentifiedUser) refControl.getUser()).getAccount(),
patchSet, null, approvals, db);
}
}

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

@@ -91,7 +91,7 @@ public class ChangeResource implements RestResource, HasETag {
@Override
public String getETag() {
CurrentUser user = control.getCurrentUser();
CurrentUser user = control.getUser();
Hasher h = Hashing.md5().newHasher()
.putBoolean(user.getStarredChanges().contains(getChange().getId()));
prepareETag(h, user);

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Check.java
View File

@@ -47,7 +47,7 @@ public class Check implements RestReadView<ChangeResource>,
ChangeControl ctl = rsrc.getControl();
if (!ctl.isOwner()
&& !ctl.getProjectControl().isOwner()
&& !ctl.getCurrentUser().getCapabilities().canMaintainServer()) {
&& !ctl.getUser().getCapabilities().canMaintainServer()) {
throw new AuthException("Cannot fix change");
}
return Response.withMustRevalidate(newChangeJson().fix(input).format(rsrc));

2
gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
View File

@@ -111,7 +111,7 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
ChangeMessage changeMessage =
new ChangeMessage(new ChangeMessage.Key(rsrc.getChange().getId(),
ChangeUtil.messageUUID(db)),
((IdentifiedUser) control.getCurrentUser()).getAccountId(),
((IdentifiedUser) control.getUser()).getAccountId(),
TimeUtil.nowTs(), rsrc.getChange().currentPatchSetId());
changeMessage.setMessage(msg.toString());
cmUtil.addChangeMessage(db, update, changeMessage);

2
gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java
View File

@@ -57,6 +57,6 @@ public class DraftCommentResource implements RestResource {
}
Account.Id getAuthorId() {
return ((IdentifiedUser) getControl().getCurrentUser()).getAccountId();
return ((IdentifiedUser) getControl().getUser()).getAccountId();
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
View File

@@ -128,7 +128,7 @@ public class EmailReviewComments implements Runnable, RequestContext {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
throw new OutOfScopeException("No user on email thread");
}

2
gerrit-server/src/main/java/com/google/gerrit/server/change/GetRevisionActions.java
View File

@@ -63,7 +63,7 @@ public class GetRevisionActions implements ETagView<RevisionResource> {
@Override
public String getETag(RevisionResource rsrc) {
Hasher h = Hashing.md5().newHasher();
CurrentUser user = rsrc.getControl().getCurrentUser();
CurrentUser user = rsrc.getControl().getUser();
try {
rsrc.getChangeResource().prepareETag(h, user);
h.putBoolean(Submit.wholeTopicEnabled(config));

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java
View File

@@ -47,7 +47,7 @@ public class Index implements RestModifyView<ChangeResource, Input> {
throws IOException, AuthException {
ChangeControl ctl = rsrc.getControl();
if (!ctl.isOwner()
&& !ctl.getCurrentUser().getCapabilities().canMaintainServer()) {
&& !ctl.getUser().getCapabilities().canMaintainServer()) {
throw new AuthException(
"Only change owner or server maintainer can reindex");
}

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

@@ -51,10 +51,10 @@ public class ListChangeDrafts implements RestReadView<ChangeResource> {
@Override
public Map<String, List<CommentInfo>> apply(
ChangeResource rsrc) throws AuthException, OrmException {
if (!rsrc.getControl().getCurrentUser().isIdentifiedUser()) {
if (!rsrc.getControl().getUser().isIdentifiedUser()) {
throw new AuthException("Authentication required");
}
IdentifiedUser user = (IdentifiedUser) rsrc.getControl().getCurrentUser();
IdentifiedUser user = (IdentifiedUser) rsrc.getControl().getUser();
ChangeData cd = changeDataFactory.create(db.get(), rsrc.getControl());
List<PatchLineComment> drafts =
plcUtil.draftByChangeAuthor(db.get(), cd.notes(), user.getAccountId());

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

@@ -145,10 +145,10 @@ public class PatchSetInserter extends BatchUpdate.Op {
}
private static IdentifiedUser checkUser(ChangeControl ctl) {
checkArgument(ctl.getCurrentUser().isIdentifiedUser(),
checkArgument(ctl.getUser().isIdentifiedUser(),
"only IdentifiedUser may create patch set on change %s",
ctl.getChange().getId());
return (IdentifiedUser) ctl.getCurrentUser();
return (IdentifiedUser) ctl.getUser();
}
public PatchSet.Id getPatchSetId() throws IOException {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java
View File

@@ -49,7 +49,7 @@ public class PostHashtags
public Response<ImmutableSortedSet<String>> apply(ChangeResource req,
HashtagsInput input) throws RestApiException, UpdateException {
try (BatchUpdate bu = batchUpdateFactory.create(db.get(),
req.getChange().getProject(), req.getControl().getCurrentUser(),
req.getChange().getProject(), req.getControl().getUser(),
TimeUtil.nowTs())) {
SetHashtagsOp op = hashtagsFactory.create(input);
bu.addOp(req.getChange().getId(), op);

2
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
View File

@@ -175,7 +175,7 @@ public class PostReviewers implements RestModifyView<ChangeResource, AddReviewer
ChangeControl control = rsrc.getControl();
Set<Account> members;
try {
members = groupMembersFactory.create(control.getCurrentUser()).listAccounts(
members = groupMembersFactory.create(control.getUser()).listAccounts(
group.getGroupUUID(), control.getProject().getNameKey());
} catch (NoSuchGroupException e) {
throw new UnprocessableEntityException(e.getMessage());

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

@@ -78,7 +78,7 @@ public class PutTopic implements RestModifyView<ChangeResource, Input>,
Op op = new Op(ctl, input != null ? input : new Input());
try (BatchUpdate u = batchUpdateFactory.create(dbProvider.get(),
req.getChange().getProject(), ctl.getCurrentUser(), TimeUtil.nowTs())) {
req.getChange().getProject(), ctl.getUser(), TimeUtil.nowTs())) {
u.addOp(req.getChange().getId(), op);
u.execute();
}
@@ -97,7 +97,7 @@ public class PutTopic implements RestModifyView<ChangeResource, Input>,
public Op(ChangeControl ctl, Input input) {
this.input = input;
this.caller = (IdentifiedUser) ctl.getCurrentUser();
this.caller = (IdentifiedUser) ctl.getUser();
}
@Override

2
gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChange.java
View File

@@ -120,7 +120,7 @@ public class RebaseChange {
UpdateException, RestApiException {
Change change = rsrc.getChange();
PatchSet patchSet = rsrc.getPatchSet();
IdentifiedUser uploader = (IdentifiedUser) rsrc.getControl().getCurrentUser();
IdentifiedUser uploader = (IdentifiedUser) rsrc.getControl().getUser();
try (ObjectInserter inserter = git.newObjectInserter()) {
String baseRev = newBaseRev;

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java
View File

@@ -88,7 +88,7 @@ public class Restore implements RestModifyView<ChangeResource, RestoreInput>,
Op op = new Op(input);
try (BatchUpdate u = batchUpdateFactory.create(dbProvider.get(),
req.getChange().getProject(), ctl.getCurrentUser(), TimeUtil.nowTs())) {
req.getChange().getProject(), ctl.getUser(), TimeUtil.nowTs())) {
u.addOp(req.getChange().getId(), op).execute();
}
return json.create(ChangeJson.NO_OPTIONS).format(op.change);

2
gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java
View File

@@ -84,7 +84,7 @@ public class RevisionResource implements RestResource, HasETag {
}
IdentifiedUser getUser() {
return (IdentifiedUser) getControl().getCurrentUser();
return (IdentifiedUser) getControl().getUser();
}
RevisionResource doNotCache() {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
View File

@@ -165,7 +165,7 @@ public class Submit implements RestModifyView<RevisionResource, SubmitInput>,
rsrc = onBehalfOf(rsrc, input);
}
ChangeControl control = rsrc.getControl();
IdentifiedUser caller = (IdentifiedUser) control.getCurrentUser();
IdentifiedUser caller = (IdentifiedUser) control.getUser();
Change change = rsrc.getChange();
if (input.onBehalfOf == null && !control.canSubmit()) {
throw new AuthException("submit not permitted");

2
gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
View File

@@ -239,7 +239,7 @@ public class ChangeEditUtil {
}
try (BatchUpdate bu = updateFactory.create(
db.get(), change.getProject(), ctl.getCurrentUser(),
db.get(), change.getProject(), ctl.getUser(),
TimeUtil.nowTs())) {
bu.addOp(change.getId(), inserter
.setDraft(change.getStatus() == Status.DRAFT ||

2
gerrit-server/src/main/java/com/google/gerrit/server/git/EmailMerge.java
View File

@@ -96,7 +96,7 @@ public class EmailMerge implements Runnable, RequestContext {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
throw new OutOfScopeException("No user on email thread");
}

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

@@ -390,7 +390,7 @@ public class ReceiveCommits {
final ChangeEditUtil editUtil,
final BatchUpdate.Factory batchUpdateFactory,
final SetHashtagsOp.Factory hashtagsFactory) throws IOException {
this.currentUser = (IdentifiedUser) projectControl.getCurrentUser();
this.currentUser = (IdentifiedUser) projectControl.getUser();
this.db = db;
this.queryProvider = queryProvider;
this.changeDataFactory = changeDataFactory;
@@ -1809,7 +1809,7 @@ public class ReceiveCommits {
RevisionResource rsrc = new RevisionResource(changes.parse(changeCtl), ps);
try {
mergeOpProvider.get().merge(db, rsrc.getChange(),
(IdentifiedUser) changeCtl.getCurrentUser(), false);
(IdentifiedUser) changeCtl.getUser(), false);
} catch (NoSuchChangeException e) {
throw new OrmException(e);
}

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

@@ -79,8 +79,8 @@ public class VisibleRefFilter extends AbstractAdvertiseRefsHook {
Account.Id currAccountId;
boolean canViewMetadata;
if (projectCtl.getCurrentUser().isIdentifiedUser()) {
IdentifiedUser user = ((IdentifiedUser) projectCtl.getCurrentUser());
if (projectCtl.getUser().isIdentifiedUser()) {
IdentifiedUser user = ((IdentifiedUser) projectCtl.getUser());
currAccountId = user.getAccountId();
canViewMetadata = user.getCapabilities().canAccessDatabase();
} else {

14
gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
View File

@@ -193,7 +193,7 @@ public class CommitValidators {
this.canonicalWebUrl = canonicalWebUrl;
this.installCommitMsgHookCommand = installCommitMsgHookCommand;
this.sshInfo = sshInfo;
this.user = (IdentifiedUser) projectControl.getCurrentUser();
this.user = (IdentifiedUser) projectControl.getUser();
}
@Override
@@ -316,7 +316,7 @@ public class CommitValidators {
@Override
public List<CommitValidationMessage> onCommitReceived(
CommitReceivedEvent receiveEvent) throws CommitValidationException {
IdentifiedUser currentUser = (IdentifiedUser) refControl.getCurrentUser();
IdentifiedUser currentUser = (IdentifiedUser) refControl.getUser();
if (REFS_CONFIG.equals(refControl.getRefName())) {
List<CommitValidationMessage> messages = new LinkedList<>();
@@ -402,7 +402,7 @@ public class CommitValidators {
@Override
public List<CommitValidationMessage> onCommitReceived(
CommitReceivedEvent receiveEvent) throws CommitValidationException {
IdentifiedUser currentUser = (IdentifiedUser) refControl.getCurrentUser();
IdentifiedUser currentUser = (IdentifiedUser) refControl.getUser();
final PersonIdent committer = receiveEvent.commit.getCommitterIdent();
final PersonIdent author = receiveEvent.commit.getAuthorIdent();
final ProjectControl projectControl = refControl.getProjectControl();
@@ -445,7 +445,7 @@ public class CommitValidators {
@Override
public List<CommitValidationMessage> onCommitReceived(
CommitReceivedEvent receiveEvent) throws CommitValidationException {
IdentifiedUser currentUser = (IdentifiedUser) refControl.getCurrentUser();
IdentifiedUser currentUser = (IdentifiedUser) refControl.getUser();
final PersonIdent author = receiveEvent.commit.getAuthorIdent();
if (!currentUser.hasEmailAddress(author.getEmailAddress())
@@ -475,7 +475,7 @@ public class CommitValidators {
@Override
public List<CommitValidationMessage> onCommitReceived(
CommitReceivedEvent receiveEvent) throws CommitValidationException {
IdentifiedUser currentUser = (IdentifiedUser) refControl.getCurrentUser();
IdentifiedUser currentUser = (IdentifiedUser) refControl.getUser();
final PersonIdent committer = receiveEvent.commit.getCommitterIdent();
if (!currentUser.hasEmailAddress(committer.getEmailAddress())
&& !refControl.canForgeCommitter()) {
@@ -560,8 +560,8 @@ public class CommitValidators {
public List<CommitValidationMessage> onCommitReceived(
CommitReceivedEvent receiveEvent) throws CommitValidationException {
if (refControl.getCurrentUser().isIdentifiedUser()) {
IdentifiedUser user = (IdentifiedUser) refControl.getCurrentUser();
if (refControl.getUser().isIdentifiedUser()) {
IdentifiedUser user = (IdentifiedUser) refControl.getUser();
String refname = receiveEvent.refName;
ObjectId old = receiveEvent.commit.getParent(0);

2
gerrit-server/src/main/java/com/google/gerrit/server/group/AddIncludedGroups.java
View File

@@ -101,7 +101,7 @@ public class AddIncludedGroups implements RestModifyView<GroupResource, Input> {
GroupControl control = resource.getControl();
Map<AccountGroup.UUID, AccountGroupById> newIncludedGroups = Maps.newHashMap();
List<GroupInfo> result = Lists.newLinkedList();
Account.Id me = ((IdentifiedUser) control.getCurrentUser()).getAccountId();
Account.Id me = ((IdentifiedUser) control.getUser()).getAccountId();
for (String includedGroup : input.groups) {
GroupDescription.Basic d = groupsCollection.parse(includedGroup);

2
gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeIndexer.java
View File

@@ -231,7 +231,7 @@ public class ChangeIndexer {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
throw new OutOfScopeException("No user during ChangeIndexer");
}
};

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java
View File

@@ -78,7 +78,7 @@ public abstract class AbstractChangeUpdate extends VersionedMetaData {
}
public IdentifiedUser getUser() {
return (IdentifiedUser) ctl.getCurrentUser();
return (IdentifiedUser) ctl.getUser();
}
public PatchSet.Id getPatchSetId() {

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

@@ -93,9 +93,9 @@ public class ChangeDraftUpdate extends AbstractChangeUpdate {
anonymousCowardName, when);
this.draftsProject = allUsers;
this.commentsUtil = commentsUtil;
checkState(ctl.getCurrentUser().isIdentifiedUser(),
checkState(ctl.getUser().isIdentifiedUser(),
"Current user must be identified");
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
IdentifiedUser user = (IdentifiedUser) ctl.getUser();
this.accountId = user.getAccountId();
this.changeNotes = getChangeNotes().load();
this.draftNotes = draftNotesFactory.create(ctl.getChange().getId(),

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java
View File

@@ -314,7 +314,7 @@ public class PatchScriptFactory implements Callable<PatchScript> {
break;
}
final CurrentUser user = control.getCurrentUser();
final CurrentUser user = control.getUser();
if (user.isIdentifiedUser()) {
final Account.Id me = ((IdentifiedUser) user).getAccountId();
switch (changeType) {

30
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
View File

@@ -124,7 +124,7 @@ public class ChangeControl {
}
public ChangeControl forUser(final CurrentUser who) {
if (getCurrentUser().equals(who)) {
if (getUser().equals(who)) {
return this;
}
return new ChangeControl(changeDataFactory,
@@ -135,8 +135,8 @@ public class ChangeControl {
return refControl;
}
public CurrentUser getCurrentUser() {
return getRefControl().getCurrentUser();
public CurrentUser getUser() {
return getRefControl().getUser();
}
public ProjectControl getProjectControl() {
@@ -182,7 +182,7 @@ public class ChangeControl {
return isOwner() // owner (aka creator) of the change can abandon
|| getRefControl().isOwner() // branch owner can abandon
|| getProjectControl().isOwner() // project owner can abandon
|| getCurrentUser().getCapabilities().canAdministrateServer() // site administers are god
|| getUser().getCapabilities().canAdministrateServer() // site administers are god
|| getRefControl().canAbandon() // user can abandon a specific ref
;
}
@@ -252,8 +252,8 @@ public class ChangeControl {
/** Is this user the owner of the change? */
public boolean isOwner() {
if (getCurrentUser().isIdentifiedUser()) {
final IdentifiedUser i = (IdentifiedUser) getCurrentUser();
if (getUser().isIdentifiedUser()) {
final IdentifiedUser i = (IdentifiedUser) getUser();
return i.getAccountId().equals(getChange().getOwner());
}
return false;
@@ -267,9 +267,9 @@ public class ChangeControl {
/** Is this user a reviewer for the change? */
public boolean isReviewer(ReviewDb db, @Nullable ChangeData cd)
throws OrmException {
if (getCurrentUser().isIdentifiedUser()) {
if (getUser().isIdentifiedUser()) {
Collection<Account.Id> results = changeData(db, cd).reviewers().values();
IdentifiedUser user = (IdentifiedUser) getCurrentUser();
IdentifiedUser user = (IdentifiedUser) getUser();
return results.contains(user.getAccountId());
}
return false;
@@ -284,8 +284,8 @@ public class ChangeControl {
if (getChange().getStatus().isOpen()) {
// A user can always remove themselves.
//
if (getCurrentUser().isIdentifiedUser()) {
final IdentifiedUser i = (IdentifiedUser) getCurrentUser();
if (getUser().isIdentifiedUser()) {
final IdentifiedUser i = (IdentifiedUser) getUser();
if (i.getAccountId().equals(reviewer)) {
return true; // can remove self
}
@@ -302,7 +302,7 @@ public class ChangeControl {
if (getRefControl().canRemoveReviewer() // has removal permissions
|| getRefControl().isOwner() // branch owner
|| getProjectControl().isOwner() // project owner
|| getCurrentUser().getCapabilities().canAdministrateServer()) {
|| getUser().getCapabilities().canAdministrateServer()) {
return true;
}
}
@@ -316,7 +316,7 @@ public class ChangeControl {
return isOwner() // owner (aka creator) of the change can edit topic
|| getRefControl().isOwner() // branch owner can edit topic
|| getProjectControl().isOwner() // project owner can edit topic
|| getCurrentUser().getCapabilities().canAdministrateServer() // site administers are god
|| getUser().getCapabilities().canAdministrateServer() // site administers are god
|| getRefControl().canEditTopicName() // user can edit topic on a specific ref
;
} else {
@@ -329,7 +329,7 @@ public class ChangeControl {
return isOwner() // owner (aka creator) of the change can edit hashtags
|| getRefControl().isOwner() // branch owner can edit hashtags
|| getProjectControl().isOwner() // project owner can edit hashtags
|| getCurrentUser().getCapabilities().canAdministrateServer() // site administers are god
|| getUser().getCapabilities().canAdministrateServer() // site administers are god
|| getRefControl().canEditHashtags(); // user can edit hashtag on a specific ref
}
@@ -343,7 +343,7 @@ public class ChangeControl {
private boolean match(String destBranch, String refPattern) {
return RefPatternMatcher.getMatcher(refPattern).match(destBranch,
getCurrentUser().getUserName());
getUser().getUserName());
}
private ChangeData changeData(ReviewDb db, @Nullable ChangeData cd) {
@@ -353,6 +353,6 @@ public class ChangeControl {
public boolean isDraftVisible(ReviewDb db, ChangeData cd)
throws OrmException {
return isOwner() || isReviewer(db, cd) || getRefControl().canViewDrafts()
|| getCurrentUser().isInternalUser();
|| getUser().isInternalUser();
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ConfigInfo.java
View File

@@ -138,7 +138,7 @@ public class ConfigInfo {
actions = Maps.newTreeMap();
for (UiAction.Description d : UiActions.from(
views, new ProjectResource(control),
Providers.of(control.getCurrentUser()))) {
Providers.of(control.getUser()))) {
actions.put(d.getId(), new ActionInfo(d));
}
this.theme = projectState.getTheme();

2
gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java
View File

@@ -100,7 +100,7 @@ class DashboardsCollection implements
throw new ResourceNotFoundException(id);
}
CurrentUser user = myCtl.getCurrentUser();
CurrentUser user = myCtl.getUser();
String ref = parts.get(0);
String path = parts.get(1);
for (ProjectState ps : myCtl.getProjectState().tree()) {

2
gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java
View File

@@ -90,7 +90,7 @@ class GetDashboard implements RestReadView<DashboardResource> {
if ("default".equals(id)) {
throw new ResourceNotFoundException();
} else if (!Strings.isNullOrEmpty(id)) {
ctl = ps.controlFor(ctl.getCurrentUser());
ctl = ps.controlFor(ctl.getUser());
return parse(ctl, id);
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
View File

@@ -185,7 +185,7 @@ public class ListBranches implements RestReadView<ProjectResource> {
for (UiAction.Description d : UiActions.from(
branchViews,
new BranchResource(refControl.getProjectControl(), info),
Providers.of(refControl.getCurrentUser()))) {
Providers.of(refControl.getUser()))) {
if (info.actions == null) {
info.actions = new TreeMap<>();
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java
View File

@@ -58,7 +58,7 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
public List<ProjectInfo> apply(ProjectResource rsrc) {
if (recursive) {
return getChildProjectsRecursively(rsrc.getNameKey(),
rsrc.getControl().getCurrentUser());
rsrc.getControl().getUser());
} else {
return getDirectChildProjects(rsrc.getNameKey());
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java
View File

@@ -64,7 +64,7 @@ class ListDashboards implements RestReadView<ProjectResource> {
List<List<DashboardInfo>> all = Lists.newArrayList();
boolean setDefault = true;
for (ProjectState ps : ctl.getProjectState().tree()) {
ctl = ps.controlFor(ctl.getCurrentUser());
ctl = ps.controlFor(ctl.getUser());
if (ctl.isVisible()) {
List<DashboardInfo> list = scan(ctl, project, setDefault);
for (DashboardInfo d : list) {

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
View File

@@ -231,7 +231,7 @@ public class ProjectControl {
return ctl;
}
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java
View File

@@ -67,7 +67,7 @@ public class PutDescription implements RestModifyView<ProjectResource, PutDescri
}
ProjectControl ctl = resource.getControl();
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
IdentifiedUser user = (IdentifiedUser) ctl.getUser();
if (!ctl.isOwner()) {
throw new AuthException("not project owner");
}

20
gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java
View File

@@ -87,8 +87,8 @@ public class RefControl {
return projectControl;
}
public CurrentUser getCurrentUser() {
return projectControl.getCurrentUser();
public CurrentUser getUser() {
return projectControl.getUser();
}
public RefControl forUser(CurrentUser who) {
@@ -117,7 +117,7 @@ public class RefControl {
public boolean isVisible() {
if (isVisible == null) {
isVisible =
(getCurrentUser().isInternalUser() || canPerform(Permission.READ))
(getUser().isInternalUser() || canPerform(Permission.READ))
&& canRead();
}
return isVisible;
@@ -206,7 +206,7 @@ public class RefControl {
// this why for the AllProjects project we allow administrators to push
// configuration changes if they have push without being project owner.
if (!(projectControl.getProjectState().isAllProjects() &&
getCurrentUser().getCapabilities().canAdministrateServer())) {
getUser().getCapabilities().canAdministrateServer())) {
return false;
}
}
@@ -257,12 +257,12 @@ public class RefControl {
}
boolean owner;
boolean admin;
switch (getCurrentUser().getAccessPath()) {
switch (getUser().getAccessPath()) {
case REST_API:
case JSON_RPC:
case UNKNOWN:
owner = isOwner();
admin = getCurrentUser().getCapabilities().canAdministrateServer();
admin = getUser().getCapabilities().canAdministrateServer();
break;
default:
@@ -302,8 +302,8 @@ public class RefControl {
final PersonIdent tagger = tag.getTaggerIdent();
if (tagger != null) {
boolean valid;
if (getCurrentUser().isIdentifiedUser()) {
final IdentifiedUser user = (IdentifiedUser) getCurrentUser();
if (getUser().isIdentifiedUser()) {
final IdentifiedUser user = (IdentifiedUser) getUser();
final String addr = tagger.getEmailAddress();
valid = user.hasEmailAddress(addr);
} else {
@@ -360,12 +360,12 @@ public class RefControl {
return false;
}
switch (getCurrentUser().getAccessPath()) {
switch (getUser().getAccessPath()) {
case GIT:
return canPushWithForce();
default:
return getCurrentUser().getCapabilities().canAdministrateServer()
return getUser().getCapabilities().canAdministrateServer()
|| (isOwner() && !isForceBlocked(Permission.PUSH))
|| canPushWithForce();
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java
View File

@@ -68,7 +68,7 @@ class SetDefaultDashboard implements RestModifyView<DashboardResource, Input> {
input.id = Strings.emptyToNull(input.id);
ProjectControl ctl = resource.getControl();
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
IdentifiedUser user = (IdentifiedUser) ctl.getUser();
if (!ctl.isOwner()) {
throw new AuthException("not project owner");
}

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

@@ -71,7 +71,7 @@ public class SetParent implements RestModifyView<ProjectResource, Input> {
ResourceNotFoundException, UnprocessableEntityException, IOException {
ProjectControl ctl = rsrc.getControl();
validateParentUpdate(ctl, input.parent, checkIfAdmin);
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
IdentifiedUser user = (IdentifiedUser) ctl.getUser();
try {
MetaDataUpdate md = updateFactory.create(rsrc.getNameKey());
try {
@@ -109,7 +109,7 @@ public class SetParent implements RestModifyView<ProjectResource, Input> {
public void validateParentUpdate(final ProjectControl ctl, String newParent,
boolean checkIfAdmin) throws AuthException, ResourceConflictException,
UnprocessableEntityException {
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
IdentifiedUser user = (IdentifiedUser) ctl.getUser();
if (checkIfAdmin && !user.getCapabilities().canAdministrateServer()) {
throw new AuthException("not administrator");
}

2
gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
View File

@@ -220,7 +220,7 @@ public class SubmitRuleEvaluator {
try {
results = evaluateImpl("locate_submit_rule", "can_submit",
"locate_submit_filter", "filter_submit_results",
control.getCurrentUser());
control.getUser());
} catch (RuleEvalException e) {
return ruleError(e.getMessage(), e);
}

2
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -544,7 +544,7 @@ public class ChangeData {
}
void cacheVisibleTo(ChangeControl ctl) {
visibleTo = ctl.getCurrentUser();
visibleTo = ctl.getUser();
changeControl = ctl;
}

6
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
View File

@@ -275,7 +275,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> {
IdentifiedUser getIdentifiedUser() throws QueryParseException {
try {
CurrentUser u = getCurrentUser();
CurrentUser u = getUser();
if (u.isIdentifiedUser()) {
return (IdentifiedUser) u;
}
@@ -285,7 +285,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> {
}
}
CurrentUser getCurrentUser() throws QueryParseException {
CurrentUser getUser() throws QueryParseException {
try {
return self.get();
} catch (ProvisionException e) {
@@ -679,7 +679,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> {
}
public Predicate<ChangeData> is_visible() throws QueryParseException {
return visibleto(args.getCurrentUser());
return visibleto(args.getUser());
}
@Operator

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

@@ -39,13 +39,13 @@ class IsWatchedByPredicate extends AndPredicate<ChangeData> {
IsWatchedByPredicate(ChangeQueryBuilder.Arguments args,
boolean checkIsVisible) throws QueryParseException {
super(filters(args, checkIsVisible));
this.user = args.getCurrentUser();
this.user = args.getUser();
}
private static List<Predicate<ChangeData>> filters(
ChangeQueryBuilder.Arguments args,
boolean checkIsVisible) throws QueryParseException {
CurrentUser user = args.getCurrentUser();
CurrentUser user = args.getUser();
List<Predicate<ChangeData>> r = Lists.newArrayList();
ChangeQueryBuilder builder = new ChangeQueryBuilder(args);
for (AccountProjectWatch w : user.getNotificationFilters()) {

2
gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java
View File

@@ -37,7 +37,7 @@ public class FallbackRequestContext implements RequestContext {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/util/ManualRequestContext.java
View File

@@ -40,7 +40,7 @@ public class ManualRequestContext implements RequestContext, AutoCloseable {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/util/PluginRequestContext.java
View File

@@ -29,7 +29,7 @@ public class PluginRequestContext implements RequestContext {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/util/RequestContext.java
View File

@@ -23,6 +23,6 @@ import com.google.inject.Provider;
* by the GerritGlobalModule scope.
*/
public interface RequestContext {
CurrentUser getCurrentUser();
CurrentUser getUser();
Provider<ReviewDb> getReviewDbProvider();
}

4
gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java
View File

@@ -188,8 +188,8 @@ public abstract class RequestScopePropagator {
public T call() throws Exception {
RequestContext old = local.setContext(new RequestContext() {
@Override
public CurrentUser getCurrentUser() {
return context.getCurrentUser();
public CurrentUser getUser() {
return context.getUser();
}
@Override

2
gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java
View File

@@ -31,7 +31,7 @@ public class ServerRequestContext implements RequestContext {
}
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return user;
}

2
gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
View File

@@ -53,7 +53,7 @@ public class ThreadLocalRequestContext {
@Provides
CurrentUser provideCurrentUser(RequestContext ctx) {
return ctx.getCurrentUser();
return ctx.getUser();
}
@Provides

2
gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java
View File

@@ -204,7 +204,7 @@ public class CommentsTest {
@Provides
@Singleton
CurrentUser getCurrentUser(IdentifiedUser.GenericFactory userFactory) {
CurrentUser getUser(IdentifiedUser.GenericFactory userFactory) {
return userFactory.create(ownerId);
}
};

2
gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -166,7 +166,7 @@ public abstract class AbstractQueryChangesTest {
userFactory.create(Providers.of(db), requestUserId);
return new RequestContext() {
@Override
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return requestUser;
}

2
gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java
View File

@@ -104,7 +104,7 @@ public class TestChanges {
IdentifiedUser user) throws OrmException {
ChangeControl ctl = EasyMock.createNiceMock(ChangeControl.class);
expect(ctl.getChange()).andStubReturn(c);
expect(ctl.getCurrentUser()).andStubReturn(user);
expect(ctl.getUser()).andStubReturn(user);
ChangeNotes notes = new ChangeNotes(repoManager, migration, allUsers, c)
.load();
expect(ctl.getNotes()).andStubReturn(notes);

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
View File

@@ -99,7 +99,7 @@ class DatabasePubKeyAuth implements PublickeyAuthenticator {
public boolean authenticate(String username, PublicKey suppliedKey,
ServerSession session) {
SshSession sd = session.getAttribute(SshSession.KEY);
Preconditions.checkState(sd.getCurrentUser() == null);
Preconditions.checkState(sd.getUser() == null);
if (PeerDaemonUser.USER_NAME.equals(username)) {
if (myHostKeys.contains(suppliedKey)
|| getPeerKeys().contains(suppliedKey)) {

4
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
View File

@@ -203,7 +203,7 @@ class SshLog implements LifecycleListener {
private LoggingEvent log(final String msg) {
final SshSession sd = session.get();
final CurrentUser user = sd.getCurrentUser();
final CurrentUser user = sd.getUser();
final LoggingEvent event = new LoggingEvent( //
Logger.class.getName(), // fqnOfCategoryClass
@@ -261,7 +261,7 @@ class SshLog implements LifecycleListener {
} else {
SshSession session = ctx.getSession();
sessionId = IdGenerator.format(session.getSessionId());
currentUser = session.getCurrentUser();
currentUser = session.getUser();
created = ctx.created;
}
auditService.dispatch(new SshAuditEvent(sessionId, currentUser,

4
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
View File

@@ -80,8 +80,8 @@ public class SshScope {
}
@Override
public CurrentUser getCurrentUser() {
final CurrentUser user = session.getCurrentUser();
public CurrentUser getUser() {
final CurrentUser user = session.getUser();
if (user != null && user.isIdentifiedUser()) {
IdentifiedUser identifiedUser = userFactory.create(((IdentifiedUser) user).getAccountId());
identifiedUser.setAccessPath(user.getAccessPath());

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java
View File

@@ -60,7 +60,7 @@ public class SshSession {
}
/** Identity of the authenticated user account on the socket. */
public CurrentUser getCurrentUser() {
public CurrentUser getUser() {
return identity;
}

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java
View File

@@ -121,7 +121,7 @@ public class SshUtil {
public static boolean success(final String username, final ServerSession session,
final SshScope sshScope, final SshLog sshLog,
final SshSession sd, final CurrentUser user) {
if (sd.getCurrentUser() == null) {
if (sd.getUser() == null) {
sd.authenticationSuccess(username, user);
// If this is the first time we've authenticated this

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java
View File

@@ -179,7 +179,7 @@ final class ShowConnections extends SshCommand {
return "";
}
final CurrentUser user = sd.getCurrentUser();
final CurrentUser user = sd.getUser();
if (user != null && user.isIdentifiedUser()) {
IdentifiedUser u = (IdentifiedUser) user;

2
plugins/replication

Submodule plugins/replication updated: efa3c6abaa...32e84b1b61