diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-03-13 17:04:24 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-03-13 17:06:45 +0900 |
commit | 68925785119f47d9695df4231c5cc82dc440abb4 (patch) | |
tree | 2d648e043f4abe875b2db7cf72979816a0a7d478 /gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java | |
parent | a4b8fa769a072b005fba07520215a3565b1a07ec (diff) | |
parent | 3efa1058b214469c3c612cd38909d453aa7e8af9 (diff) |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Upgrade google-java-format to 1.7
Change-Id: I08bad33a69e8425b699608a06b71ed767f061afd
Diffstat (limited to 'gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java')
-rw-r--r-- | gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java index 8bb68b4fa8..14d8b360d4 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java @@ -191,8 +191,7 @@ public class Schema_159_to_160_Test { VersionedAccountPreferences prefs = prefsSupplier.get(); prefs.load(repo); Config cfg = prefs.getConfig(); - return cfg.getSubsections(MY) - .stream() + return cfg.getSubsections(MY).stream() .collect(toImmutableMap(i -> i, i -> cfg.getString(MY, i, KEY_URL))); } } |