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

@@ -49,7 +49,7 @@ class SitePathFromSystemConfigProvider implements Provider<Path> {
throw new OrmException("system_config table is empty");
default:
throw new OrmException(
"system_config must have exactly 1 row;" + " found " + all.size() + " rows instead");
"system_config must have exactly 1 row; found " + all.size() + " rows instead");
}
}
}