commit 492b4e01634aa5df858ea29abd279fe829d83b8c
author Edwin Kempin <ekempin@google.com> Mon Oct 19 13:29:12 2020 +0200
committer Edwin Kempin <ekempin@google.com> Mon Oct 19 16:37:51 2020 +0200
tree 195bf5be53fd48f5d993e3b932b15f1c21338970
parent b0b5f7720f6c3ca9d04d2efbd794145edb3f54bb

Use provider to inject current user into CheckCodeOwnerConfigFiles singleton

If current user is directly injected into a singleton, the user is never
updated after the instance was created.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Id32e4a1131743bc40e4cf7d7eefc214cd7a4eb4a

java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java

diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java
index ff75b43..fac3c36 100644
--- a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java
+++ b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java
@@ -69,7 +69,7 @@
     implements RestModifyView<ProjectResource, CheckCodeOwnerConfigFilesInput> {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
-  private final CurrentUser currentUser;
+  private final Provider<CurrentUser> currentUser;
   private final PermissionBackend permissionBackend;
   private final Provider<ListBranches> listBranches;
   private final CodeOwnersPluginConfiguration codeOwnersPluginConfiguration;
@@ -78,7 +78,7 @@
 
   @Inject
   public CheckCodeOwnerConfigFiles(
-      CurrentUser currentUser,
+      Provider<CurrentUser> currentUser,
       PermissionBackend permissionBackend,
       Provider<ListBranches> listBranches,
       CodeOwnersPluginConfiguration codeOwnersPluginConfiguration,
@@ -96,7 +96,7 @@
   public Response<Map<String, Map<String, List<ConsistencyProblemInfo>>>> apply(
       ProjectResource projectResource, CheckCodeOwnerConfigFilesInput input)
       throws RestApiException, PermissionBackendException, IOException {
-    if (!currentUser.isIdentifiedUser()) {
+    if (!currentUser.get().isIdentifiedUser()) {
       throw new AuthException("Authentication required");
     }
 
@@ -164,7 +164,8 @@
   private ImmutableList<ConsistencyProblemInfo> checkCodeOwnerConfig(
       CodeOwnerBackend codeOwnerBackend, CodeOwnerConfig codeOwnerConfig) {
     return codeOwnerConfigValidator
-        .validateCodeOwnerConfig(currentUser.asIdentifiedUser(), codeOwnerBackend, codeOwnerConfig)
+        .validateCodeOwnerConfig(
+            currentUser.get().asIdentifiedUser(), codeOwnerBackend, codeOwnerConfig)
         .map(CheckCodeOwnerConfigFiles::createConsistencyProblemInfo)
         .filter(Optional::isPresent)
         .map(Optional::get)