commit 521c0e59e22efa0f436964560ab9e25f24e7dd9f
author David Pursehouse <dpursehouse@collab.net> Thu Oct 17 16:09:07 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Oct 29 10:56:13 2019 +0900
tree 26faf64b95f8c010b2b868bbb737793a6e9aeab7
parent 39a8bfccf1c6b95c78339088761083c8e94a5496

Adjust to latest Gerrit master

- Rename reviewdb package to entities
- Instantiate Project.NameKey with static factory method
- Adjust to changed PermissionBackend.user API

Change-Id: I90c756356e11a8644d6f679cd269f5ac12051e31

src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserModel.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserModel.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserModel.java
index d33c48b..fe9565c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserModel.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserModel.java
@@ -20,7 +20,7 @@
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.StringUtils;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
+import com.google.gerrit.entities.Project;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.permissions.PermissionBackend;
 import com.google.gerrit.server.permissions.PermissionBackend.ForProject;
@@ -75,8 +75,8 @@
   @Override
   public boolean canView(RepositoryModel repository, String ref) {
     return permissionBackend
-        .user(userProvider)
-        .project(new NameKey(StringUtils.stripDotGit(repository.name)))
+        .user(userProvider.get())
+        .project(Project.nameKey(StringUtils.stripDotGit(repository.name)))
         .ref(ref)
         .testOrFalse(RefPermission.READ);
   }
@@ -88,8 +88,8 @@
       AccessPermission requirePermission) {
     ForProject projectPermissions =
         permissionBackend
-            .user(userProvider)
-            .project(new NameKey(StringUtils.stripDotGit(repository.name)));
+            .user(userProvider.get())
+            .project(Project.nameKey(StringUtils.stripDotGit(repository.name)));
     switch (ifRestriction) {
       case VIEW:
         return projectPermissions.testOrFalse(ProjectPermission.ACCESS);
@@ -105,8 +105,8 @@
   @Override
   public boolean hasRepositoryPermission(String name) {
     return permissionBackend
-        .user(userProvider)
-        .project(new NameKey(StringUtils.stripDotGit(name)))
+        .user(userProvider.get())
+        .project(Project.nameKey(StringUtils.stripDotGit(name)))
         .testOrFalse(ProjectPermission.ACCESS);
   }