From e426eb163ccc343a24a5e55574fb46a37fe35484 Mon Sep 17 00:00:00 2001
From: Gustaf Lundh <gustaf.lundh@sonymobile.com>
Date: Tue, 8 Jan 2013 15:57:00 +0100
Subject: [PATCH] Move CommitValidators.Factory binding to GerritGlobalModule

The factory(CommitValidators.Factory) binding is done in the
GerritRequestModule, but this is not early enough and means it
is not possible to use it for example in validation of revert
commits.

Move the binding to the GerritGlobalModule.

Change-Id: Id1c4aefd100b5d03f9890815435511e8cff27186
---
 .../com/google/gerrit/server/config/GerritGlobalModule.java     | 2 ++
 .../com/google/gerrit/server/config/GerritRequestModule.java    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 06f5179409..ff8a5eb4f2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -66,6 +66,7 @@ import com.google.gerrit.server.git.ReloadSubmitQueueOp;
 import com.google.gerrit.server.git.TagCache;
 import com.google.gerrit.server.git.TransferConfig;
 import com.google.gerrit.server.git.validators.CommitValidationListener;
+import com.google.gerrit.server.git.validators.CommitValidators;
 import com.google.gerrit.server.mail.EmailModule;
 import com.google.gerrit.server.mail.FromAddressGenerator;
 import com.google.gerrit.server.mail.FromAddressGeneratorProvider;
@@ -206,6 +207,7 @@ public class GerritGlobalModule extends FactoryModule {
     DynamicSet.setOf(binder(), NewProjectCreatedListener.class);
     DynamicSet.bind(binder(), GitReferenceUpdatedListener.class).to(ChangeCache.class);
     DynamicSet.setOf(binder(), CommitValidationListener.class);
+    factory(CommitValidators.Factory.class);
 
     bind(AnonymousUser.class);
 
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java
index 71ae7bd725..2784f30681 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java
@@ -32,7 +32,6 @@ import com.google.gerrit.server.git.CreateCodeReviewNotes;
 import com.google.gerrit.server.git.MergeOp;
 import com.google.gerrit.server.git.MetaDataUpdate;
 import com.google.gerrit.server.git.SubmoduleOp;
-import com.google.gerrit.server.git.validators.CommitValidators;
 import com.google.gerrit.server.mail.AddReviewerSender;
 import com.google.gerrit.server.mail.CommitMessageEditedSender;
 import com.google.gerrit.server.mail.CreateChangeSender;
@@ -90,6 +89,5 @@ public class GerritRequestModule extends FactoryModule {
     factory(CreateProject.Factory.class);
     factory(SuggestParentCandidates.Factory.class);
     factory(BanCommit.Factory.class);
-    factory(CommitValidators.Factory.class);
   }
 }