Remove unused disableGitRepositoryValidation variable from Module class
Since stable-3.0, validation module is installed in dbInjector. We don't
have to manually disable it for tests using
disableGitRepositoryValidation flag.
Change-Id: Ic85db4fbd3f2f2bf907e96d2ef24ba4ab9357dc0
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/Module.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/Module.java
index 1ec499c..177699e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/Module.java
@@ -14,7 +14,6 @@
package com.googlesource.gerrit.plugins.multisite;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.extensions.events.ProjectDeletedListener;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.extensions.registration.DynamicSet;
@@ -54,34 +53,12 @@
private Configuration config;
private KafkaForwardedEventRouterModule kafkaForwardedEventRouterModule;
private KafkaBrokerForwarderModule kafkaBrokerForwarderModule;
- private final boolean disableGitRepositoryValidation;
@Inject
public Module(
Configuration config,
KafkaForwardedEventRouterModule forwardedEeventRouterModule,
KafkaBrokerForwarderModule brokerForwarderModule) {
- this(config, forwardedEeventRouterModule, brokerForwarderModule, false);
- }
-
- // TODO: It is not possible to properly test the libModules in Gerrit.
- // Disable the Git repository validation during integration test and then build the necessary
- // support
- // in Gerrit for it.
- @VisibleForTesting
- public Module(
- Configuration config,
- KafkaForwardedEventRouterModule forwardedEeventRouterModule,
- KafkaBrokerForwarderModule brokerForwarderModule,
- boolean disableGitRepositoryValidation) {
- init(config, forwardedEeventRouterModule, brokerForwarderModule);
- this.disableGitRepositoryValidation = disableGitRepositoryValidation;
- }
-
- private void init(
- Configuration config,
- KafkaForwardedEventRouterModule forwardedEeventRouterModule,
- KafkaBrokerForwarderModule brokerForwarderModule) {
this.config = config;
this.kafkaForwardedEventRouterModule = forwardedEeventRouterModule;
this.kafkaBrokerForwarderModule = brokerForwarderModule;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/EventConsumerIT.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/EventConsumerIT.java
index 96ed054..f6e799a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/EventConsumerIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/kafka/consumer/EventConsumerIT.java
@@ -111,8 +111,7 @@
multiSiteConfig,
new KafkaForwardedEventRouterModule(
kafkaConfiguration, new KafkaConsumerModule(kafkaConfiguration)),
- new KafkaBrokerForwarderModule(kafkaConfiguration),
- true);
+ new KafkaBrokerForwarderModule(kafkaConfiguration));
}
@Override
