diff options
| -rw-r--r-- | java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java b/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java index a66c43ae4a..bb10de5789 100644 --- a/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java +++ b/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java @@ -44,9 +44,8 @@ public class ChangeIsVisibleToPredicate extends IsVisibleToPredicate<ChangeData> protected final ChangeNotes.Factory notesFactory; protected final CurrentUser user; - protected final PermissionBackend permissionBackend; protected final ProjectCache projectCache; - private final Provider<AnonymousUser> anonymousUserProvider; + private final PermissionBackend.WithUser withUser; @Inject public ChangeIsVisibleToPredicate( @@ -58,9 +57,14 @@ public class ChangeIsVisibleToPredicate extends IsVisibleToPredicate<ChangeData> super(ChangeQueryBuilder.FIELD_VISIBLETO, IndexUtils.describe(user)); this.notesFactory = notesFactory; this.user = user; - this.permissionBackend = permissionBackend; this.projectCache = projectCache; - this.anonymousUserProvider = anonymousUserProvider; + withUser = + user.isIdentifiedUser() + ? permissionBackend.absentUser(user.getAccountId()) + : permissionBackend.user( + Optional.of(user) + .filter(u -> u instanceof GroupBackedUser || u instanceof InternalUser) + .orElseGet(anonymousUserProvider::get)); } @Override @@ -79,17 +83,10 @@ public class ChangeIsVisibleToPredicate extends IsVisibleToPredicate<ChangeData> return false; } if (!projectState.get().statePermitsRead()) { - logger.atFine().log("Filter out change %s of non-reabable project %s", cd, cd.project()); + logger.atFine().log("Filter out change %s of non-readable project %s", cd, cd.project()); return false; } - PermissionBackend.WithUser withUser = - user.isIdentifiedUser() - ? permissionBackend.absentUser(user.getAccountId()) - : permissionBackend.user( - Optional.of(user) - .filter(u -> u instanceof GroupBackedUser || u instanceof InternalUser) - .orElseGet(anonymousUserProvider::get)); try { withUser.change(cd).check(ChangePermission.READ); } catch (PermissionBackendException e) { |