Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Format Java files with google-java-format 1.7
Change-Id: I497a88c25811398a169a7f7373a3db65ef66a97c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsGlobalConfig.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsGlobalConfig.java
index 610334d..e0f1dc2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsGlobalConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/LfsGlobalConfig.java
@@ -37,8 +37,7 @@
ImmutableMap.Builder<String, LfsBackend> builder = ImmutableMap.builder();
for (LfsBackendType type : LfsBackendType.values()) {
Map<String, LfsBackend> backendsOfType =
- cfg.getSubsections(type.name())
- .stream()
+ cfg.getSubsections(type.name()).stream()
.collect(toMap(name -> name, name -> LfsBackend.create(name, type)));
builder.putAll(backendsOfType);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java
index 2fb5ee3..0885d2d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java
@@ -118,9 +118,7 @@
log.debug("Verify list of locks for {} project and user {}", project, user);
LfsProjectLocks locks = projectLocks.getUnchecked(project);
Map<Boolean, List<LfsLock>> groupByOurs =
- locks
- .getLocks()
- .stream()
+ locks.getLocks().stream()
.collect(
Collectors.groupingBy(
(in) -> {
