Merge "Don't store PersonIdent in singleton classes"

java/com/google/gerrit/server/StarredChangesUtil.java

@@ -166,7 +166,7 @@ public class StarredChangesUtil {
   private final GitReferenceUpdated gitRefUpdated;
   private final AllUsersName allUsers;
   private final Provider<ReviewDb> dbProvider;
-  private final PersonIdent serverIdent;
+  private final Provider<PersonIdent> serverIdent;
   private final ChangeIndexer indexer;
   private final Provider<InternalChangeQuery> queryProvider;
 
@@ -176,7 +176,7 @@ public class StarredChangesUtil {
       GitReferenceUpdated gitRefUpdated,
       AllUsersName allUsers,
       Provider<ReviewDb> dbProvider,
-      @GerritPersonIdent PersonIdent serverIdent,
+      @GerritPersonIdent Provider<PersonIdent> serverIdent,
       ChangeIndexer indexer,
       Provider<InternalChangeQuery> queryProvider) {
     this.repoManager = repoManager;
@@ -241,7 +241,7 @@ public class StarredChangesUtil {
         RevWalk rw = new RevWalk(repo)) {
       BatchRefUpdate batchUpdate = repo.getRefDatabase().newBatchUpdate();
       batchUpdate.setAllowNonFastForwards(true);
-      batchUpdate.setRefLogIdent(serverIdent);
+      batchUpdate.setRefLogIdent(serverIdent.get());
       batchUpdate.setRefLogMessage("Unstar change " + changeId.get(), true);
       for (Account.Id accountId : byChangeFromIndex(changeId).keySet()) {
         String refName = RefNames.refsStarredChanges(changeId, accountId);
@@ -453,7 +453,7 @@ public class StarredChangesUtil {
       u.setExpectedOldObjectId(oldObjectId);
       u.setForceUpdate(true);
       u.setNewObjectId(writeLabels(repo, labels));
-      u.setRefLogIdent(serverIdent);
+      u.setRefLogIdent(serverIdent.get());
       u.setRefLogMessage("Update star labels", true);
       RefUpdate.Result result = u.update(rw);
       switch (result) {
@@ -488,7 +488,7 @@ public class StarredChangesUtil {
     RefUpdate u = repo.updateRef(refName);
     u.setForceUpdate(true);
     u.setExpectedOldObjectId(oldObjectId);
-    u.setRefLogIdent(serverIdent);
+    u.setRefLogIdent(serverIdent.get());
     u.setRefLogMessage("Unstar change", true);
     RefUpdate.Result result = u.delete();
     switch (result) {

java/com/google/gerrit/server/events/EventFactory.java

@@ -90,7 +90,7 @@ public class EventFactory {
   private final Emails emails;
   private final Provider<String> urlProvider;
   private final PatchListCache patchListCache;
-  private final PersonIdent myIdent;
+  private final Provider<PersonIdent> myIdent;
   private final ChangeData.Factory changeDataFactory;
   private final ApprovalsUtil approvalsUtil;
   private final ChangeKindCache changeKindCache;
@@ -104,7 +104,7 @@ public class EventFactory {
       Emails emails,
       @CanonicalWebUrl @Nullable Provider<String> urlProvider,
       PatchListCache patchListCache,
-      @GerritPersonIdent PersonIdent myIdent,
+      @GerritPersonIdent Provider<PersonIdent> myIdent,
       ChangeData.Factory changeDataFactory,
       ApprovalsUtil approvalsUtil,
       ChangeKindCache changeKindCache,
@@ -664,7 +664,7 @@ public class EventFactory {
     a.reviewer =
         message.getAuthor() != null
             ? asAccountAttribute(message.getAuthor())
-            : asAccountAttribute(myIdent);
+            : asAccountAttribute(myIdent.get());
     a.message = message.getMessage();
     return a;
   }

java/com/google/gerrit/server/restapi/change/Revert.java

@@ -101,7 +101,7 @@ public class Revert extends RetryingRestModifyView<ChangeResource, RevertInput,
   private final PatchSetUtil psUtil;
   private final RevertedSender.Factory revertedSenderFactory;
   private final ChangeJson.Factory json;
-  private final PersonIdent serverIdent;
+  private final Provider<PersonIdent> serverIdent;
   private final ApprovalsUtil approvalsUtil;
   private final ChangeReverted changeReverted;
   private final ContributorAgreementsChecker contributorAgreements;
@@ -120,7 +120,7 @@ public class Revert extends RetryingRestModifyView<ChangeResource, RevertInput,
       PatchSetUtil psUtil,
       RevertedSender.Factory revertedSenderFactory,
       ChangeJson.Factory json,
-      @GerritPersonIdent PersonIdent serverIdent,
+      @GerritPersonIdent Provider<PersonIdent> serverIdent,
       ApprovalsUtil approvalsUtil,
       ChangeReverted changeReverted,
       ContributorAgreementsChecker contributorAgreements,
@@ -185,7 +185,7 @@ public class Revert extends RetryingRestModifyView<ChangeResource, RevertInput,
       }
 
       Timestamp now = TimeUtil.nowTs();
-      PersonIdent committerIdent = new PersonIdent(serverIdent, now);
+      PersonIdent committerIdent = serverIdent.get();
       PersonIdent authorIdent =
           user.asIdentifiedUser().newCommitterIdent(now, committerIdent.getTimeZone());