Squash redundant string concatenations introduced by google-java-format

Reformatting the code with google-java-format tool in change Id5f3c6de9
resulted in wrapped lines being unwrapped to the new 100 columns limit.

In cases where the wrapped line was wrapped on a string concatenation,
the resulting long line now includes redundant concatenations. See the
upstream issue [1] for an example of this.

Squash the redundant concatenations with:

  git ls-files | grep java$ | xargs sed -i '' 's/" + "//g'

(note: this also resulted in a couple of unwanted changes; those are
manually undone.)

[1] https://github.com/google/google-java-format/issues/122

Change-Id: I7348413ae460c8c7a0b0c72dab0a1ae7275a2ec3
This commit is contained in:
David Pursehouse
2017-02-17 08:36:49 +09:00
parent 3872fccb4e
commit 1111684821
91 changed files with 190 additions and 190 deletions

View File

@@ -181,7 +181,7 @@ class ProjectBasicAuthFilter implements Filter {
private boolean failAuthentication(Response rsp, String username) throws IOException {
log.warn(
"Authentication failed for {}: password does not match the one" + " stored in Gerrit",
"Authentication failed for {}: password does not match the one stored in Gerrit",
username);
rsp.sendError(SC_UNAUTHORIZED);
return false;

View File

@@ -71,7 +71,7 @@ public class WebSessionManager {
if (sessionMaxAgeMillis < MINUTES.toMillis(5)) {
log.warn(
String.format(
"cache.%s.maxAge is set to %d milliseconds;" + " it should be at least 5 minutes.",
"cache.%s.maxAge is set to %d milliseconds; it should be at least 5 minutes.",
CACHE_NAME, sessionMaxAgeMillis));
}
}