Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade google-java-format to 1.7

Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
This commit is contained in:
David Pursehouse
2019-03-14 09:01:59 +09:00
149 changed files with 225 additions and 604 deletions

View File

@@ -150,8 +150,7 @@ public class ChangeFieldTest extends GerritBaseTests {
private static void assertStoredRecordRoundTrip(SubmitRecord... records) {
List<SubmitRecord> recordList = ImmutableList.copyOf(records);
List<String> stored =
ChangeField.storedSubmitRecords(recordList)
.stream()
ChangeField.storedSubmitRecords(recordList).stream()
.map(s -> new String(s, UTF_8))
.collect(toList());
assertThat(ChangeField.parseSubmitRecords(stored))