commit f57f0297e330660eb699d237cb587d7cc2c0e6b1
author Patrick Hiesel <hiesel@google.com> Wed Feb 07 12:52:02 2018 +0100
committer Patrick Hiesel <hiesel@google.com> Wed Feb 07 12:52:02 2018 +0100
tree 60eedeb501fa46aefa1b7c3af001b47cdfdcd803
parent 81a34e608c97e9ac6aa7b2678fca96427e212413

Adapt plugin to new RefFilter interface

Change-Id: Id59bdb81ead2222e8ed1eecb35b786486f669e93

src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index 80be8c9..a7fe840 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -32,9 +32,9 @@
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.PerThreadRequestScope;
 import com.google.gerrit.server.git.ProjectRunnable;
-import com.google.gerrit.server.git.VisibleRefFilter;
 import com.google.gerrit.server.git.WorkQueue.CanceledWhileRunning;
 import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.PermissionBackend.RefFilterOptions;
 import com.google.gerrit.server.permissions.PermissionBackendException;
 import com.google.gerrit.server.permissions.ProjectPermission;
 import com.google.gerrit.server.project.ProjectCache;
@@ -96,7 +96,6 @@
   private final RemoteConfig config;
   private final CredentialsProvider credentialsProvider;
   private final PerThreadRequestScope.Scoper threadScoper;
-  private final VisibleRefFilter.Factory refFilterFactory;
   private final ReplicationQueue replicationQueue;
 
   private final Project.NameKey projectName;
@@ -124,7 +123,6 @@
       PermissionBackend permissionBackend,
       Destination p,
       RemoteConfig c,
-      VisibleRefFilter.Factory rff,
       CredentialsFactory cpFactory,
       PerThreadRequestScope.Scoper ts,
       ReplicationQueue rq,
@@ -139,7 +137,6 @@
     this.permissionBackend = permissionBackend;
     pool = p;
     config = c;
-    refFilterFactory = rff;
     credentialsProvider = cpFactory.create(c.getName());
     threadScoper = ts;
     replicationQueue = rq;
@@ -483,8 +480,9 @@
 
     Map<String, Ref> local = git.getAllRefs();
     boolean filter;
+    PermissionBackend.ForProject forProject = permissionBackend.user(userProvider).project(projectName);
     try {
-      permissionBackend.user(userProvider).project(projectName).check(ProjectPermission.READ);
+      forProject.check(ProjectPermission.READ);
       filter = false;
     } catch (AuthException e) {
       filter = true;
@@ -503,7 +501,7 @@
         }
         local = n;
       }
-      local = refFilterFactory.create(projectState, git).filter(local, true);
+      local = forProject.filter(local, git, RefFilterOptions.builder().setFilterMeta(true).build());
     }
 
     return pushAllRefs ? doPushAll(tn, local) : doPushDelta(local);