commit fed5f4ca0fbf7b7ad910b40ac116244980e064c7
author David Pursehouse <dpursehouse@collab.net> Tue Mar 06 16:21:16 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Mar 06 16:21:19 2018 +0900
tree 78ffe0820030235ecd166058253c72159d2365a1
parent 8dec0d653ae6e5aecfe0d67a0b78ffd07e57b64f

BatchProgramModule: Bind GitReferenceUpdated.DISABLED

Bind in BatchProgramModule instead of in Reindex and MigrateToNoteDb
programs.

Change-Id: I61edfb33af1b94a48365f8fb1c94203329ee5943

gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
index 2340a97..22fdb2c 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
@@ -29,7 +29,6 @@
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.change.ChangeResource;
-import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.index.DummyIndexModule;
 import com.google.gerrit.server.index.change.ChangeSchemaDefinitions;
 import com.google.gerrit.server.notedb.rebuild.NoteDbMigrator;
@@ -189,7 +188,6 @@
           @Override
           public void configure() {
             install(dbInjector.getInstance(BatchProgramModule.class));
-            bind(GitReferenceUpdated.class).toInstance(GitReferenceUpdated.DISABLED);
             install(new DummyIndexModule());
             factory(ChangeResource.Factory.class);
           }

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
index d8451d5..bee9928 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
@@ -32,7 +32,6 @@
 import com.google.gerrit.pgm.util.ThreadLimiter;
 import com.google.gerrit.server.change.ChangeResource;
 import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.index.IndexModule;
 import com.google.gerrit.server.index.IndexModule.IndexType;
 import com.google.gerrit.server.index.change.ChangeSchemaDefinitions;
@@ -171,7 +170,6 @@
           @Override
           protected void configure() {
             factory(ChangeResource.Factory.class);
-            bind(GitReferenceUpdated.class).toInstance(GitReferenceUpdated.DISABLED);
           }
         });
 

gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java
index 32d8dd8..9e5723d 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java
@@ -52,6 +52,7 @@
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.GitReceivePackGroups;
 import com.google.gerrit.server.config.GitUploadPackGroups;
+import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.git.MergeUtil;
 import com.google.gerrit.server.git.SearchingChangeCacheImpl;
 import com.google.gerrit.server.git.TagCache;
@@ -172,5 +173,6 @@
 
     bind(ChangeJson.Factory.class).toProvider(Providers.<ChangeJson.Factory>of(null));
     bind(AccountVisibility.class).toProvider(AccountVisibilityProvider.class).in(SINGLETON);
+    bind(GitReferenceUpdated.class).toInstance(GitReferenceUpdated.DISABLED);
   }
 }