Fix binding of ChecksSubmitRule
ChecksSubmitRule was only bound for tests. Make sure that
ChecksSubmitRule.Module gets installed and remove the binding in
TestModule.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I542286a71750030f95f5f9a12aa8f01d0b00b698
diff --git a/java/com/google/gerrit/plugins/checks/Module.java b/java/com/google/gerrit/plugins/checks/Module.java
index 987a227..102c057 100644
--- a/java/com/google/gerrit/plugins/checks/Module.java
+++ b/java/com/google/gerrit/plugins/checks/Module.java
@@ -24,6 +24,7 @@
import com.google.gerrit.plugins.checks.api.ChangeCheckAttributeFactory;
import com.google.gerrit.plugins.checks.api.ChangeCheckAttributeFactory.GetChangeOptions;
import com.google.gerrit.plugins.checks.db.NoteDbCheckersModule;
+import com.google.gerrit.plugins.checks.rules.ChecksSubmitRule;
import com.google.gerrit.server.DynamicOptions;
import com.google.gerrit.server.change.ChangeAttributeFactory;
import com.google.gerrit.server.git.validators.CommitValidationListener;
@@ -57,5 +58,6 @@
.to(GetChangeOptions.class);
install(new ApiModule());
+ install(new ChecksSubmitRule.Module());
}
}
diff --git a/java/com/google/gerrit/plugins/checks/acceptance/TestModule.java b/java/com/google/gerrit/plugins/checks/acceptance/TestModule.java
index c04a4d3..3348659 100644
--- a/java/com/google/gerrit/plugins/checks/acceptance/TestModule.java
+++ b/java/com/google/gerrit/plugins/checks/acceptance/TestModule.java
@@ -14,14 +14,11 @@
package com.google.gerrit.plugins.checks.acceptance;
-import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.plugins.checks.Module;
import com.google.gerrit.plugins.checks.acceptance.testsuite.CheckOperations;
import com.google.gerrit.plugins.checks.acceptance.testsuite.CheckOperationsImpl;
import com.google.gerrit.plugins.checks.acceptance.testsuite.CheckerOperations;
import com.google.gerrit.plugins.checks.acceptance.testsuite.CheckerOperationsImpl;
-import com.google.gerrit.plugins.checks.rules.ChecksSubmitRule;
-import com.google.gerrit.server.rules.SubmitRule;
import com.google.inject.AbstractModule;
public class TestModule extends AbstractModule {
@@ -33,8 +30,5 @@
// setup in tests as realistic as possible by delegating to the original module.
bind(CheckerOperations.class).to(CheckerOperationsImpl.class);
bind(CheckOperations.class).to(CheckOperationsImpl.class);
- bind(SubmitRule.class)
- .annotatedWith(Exports.named("ChecksSubmitRule"))
- .to(ChecksSubmitRule.class);
}
}
