Update to build against gerrit master

Bumped version.
Bumped used gerrit API version.
Implemented required getReviewDbProvider for RequestContext.
Injected required ChangeCache.
Dropped no longer allowed git access path setting.

Change-Id: I90ff9cb4a40466ab345f5729fdb034bebe81e3b8

4 files changed, 18 insertions, 6 deletions

diff --git a/pom.xml b/pom.xml
index 77afeb5..6c41dd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@ limitations under the License.
   <groupId>com.googlesource.gerrit.plugins.replication</groupId>
   <artifactId>replication</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>1.1-SNAPSHOT</version>
 
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>2.5</Gerrit-ApiVersion>
+    <Gerrit-ApiVersion>2.6-SNAPSHOT</Gerrit-ApiVersion>
   </properties>
 
   <build>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
index a52050e..f889d1a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -28,6 +28,7 @@ import com.google.gerrit.server.account.GroupBackend;
 import com.google.gerrit.server.account.GroupBackends;
 import com.google.gerrit.server.account.ListGroupMembership;
 import com.google.gerrit.server.config.FactoryModule;
+import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.PerThreadRequestScope;
 import com.google.gerrit.server.git.WorkQueue;
@@ -37,6 +38,7 @@ import com.google.gerrit.server.project.ProjectControl;
 import com.google.gerrit.server.util.RequestContext;
 import com.google.gwtorm.server.SchemaFactory;
 import com.google.inject.Injector;
+import com.google.inject.Provider;
 import com.google.inject.Provides;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import com.google.inject.servlet.RequestScoped;
@@ -129,12 +131,18 @@ class Destination {
 
       @Provides
       public PerThreadRequestScope.Scoper provideScoper(
-          final PerThreadRequestScope.Propagator propagator) {
+          final PerThreadRequestScope.Propagator propagator,
+          final Provider<RequestScopedReviewDbProvider> dbProvider) {
         final RequestContext requestContext = new RequestContext() {
           @Override
           public CurrentUser getCurrentUser() {
             return remoteUser;
           }
+
+          @Override
+          public Provider<ReviewDb> getReviewDbProvider() {
+            return dbProvider.get();
+          }
         };
         return new PerThreadRequestScope.Scoper() {
           @Override
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 1ba4036..bb2d7b1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -21,6 +21,7 @@ import com.google.common.collect.Sets;
 import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.git.ChangeCache;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.PerThreadRequestScope;
 import com.google.gerrit.server.git.ProjectRunnable;
@@ -81,6 +82,7 @@ class PushOne implements ProjectRunnable {
   private final CredentialsProvider credentialsProvider;
   private final TagCache tagCache;
   private final PerThreadRequestScope.Scoper threadScoper;
+  private final ChangeCache changeCache;
 
   private final Project.NameKey projectName;
   private final URIish uri;
@@ -98,6 +100,7 @@ class PushOne implements ProjectRunnable {
       final SecureCredentialsFactory cpFactory,
       final TagCache tc,
       final PerThreadRequestScope.Scoper ts,
+      final ChangeCache cc,
       @Assisted final Project.NameKey d,
       @Assisted final URIish u) {
     gitManager = grm;
@@ -107,6 +110,7 @@ class PushOne implements ProjectRunnable {
     credentialsProvider = cpFactory.create(c.getName());
     tagCache = tc;
     threadScoper = ts;
+    changeCache = cc;
     projectName = d;
     uri = u;
   }
@@ -332,7 +336,8 @@ class PushOne implements ProjectRunnable {
         return Collections.emptyList();
       }
       try {
-        local = new VisibleRefFilter(tagCache, git, pc, db, true).filter(local, true);
+        local = new VisibleRefFilter(tagCache, changeCache, git, pc, db, true)
+            .filter(local, true);
       } finally {
         db.close();
       }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/RemoteSiteUser.java b/src/main/java/com/googlesource/gerrit/plugins/replication/RemoteSiteUser.java
index 22887e1..f9aa668 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/RemoteSiteUser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/RemoteSiteUser.java
@@ -16,7 +16,6 @@ package com.googlesource.gerrit.plugins.replication;
 
 import com.google.gerrit.reviewdb.client.AccountProjectWatch;
 import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.server.AccessPath;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.account.CapabilityControl;
 import com.google.gerrit.server.account.GroupMembership;
@@ -37,7 +36,7 @@ class RemoteSiteUser extends CurrentUser {
   @Inject
   RemoteSiteUser(CapabilityControl.Factory capabilityControlFactory,
       @Assisted GroupMembership authGroups) {
-    super(capabilityControlFactory, AccessPath.GIT);
+    super(capabilityControlFactory);
     effectiveGroups = authGroups;
   }