Merge remote-tracking branch 'origin/stable-3.10'
* origin/stable-3.10:
Adapt to changes in Gerrit core
Reformat with gjf 1.24.0
Change-Id: Idc4653826daf30a5aee980e62765c88c34b328e5
diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java
index 9e670ee..8b47a1a 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java
@@ -53,8 +53,10 @@
throw new IOException(message);
}
- return JsonParser.parseString(AbstractElasticIndex.getContent(response)).getAsJsonObject()
- .entrySet().stream()
+ return JsonParser.parseString(AbstractElasticIndex.getContent(response))
+ .getAsJsonObject()
+ .entrySet()
+ .stream()
.map(e -> e.getKey().replace(name, ""))
.collect(toList());
}
diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionManager.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionManager.java
index f39a604..1578e85 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionManager.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionManager.java
@@ -52,7 +52,7 @@
sitePaths,
listeners,
defs,
- VersionManager.getOnlineUpgrade(cfg),
+ VersionManager.shouldPerformOnlineUpgrade(cfg),
cfg.getBoolean("index", "reuseExistingDocuments", false));
this.versionDiscovery = versionDiscovery;
prefix = Strings.nullToEmpty(cfg.getString("elasticsearch", null, "prefix"));
diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
index 36f91cc..47e41af 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -75,7 +75,8 @@
.withCommand(
"sh",
"-c",
- "/usr/share/elasticsearch/generate-certs.sh && /usr/local/bin/docker-entrypoint.sh")
+ "/usr/share/elasticsearch/generate-certs.sh &&"
+ + " /usr/local/bin/docker-entrypoint.sh")
.withCertPath(customizedCertPath);
container.start();
} catch (ContainerLaunchException e) {
