Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
ElasticRestClientProvider: Make client field volatile
AbstractElasticIndexer: Specify charset for InputStreamReader
SshCommandsIT: Use immutable type for constant field declarations
rest-api-config.txt: Fix monospace `plugin`
Change-Id: I4dbc4d1876c10ec1cc79a490c86082aa46999163
diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index 320e848..148bb2d 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1708,7 +1708,7 @@
GerritInfo] entity.
|`note_db_enabled` |not set if `false`|
Whether the NoteDb storage backend is fully enabled.
-|`plugin ` ||
+|`plugin` ||
Information about Gerrit extensions by plugins as
link:#plugin-config-info[PluginConfigInfo] entity.
|`receive` |optional|
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/SshCommandsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
index 1e2971c..8a55aea 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
@@ -26,7 +26,6 @@
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.sshd.Commands;
import java.util.List;
-import java.util.Map;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +36,7 @@
private static final Logger log = LoggerFactory.getLogger(SshCommandsIT.class);
// TODO: It would be better to dynamically generate this list
- private static final Map<String, List<String>> COMMANDS =
+ private static final ImmutableMap<String, List<String>> COMMANDS =
ImmutableMap.of(
Commands.ROOT,
ImmutableList.of(
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
index fcf7df4..47d09b5 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
@@ -73,7 +73,7 @@
String content = "";
if (responseEntity != null) {
InputStream contentStream = responseEntity.getContent();
- try (Reader reader = new InputStreamReader(contentStream)) {
+ try (Reader reader = new InputStreamReader(contentStream, UTF_8)) {
content = CharStreams.toString(reader);
}
}
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java
index b7898ae..5323ec8 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java
@@ -40,7 +40,7 @@
private final ElasticConfiguration cfg;
- private RestClient client;
+ private volatile RestClient client;
private ElasticQueryAdapter adapter;
@Inject
