Setup: Remove duplication of default auto reindex value
Bug: Issue 10044
Change-Id: I3a01c910c2fa8e2eaca5949bcaab763e6d203e92
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
index 0ad64e5..4fa0b3f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -182,10 +182,12 @@
}
public static class AutoReindex {
+
static final String AUTO_REINDEX_SECTION = "autoReindex";
static final String ENABLED = "enabled";
static final String DELAY = "delay";
static final String POLL_INTERVAL = "pollInterval";
+ static final boolean DEFAULT_AUTO_REINDEX = false;
static final long DEFAULT_DELAY = 10L;
static final long DEFAULT_POLL_INTERVAL = 0L;
@@ -194,7 +196,7 @@
private final long pollSec;
public AutoReindex(Config cfg) {
- this.enabled = cfg.getBoolean(AUTO_REINDEX_SECTION, ENABLED, false);
+ this.enabled = cfg.getBoolean(AUTO_REINDEX_SECTION, ENABLED, DEFAULT_AUTO_REINDEX);
this.delaySec =
ConfigUtil.getTimeUnit(
cfg, AUTO_REINDEX_SECTION, null, DELAY, DEFAULT_DELAY, TimeUnit.SECONDS);
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java
index ddc07c5..f3a3c7d 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Setup.java
@@ -15,6 +15,7 @@
package com.ericsson.gerrit.plugins.highavailability;
import static com.ericsson.gerrit.plugins.highavailability.Configuration.AutoReindex.AUTO_REINDEX_SECTION;
+import static com.ericsson.gerrit.plugins.highavailability.Configuration.AutoReindex.DEFAULT_AUTO_REINDEX;
import static com.ericsson.gerrit.plugins.highavailability.Configuration.AutoReindex.DEFAULT_DELAY;
import static com.ericsson.gerrit.plugins.highavailability.Configuration.AutoReindex.DEFAULT_POLL_INTERVAL;
import static com.ericsson.gerrit.plugins.highavailability.Configuration.AutoReindex.DELAY;
@@ -125,7 +126,8 @@
private void configureAutoReindexSection() {
ui.header("AutoReindex section");
- Boolean autoReindex = promptAndSetBoolean("Auto reindex", AUTO_REINDEX_SECTION, ENABLED, false);
+ Boolean autoReindex =
+ promptAndSetBoolean("Auto reindex", AUTO_REINDEX_SECTION, ENABLED, DEFAULT_AUTO_REINDEX);
config.setBoolean(AUTO_REINDEX_SECTION, null, ENABLED, autoReindex);
String delay =