Format java files with google-java-format google-java-format was not run after squashing string concatenations in change I7348413ae. Change-Id: I30afb262cca64e7638657d59ebb81938c22f0242
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ActionsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ActionsIT.java index 936dc25..87436e7 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ActionsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ActionsIT.java
@@ -105,8 +105,7 @@ assertThat(info.enabled).isNull(); assertThat(info.label).isEqualTo("Submit whole topic"); assertThat(info.method).isEqualTo("POST"); - assertThat(info.title) - .isEqualTo("This change depends on other changes which are not ready"); + assertThat(info.title).isEqualTo("This change depends on other changes which are not ready"); } else { noSubmitWholeTopicAssertions(actions, 1);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java index 5997e12..66966c3 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
@@ -85,8 +85,7 @@ assertThat(result.input).isEqualTo(mediumGroup); assertThat(result.confirm).isTrue(); assertThat(result.error) - .contains( - "has " + mediumGroupSize + " members. Do you want to add them all as reviewers?"); + .contains("has " + mediumGroupSize + " members. Do you want to add them all as reviewers?"); assertThat(result.reviewers).isNull(); // Add medium group with confirmation. @@ -514,8 +513,7 @@ assertThat(reviewerResult).isNotNull(); assertThat(reviewerResult.confirm).isTrue(); assertThat(reviewerResult.error) - .contains( - "has " + mediumGroupSize + " members. Do you want to add them all as reviewers?"); + .contains("has " + mediumGroupSize + " members. Do you want to add them all as reviewers?"); // No labels should have changed, and no reviewers/CCs should have been added. c = gApi.changes().id(r.getChangeId()).get();
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java index 4db10c8..9161652 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
@@ -126,8 +126,7 @@ /** Convert bare http:// and https:// URLs into <a href> tags. */ public SafeHtml linkify() { - final String part = - "(?:[a-zA-Z0-9$_+!*'%;:@=?#/~-]|&(?!lt;|gt;)|[.,](?!(?:\\s|$)))"; + final String part = "(?:[a-zA-Z0-9$_+!*'%;:@=?#/~-]|&(?!lt;|gt;)|[.,](?!(?:\\s|$)))"; return replaceAll( "(https?://" + part + "{2,}(?:[(]" + part + "*[)])*" + part + "*)", "<a href=\"$1\" target=\"_blank\" rel=\"nofollow\">$1</a>");
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java index 73eacce..ac0f6fd6 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java
@@ -54,8 +54,7 @@ o.replaceAll(repls(new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>"))); assertThat(o).isNotSameAs(n); assertThat(n.asString()) - .isEqualTo( - "A\n<a href=\"?42\">issue 42</a>\n<a href=\"?9918\">issue 9918</a>\nB"); + .isEqualTo("A\n<a href=\"?42\">issue 42</a>\n<a href=\"?9918\">issue 9918</a>\nB"); } @Test
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java index fd8f37f..88f9b4c 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
@@ -181,8 +181,7 @@ private boolean failAuthentication(Response rsp, String username) throws IOException { log.warn( - "Authentication failed for {}: password does not match the one stored in Gerrit", - username); + "Authentication failed for {}: password does not match the one stored in Gerrit", username); rsp.sendError(SC_UNAUTHORIZED); return false; }
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java index c2966b0..279584a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
@@ -96,8 +96,7 @@ /** Ensures we are running inside of a valid site, otherwise throws a Die. */ protected void mustHaveValidSite() throws Die { if (!Files.exists(sitePath.resolve("etc").resolve("gerrit.config"))) { - throw die( - "not a Gerrit site: '" + getSitePath() + "'\nPerhaps you need to run init first?"); + throw die("not a Gerrit site: '" + getSitePath() + "'\nPerhaps you need to run init first?"); } }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java index 79d8a1c..e060f8d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
@@ -608,8 +608,7 @@ if (range == null) { throw new BadRequestException( String.format( - "A range must be given for the replacement of the robot comment on %s", - commentPath)); + "A range must be given for the replacement of the robot comment on %s", commentPath)); } }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java index 717787a..4993a5d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
@@ -327,8 +327,7 @@ Change change = readOneReviewDbChange(db, id); if (change == null) { if (defaultStorage == PrimaryStorage.REVIEW_DB) { - log.warn( - "skipping change {} found in project {} but not in ReviewDb", id, project); + log.warn("skipping change {} found in project {} but not in ReviewDb", id, project); continue; } // TODO(dborowitz): See discussion in BatchUpdate#newChangeContext.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java index 5122813..957bdd7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
@@ -255,8 +255,7 @@ public void disablePlugins(Set<String> names) { if (!isRemoteAdminEnabled()) { - log.warn( - "Remote plugin administration is disabled, ignoring disablePlugins(" + names + ")"); + log.warn("Remote plugin administration is disabled, ignoring disablePlugins(" + names + ")"); return; } @@ -296,8 +295,7 @@ public void enablePlugins(Set<String> names) throws PluginInstallException { if (!isRemoteAdminEnabled()) { - log.warn( - "Remote plugin administration is disabled, ignoring enablePlugins(" + names + ")"); + log.warn("Remote plugin administration is disabled, ignoring enablePlugins(" + names + ")"); return; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java index 4e4d0af..5fb4497 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryProcessor.java
@@ -52,8 +52,7 @@ executionTime = metricMaker.newTimer( "query/query_latency", - new Description( - "Successful query latency, accumulated over the life of the process") + new Description("Successful query latency, accumulated over the life of the process") .setCumulative() .setUnit(Description.Units.MILLISECONDS), index);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_123.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_123.java index e1dc604..ec63141 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_123.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_123.java
@@ -56,8 +56,7 @@ ListMultimap<Account.Id, Change.Id> imports = MultimapBuilder.hashKeys().arrayListValues().build(); try (Statement stmt = ((JdbcSchema) db).getConnection().createStatement(); - ResultSet rs = - stmt.executeQuery("SELECT account_id, change_id FROM starred_changes")) { + ResultSet rs = stmt.executeQuery("SELECT account_id, change_id FROM starred_changes")) { while (rs.next()) { Account.Id accountId = new Account.Id(rs.getInt(1)); Change.Id changeId = new Change.Id(rs.getInt(2));
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java index ae39184..90e6800 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java
@@ -807,10 +807,8 @@ b2 = new ChangeBundle( c, messages(cm1), latest(c), approvals(), comments(), reviewers(), NOTE_DB); - assertDiffs( - b1, b2, "ChangeMessages differ for Change.Id " + id + "\nOnly in A:\n " + cm2); - assertDiffs( - b2, b1, "ChangeMessages differ for Change.Id " + id + "\nOnly in B:\n " + cm2); + assertDiffs(b1, b2, "ChangeMessages differ for Change.Id " + id + "\nOnly in A:\n " + cm2); + assertDiffs(b2, b1, "ChangeMessages differ for Change.Id " + id + "\nOnly in B:\n " + cm2); } @Test @@ -1028,8 +1026,7 @@ new ChangeBundle( c, messages(), patchSets(ps1, ps2), approvals(), comments(), reviewers(), REVIEW_DB); - assertDiffs( - b1, b2, "PatchSet.Id sets differ: [] only in A; [" + c.getId() + ",1] only in B"); + assertDiffs(b1, b2, "PatchSet.Id sets differ: [] only in A; [" + c.getId() + ",1] only in B"); } @Test
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesParserTest.java index 2f22b77..39c4c08 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesParserTest.java
@@ -97,8 +97,7 @@ + "Status: new\n" + "Subject: This is a test change\n"); assertParseFails("Update change\n\nPatch-set: 1\nStatus: OOPS\n"); - assertParseFails( - "Update change\n\nPatch-set: 1\nStatus: NEW\nStatus: NEW\n"); + assertParseFails("Update change\n\nPatch-set: 1\nStatus: NEW\nStatus: NEW\n"); } @Test @@ -147,11 +146,9 @@ assertParseFails("Update change\n\nPatch-set: 1\nLabel: Label1=X\n"); assertParseFails("Update change\n\nPatch-set: 1\nLabel: Label1 = 1\n"); assertParseFails("Update change\n\nPatch-set: 1\nLabel: X+Y\n"); - assertParseFails( - "Update change\n\nPatch-set: 1\nLabel: Label1 Other Account <2@gerrit>\n"); + assertParseFails("Update change\n\nPatch-set: 1\nLabel: Label1 Other Account <2@gerrit>\n"); assertParseFails("Update change\n\nPatch-set: 1\nLabel: -Label!1\n"); - assertParseFails( - "Update change\n\nPatch-set: 1\nLabel: -Label!1 Other Account <2@gerrit>\n"); + assertParseFails("Update change\n\nPatch-set: 1\nLabel: -Label!1 Other Account <2@gerrit>\n"); } @Test @@ -233,8 +230,7 @@ + "Patch-set: 1\n" + "Topic:\n" + "Subject: This is a test change\n"); - assertParseFails( - "Update change\n\nPatch-set: 1\nTopic: Some Topic\nTopic: Other Topic"); + assertParseFails("Update change\n\nPatch-set: 1\nTopic: Some Topic\nTopic: Other Topic"); } @Test
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java index 073408c..9d6cb60 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
@@ -1396,8 +1396,7 @@ public void changeMessageWithMultipleParagraphs() throws Exception { Change c = newChange(); ChangeUpdate update = newUpdate(c, changeOwner); - update.setChangeMessage( - "Testing paragraph 1\n\nTesting paragraph 2\n\nTesting paragraph 3"); + update.setChangeMessage("Testing paragraph 1\n\nTesting paragraph 2\n\nTesting paragraph 3"); update.commit(); PatchSet.Id ps1 = c.currentPatchSetId();
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommitMessageOutputTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommitMessageOutputTest.java index 8f117fe..25b5168 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommitMessageOutputTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
@@ -141,8 +141,7 @@ update.commit(); assertBodyEquals( - "Update patch set 1\n\nPatch-set: 1\nLabel: -Code-Review\n", - update.getResult()); + "Update patch set 1\n\nPatch-set: 1\nLabel: -Code-Review\n", update.getResult()); } @Test @@ -207,9 +206,7 @@ update.commit(); RevCommit commit = parseCommit(update.getResult()); - assertBodyEquals( - "Update patch set 1\n\nComment on the change.\n\nPatch-set: 1\n", - commit); + assertBodyEquals("Update patch set 1\n\nComment on the change.\n\nPatch-set: 1\n", commit); PersonIdent author = commit.getAuthorIdent(); assertThat(author.getName()).isEqualTo("Anonymous Coward (3)"); @@ -273,8 +270,7 @@ public void changeMessageWithMultipleParagraphs() throws Exception { Change c = newChange(); ChangeUpdate update = newUpdate(c, changeOwner); - update.setChangeMessage( - "Testing paragraph 1\n\nTesting paragraph 2\n\nTesting paragraph 3"); + update.setChangeMessage("Testing paragraph 1\n\nTesting paragraph 2\n\nTesting paragraph 3"); update.commit(); assertBodyEquals( @@ -383,8 +379,7 @@ update.setCurrentPatchSet(); update.commit(); - assertBodyEquals( - "Update patch set 1\n\nPatch-set: 1\nCurrent: true\n", update.getResult()); + assertBodyEquals("Update patch set 1\n\nPatch-set: 1\nCurrent: true\n", update.getResult()); } private RevCommit parseCommit(ObjectId id) throws Exception {
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java index 62a9890..4b8771a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java
@@ -101,11 +101,7 @@ ) private boolean level9; - @Argument( - index = 0, - required = true, - usage = "The tree or commit to produce an archive for." - ) + @Argument(index = 0, required = true, usage = "The tree or commit to produce an archive for.") private String treeIsh = "master"; @Argument(