Adjust to updated EventDispatcher interface

Change-Id: Ie3444b513988d70684f45f9155a9daae331cb898

4 files changed, 10 insertions, 29 deletions

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/OnStartStop.java b/src/main/java/com/googlesource/gerrit/plugins/replication/OnStartStop.java
index 5accf95..cad7bdd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/OnStartStop.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/OnStartStop.java
@@ -19,8 +19,6 @@ import com.google.gerrit.common.EventDispatcher;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gerrit.extensions.registration.DynamicItem;
 import com.google.gerrit.extensions.systemstatus.ServerInformation;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gwtorm.server.SchemaFactory;
 import com.google.inject.Inject;
 
 import com.googlesource.gerrit.plugins.replication.PushResultProcessing.GitUpdateProcessing;
@@ -36,7 +34,6 @@ public class OnStartStop implements LifecycleListener {
   private final ReplicationQueue queue;
   private final ReplicationConfig config;
   private final DynamicItem<EventDispatcher> eventDispatcher;
-  private final SchemaFactory<ReviewDb> database;
 
   @Inject
   protected OnStartStop(
@@ -44,14 +41,12 @@ public class OnStartStop implements LifecycleListener {
       PushAll.Factory pushAll,
       ReplicationQueue queue,
       ReplicationConfig config,
-      DynamicItem<EventDispatcher> eventDispatcher,
-      SchemaFactory<ReviewDb> database) {
+      DynamicItem<EventDispatcher> eventDispatcher) {
     this.srvInfo = srvInfo;
     this.pushAll = pushAll;
     this.queue = queue;
     this.config = config;
     this.eventDispatcher = eventDispatcher;
-    this.database = database;
     this.pushAllFuture = Atomics.newReference();
   }
 
@@ -62,7 +57,7 @@ public class OnStartStop implements LifecycleListener {
     if (srvInfo.getState() == ServerInformation.State.STARTUP
         && config.isReplicateAllOnPluginStart()) {
       ReplicationState state = new ReplicationState(
-          new GitUpdateProcessing(eventDispatcher.get(), database));
+          new GitUpdateProcessing(eventDispatcher.get()));
       pushAllFuture.set(pushAll.create(
           null, ReplicationFilter.all(), state).schedule(30, TimeUnit.SECONDS));
     }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
index 4a84d89..6717660 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushResultProcessing.java
@@ -15,10 +15,8 @@
 package com.googlesource.gerrit.plugins.replication;
 
 import com.google.gerrit.common.EventDispatcher;
-import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.events.RefEvent;
 import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
 
 import com.googlesource.gerrit.plugins.replication.ReplicationState.RefPushResult;
 
@@ -158,12 +156,9 @@ public abstract class PushResultProcessing {
     static final Logger log = LoggerFactory.getLogger(GitUpdateProcessing.class);
 
     private final EventDispatcher dispatcher;
-    private final SchemaFactory<ReviewDb> schema;
 
-    public GitUpdateProcessing(EventDispatcher dispatcher,
-        SchemaFactory<ReviewDb> schema) {
+    public GitUpdateProcessing(EventDispatcher dispatcher) {
       this.dispatcher = dispatcher;
-      this.schema = schema;
     }
 
     @Override
@@ -183,8 +178,8 @@ public abstract class PushResultProcessing {
     }
 
     private void postEvent(RefEvent event) {
-      try (ReviewDb db = schema.open()) {
-        dispatcher.postEvent(event, db);
+      try {
+        dispatcher.postEvent(event);
       } catch (OrmException e) {
         log.error("Cannot post event", e);
       }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
index 223424b..ba8e9cc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
@@ -23,9 +23,7 @@ import com.google.gerrit.extensions.events.NewProjectCreatedListener;
 import com.google.gerrit.extensions.events.ProjectDeletedListener;
 import com.google.gerrit.extensions.registration.DynamicItem;
 import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.git.WorkQueue;
-import com.google.gwtorm.server.SchemaFactory;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
@@ -80,7 +78,6 @@ public class ReplicationQueue implements
   }
 
   private final WorkQueue workQueue;
-  private final SchemaFactory<ReviewDb> database;
   private final DynamicItem<EventDispatcher> dispatcher;
   private final ReplicationConfig config;
   private final Provider<SshSessionFactory> sshSessionFactoryProvider;
@@ -89,12 +86,10 @@ public class ReplicationQueue implements
   @Inject
   ReplicationQueue(WorkQueue wq,
       ReplicationConfig rc,
-      SchemaFactory<ReviewDb> db,
       DynamicItem<EventDispatcher> dis,
       ReplicationStateListener sl,
       Provider<SshSessionFactory> sshSessionFactoryProvider) {
     workQueue = wq;
-    database = db;
     dispatcher = dis;
     config = rc;
     stateLog = sl;
@@ -137,7 +132,7 @@ public class ReplicationQueue implements
   @Override
   public void onGitReferenceUpdated(GitReferenceUpdatedListener.Event event) {
     ReplicationState state =
-        new ReplicationState(new GitUpdateProcessing(dispatcher.get(), database));
+        new ReplicationState(new GitUpdateProcessing(dispatcher.get()));
     if (!running) {
       stateLog.warn("Replication plugin did not finish startup before event", state);
       return;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java
index 2395efe..4cbac3a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/GitUpdateProcessingTest.java
@@ -14,7 +14,6 @@
 
 package com.googlesource.gerrit.plugins.replication;
 
-import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
@@ -59,7 +58,7 @@ public class GitUpdateProcessingTest extends TestCase {
     SchemaFactory<ReviewDb> schemaMock = createMock(SchemaFactory.class);
     expect(schemaMock.open()).andReturn(reviewDbMock).anyTimes();
     replay(schemaMock);
-    gitUpdateProcessing = new GitUpdateProcessing(dispatcherMock, schemaMock);
+    gitUpdateProcessing = new GitUpdateProcessing(dispatcherMock);
   }
 
   public void testHeadRefReplicated() throws URISyntaxException, OrmException {
@@ -67,8 +66,7 @@ public class GitUpdateProcessingTest extends TestCase {
     RefReplicatedEvent expectedEvent =
         new RefReplicatedEvent("someProject", "refs/heads/master", "someHost",
             RefPushResult.SUCCEEDED, RemoteRefUpdate.Status.OK);
-    dispatcherMock.postEvent(RefReplicatedEventEquals.eqEvent(expectedEvent),
-        anyObject(ReviewDb.class));
+    dispatcherMock.postEvent(RefReplicatedEventEquals.eqEvent(expectedEvent));
     expectLastCall().once();
     replay(dispatcherMock);
 
@@ -83,8 +81,7 @@ public class GitUpdateProcessingTest extends TestCase {
     RefReplicatedEvent expectedEvent =
         new RefReplicatedEvent("someProject", "refs/changes/01/1/1", "someHost",
             RefPushResult.FAILED, RemoteRefUpdate.Status.REJECTED_NONFASTFORWARD);
-    dispatcherMock.postEvent(RefReplicatedEventEquals.eqEvent(expectedEvent),
-        anyObject(ReviewDb.class));
+    dispatcherMock.postEvent(RefReplicatedEventEquals.eqEvent(expectedEvent));
     expectLastCall().once();
     replay(dispatcherMock);
 
@@ -99,8 +96,7 @@ public class GitUpdateProcessingTest extends TestCase {
     RefReplicationDoneEvent expectedDoneEvent =
         new RefReplicationDoneEvent("someProject", "refs/heads/master", 5);
     dispatcherMock.postEvent(
-        RefReplicationDoneEventEquals.eqEvent(expectedDoneEvent),
-        anyObject(ReviewDb.class));
+        RefReplicationDoneEventEquals.eqEvent(expectedDoneEvent));
     expectLastCall().once();
     replay(dispatcherMock);