Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Format Java files with google-java-format 1.7
Change-Id: Idf098720a9c39353cb411fa53b7c40760cc3b71b
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java
index af99064..640457d 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/GroupReindexRunnable.java
@@ -59,10 +59,7 @@
try {
Id groupId = g.getId();
Stream<Timestamp> groupIdAudTs =
- db.accountGroupByIdAud()
- .byGroup(g.getId())
- .toList()
- .stream()
+ db.accountGroupByIdAud().byGroup(g.getId()).toList().stream()
.map(AccountGroupByIdAud::getRemovedOn)
.filter(Objects::nonNull);
List<AccountGroupMemberAudit> groupMembersAud =
@@ -70,8 +67,7 @@
Stream<Timestamp> groupMemberAudAddedTs =
groupMembersAud.stream().map(ga -> ga.getKey().getAddedOn()).filter(Objects::nonNull);
Stream<Timestamp> groupMemberAudRemovedTs =
- groupMembersAud
- .stream()
+ groupMembersAud.stream()
.map(AccountGroupMemberAudit::getRemovedOn)
.filter(Objects::nonNull);
Optional<Timestamp> groupLastTs =
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 ab7b81a..dc59117 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
@@ -137,9 +137,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());