From 2ce15159170054e30cf89e5e444902e7f67f4b72 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Mon, 27 Aug 2018 14:06:15 -0700 Subject: [PATCH 1/4] rest-api-config.txt: Fix monospace `plugin` The previous form `plugin ` renders as literal backticks, not monospace. Change-Id: I6b261f9897275a7c699b2df0a5e11c8d7eb0a606 --- Documentation/rest-api-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt index 62e3ee4abc..a311f0b96c 100644 --- a/Documentation/rest-api-config.txt +++ b/Documentation/rest-api-config.txt @@ -1590,7 +1590,7 @@ link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[ 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| From d0bdeca6982f60a3fd92780a0e630892bc76cf2f Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 28 Aug 2018 16:42:08 +0900 Subject: [PATCH 2/4] SshCommandsIT: Use immutable type for constant field declarations ErrorProne warns [1] that constant field declarations should use the immutable type (such as ImmutableList) instead of the general collection interface type (such as List). [1] http://errorprone.info/bugpattern/MutableConstantField Change-Id: If42c500891ea0eb90e753620b6c1e251336217e1 --- .../java/com/google/gerrit/acceptance/ssh/SshCommandsIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 1e2971c80f..8a55aea8d7 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.acceptance.UseSsh; 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 @@ public class SshCommandsIT extends AbstractDaemonTest { private static final Logger log = LoggerFactory.getLogger(SshCommandsIT.class); // TODO: It would be better to dynamically generate this list - private static final Map> COMMANDS = + private static final ImmutableMap> COMMANDS = ImmutableMap.of( Commands.ROOT, ImmutableList.of( From 7b7c4d318a3d54ad199dea134fbacc070cc1685b Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 28 Aug 2018 17:29:18 +0900 Subject: [PATCH 3/4] AbstractElasticIndexer: Specify charset for InputStreamReader ErrorProne reports a warning [1] about implicit use of the platform default charset. [1] http://errorprone.info/bugpattern/DefaultCharset Change-Id: I57a4d5ff4ef533312c3282a80df57e07e10a92e1 --- .../com/google/gerrit/elasticsearch/AbstractElasticIndex.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4ab1409f9e..59e57d5d34 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 @@ abstract class AbstractElasticIndex implements Index { 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); } } From 63899d219ef73187674b144f1750e2e69ca76223 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 28 Aug 2018 17:31:37 +0900 Subject: [PATCH 4/4] ElasticRestClientProvider: Make client field volatile ErrorProne reports a warning [1] that double-checked locking on non-volatile fields is unsafe. [1] http://errorprone.info/bugpattern/DoubleCheckedLocking Change-Id: I4277a4910bd93fab9f072323a69bbf19472eb590 --- .../google/gerrit/elasticsearch/ElasticRestClientProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b7898ae5c1..5323ec83e2 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 @@ class ElasticRestClientProvider implements Provider, LifecycleListen private final ElasticConfiguration cfg; - private RestClient client; + private volatile RestClient client; private ElasticQueryAdapter adapter; @Inject