Upgrade google-java-format to 1.7

This new version has the nice feature of putting multiple chained method
calls before a .stream() on a single line. The diff is a bit large but
it's removing a lot of newlines which is nice.

Change-Id: I260b620aa6a1bc77b06be9672a1f281ab0d0d0f8
This commit is contained in:
Dave Borowitz
2019-01-28 07:21:29 -08:00
committed by David Pursehouse
parent 83fab68dc5
commit 3efa1058b2
47 changed files with 65 additions and 170 deletions

View File

@@ -27,8 +27,7 @@ public class ModuleOverloader {
// group candidates by annotation existence
Map<Boolean, List<Module>> grouped =
overrideCandidates
.stream()
overrideCandidates.stream()
.collect(
Collectors.groupingBy(m -> m.getClass().getAnnotation(ModuleImpl.class) != null));
@@ -44,16 +43,14 @@ public class ModuleOverloader {
}
// swipe cache implementation with alternative provided in lib
return modules
.stream()
return modules.stream()
.map(
m -> {
ModuleImpl a = m.getClass().getAnnotation(ModuleImpl.class);
if (a == null) {
return m;
}
return overrides
.stream()
return overrides.stream()
.filter(
o ->
o.getClass()