Merge branch 'stable-2.16'
* stable-2.16:
Format Java files with google-java-format 1.7
Upgrade bazlets to latest stable-2.16
Upgrade mockito-core to 2.25.0
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Update bazlets to fix build with bazel 0.23
Change-Id: Ia56f7a6800d80f94a9983b0bbe1f032ee3cbe59a
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 643a850..ff97a63 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -9,8 +9,8 @@
maven_jar(
name = "mockito",
- artifact = "org.mockito:mockito-core:2.24.5",
- sha1 = "599509fe319bd9e39559b8f987bee5d4b77167e4",
+ artifact = "org.mockito:mockito-core:2.25.0",
+ sha1 = "1fcf2f6944d69b6f39cd579718d8b5395a97836b",
deps = [
"@byte-buddy//jar",
"@byte-buddy-agent//jar",
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
index c5969d6..a6acbc0 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarder.java
@@ -143,9 +143,7 @@
private boolean execute(
RequestMethod method, String action, String endpoint, Object id, Object payload) {
List<CompletableFuture<Boolean>> futures =
- peerInfoProvider
- .get()
- .stream()
+ peerInfoProvider.get().stream()
.map(peer -> createRequest(method, peer, action, endpoint, id, payload))
.map(request -> CompletableFuture.supplyAsync(request::execute))
.collect(Collectors.toList());
