Remove redundant RefDatabaseConfig
The configuration object RefDatabaseConfig does not contain
any valid setting other than the ZookeeperConfig, and thus can
be removed.
Change-Id: Ic07610700d1bdbe827603d87961832d1dc417340
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/Configuration.java
index fd97932..cd80bfa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/Configuration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/Configuration.java
@@ -70,7 +70,7 @@
private final Index index;
private final KafkaSubscriber subscriber;
private final Kafka kafka;
- private final RefDatabaseConfig splitBrain;
+ private final ZookeeperConfig zookeeperConfig;
@Inject
Configuration(PluginConfigFactory pluginConfigFactory, @PluginName String pluginName) {
@@ -85,11 +85,11 @@
cache = new Cache(cfg);
event = new Event(cfg);
index = new Index(cfg);
- splitBrain = new RefDatabaseConfig(cfg);
+ zookeeperConfig = new ZookeeperConfig(cfg);
}
- public RefDatabaseConfig getRefDatabaseConfig() {
- return splitBrain;
+ public ZookeeperConfig getZookeeperConfig() {
+ return zookeeperConfig;
}
public Kafka getKafka() {
@@ -411,7 +411,8 @@
}
}
- public static class Zookeeper {
+ public static class ZookeeperConfig {
+ public static final String SECTION = "ref-database";
public static final int defaultSessionTimeoutMs;
public static final int defaultConnectionTimeoutMs;
public static final String DEFAULT_ZK_CONNECT = "localhost:2181";
@@ -457,31 +458,19 @@
private CuratorFramework build;
- private Zookeeper(Config cfg) {
+ private ZookeeperConfig(Config cfg) {
connectionString =
- getString(
- cfg, RefDatabaseConfig.SECTION, SUBSECTION, KEY_CONNECT_STRING, DEFAULT_ZK_CONNECT);
- root =
- getString(cfg, RefDatabaseConfig.SECTION, SUBSECTION, KEY_ROOT_NODE, "gerrit/multi-site");
+ getString(cfg, SECTION, SUBSECTION, KEY_CONNECT_STRING, DEFAULT_ZK_CONNECT);
+ root = getString(cfg, SECTION, SUBSECTION, KEY_ROOT_NODE, "gerrit/multi-site");
sessionTimeoutMs =
- getInt(
- cfg,
- RefDatabaseConfig.SECTION,
- SUBSECTION,
- KEY_SESSION_TIMEOUT_MS,
- defaultSessionTimeoutMs);
+ getInt(cfg, SECTION, SUBSECTION, KEY_SESSION_TIMEOUT_MS, defaultSessionTimeoutMs);
connectionTimeoutMs =
- getInt(
- cfg,
- RefDatabaseConfig.SECTION,
- SUBSECTION,
- KEY_CONNECTION_TIMEOUT_MS,
- defaultConnectionTimeoutMs);
+ getInt(cfg, SECTION, SUBSECTION, KEY_CONNECTION_TIMEOUT_MS, defaultConnectionTimeoutMs);
baseSleepTimeMs =
getInt(
cfg,
- RefDatabaseConfig.SECTION,
+ SECTION,
SUBSECTION,
KEY_RETRY_POLICY_BASE_SLEEP_TIME_MS,
DEFAULT_RETRY_POLICY_BASE_SLEEP_TIME_MS);
@@ -489,7 +478,7 @@
maxSleepTimeMs =
getInt(
cfg,
- RefDatabaseConfig.SECTION,
+ SECTION,
SUBSECTION,
KEY_RETRY_POLICY_MAX_SLEEP_TIME_MS,
DEFAULT_RETRY_POLICY_MAX_SLEEP_TIME_MS);
@@ -497,7 +486,7 @@
maxRetries =
getInt(
cfg,
- RefDatabaseConfig.SECTION,
+ SECTION,
SUBSECTION,
KEY_RETRY_POLICY_MAX_RETRIES,
DEFAULT_RETRY_POLICY_MAX_RETRIES);
@@ -505,7 +494,7 @@
casBaseSleepTimeMs =
getInt(
cfg,
- RefDatabaseConfig.SECTION,
+ SECTION,
SUBSECTION,
KEY_CAS_RETRY_POLICY_BASE_SLEEP_TIME_MS,
DEFAULT_CAS_RETRY_POLICY_BASE_SLEEP_TIME_MS);
@@ -513,7 +502,7 @@
casMaxSleepTimeMs =
getInt(
cfg,
- RefDatabaseConfig.SECTION,
+ SECTION,
SUBSECTION,
KEY_CAS_RETRY_POLICY_MAX_SLEEP_TIME_MS,
DEFAULT_CAS_RETRY_POLICY_MAX_SLEEP_TIME_MS);
@@ -521,13 +510,12 @@
casMaxRetries =
getInt(
cfg,
- RefDatabaseConfig.SECTION,
+ SECTION,
SUBSECTION,
KEY_CAS_RETRY_POLICY_MAX_RETRIES,
DEFAULT_CAS_RETRY_POLICY_MAX_RETRIES);
- migrate =
- getBoolean(cfg, RefDatabaseConfig.SECTION, SUBSECTION, KEY_MIGRATE, DEFAULT_MIGRATE);
+ migrate = getBoolean(cfg, SECTION, SUBSECTION, KEY_MIGRATE, DEFAULT_MIGRATE);
checkArgument(StringUtils.isNotEmpty(connectionString), "zookeeper.%s contains no servers");
}
@@ -560,19 +548,4 @@
: ZkSharedRefDatabase.OperationMode.NORMAL;
}
}
-
- public static class RefDatabaseConfig {
- static final String SECTION = "ref-database";
-
- private final Zookeeper zookeeper;
-
- private RefDatabaseConfig(Config cfg) {
-
- zookeeper = new Zookeeper(cfg);
- }
-
- public Zookeeper getZookeeper() {
- return zookeeper;
- }
- }
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkValidationModule.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkValidationModule.java
index 4775a86..40f93c0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkValidationModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkValidationModule.java
@@ -32,12 +32,11 @@
@Override
protected void configure() {
bind(SharedRefDatabase.class).to(ZkSharedRefDatabase.class);
- bind(CuratorFramework.class)
- .toInstance(cfg.getRefDatabaseConfig().getZookeeper().buildCurator());
+ bind(CuratorFramework.class).toInstance(cfg.getZookeeperConfig().buildCurator());
bind(RetryPolicy.class)
.annotatedWith(Names.named("ZkLockRetryPolicy"))
- .toInstance(cfg.getRefDatabaseConfig().getZookeeper().buildCasRetryPolicy());
+ .toInstance(cfg.getZookeeperConfig().buildCasRetryPolicy());
bind(ZkSharedRefDatabase.OperationMode.class)
- .toInstance(cfg.getRefDatabaseConfig().getZookeeper().getOperationMode());
+ .toInstance(cfg.getZookeeperConfig().getOperationMode());
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java
index 726ce18..b087b3d 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java
@@ -78,13 +78,13 @@
splitBrainconfig.setString("ref-database", "zookeeper", "connectString", connectString);
splitBrainconfig.setString(
"ref-database",
- Configuration.Zookeeper.SUBSECTION,
- Configuration.Zookeeper.KEY_CONNECT_STRING,
+ Configuration.ZookeeperConfig.SUBSECTION,
+ Configuration.ZookeeperConfig.KEY_CONNECT_STRING,
connectString);
splitBrainconfig.setBoolean(
"ref-database",
- Configuration.Zookeeper.SUBSECTION,
- Configuration.Zookeeper.KEY_MIGRATE,
+ Configuration.ZookeeperConfig.SUBSECTION,
+ Configuration.ZookeeperConfig.KEY_MIGRATE,
migrationMode);
configuration = new Configuration(splitBrainconfig);
